Update mockito tests

core/src/test/java/org/nzbhydra/NzbHandlerTest.java

@@ -1,17 +1,19 @@
 package org.nzbhydra;
 
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.downloading.FileDownloadEntity;
 import org.nzbhydra.downloading.FileDownloadRepository;
 import org.nzbhydra.downloading.FileHandler;
 
-import static org.mockito.Mockito.when;
-
+import static org.mockito.Mockito.when;
+
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NzbHandlerTest {
 
     @InjectMocks
@@ -26,7 +28,7 @@ public class NzbHandlerTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
     }
 

core/src/test/java/org/nzbhydra/api/CapsGeneratorTest.java

@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.category.CategoriesConfig;
@@ -32,6 +33,7 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class CapsGeneratorTest {
 
     @Mock
@@ -42,7 +44,7 @@ public class CapsGeneratorTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         BaseConfig baseConfig = new BaseConfig();
 
         CategoriesConfig categoriesConfig = new CategoriesConfig();

core/src/test/java/org/nzbhydra/api/CategoryConverterTest.java

@@ -4,13 +4,15 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.category.Category;
 import org.nzbhydra.searching.CategoryProvider;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class CategoryConverterTest {
 
     @InjectMocks
@@ -21,7 +23,7 @@ public class CategoryConverterTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee.setCategoryProvider(categoryProviderMock);
     }
 

core/src/test/java/org/nzbhydra/api/ExternalApiTest.java

@@ -4,8 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -39,7 +40,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 
-
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ExternalApiTest {
 
     BaseConfig baseConfig = new BaseConfig();
@@ -76,7 +77,7 @@ public class ExternalApiTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(configProvider.getBaseConfig()).thenReturn(baseConfig);
         baseConfig.setMain(new MainConfig());
         baseConfig.getMain().setApiKey("apikey");

core/src/test/java/org/nzbhydra/api/NewznabXmlTransformerTest.java

@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.MainConfig;
@@ -39,6 +40,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NewznabXmlTransformerTest {
 
     @Mock
@@ -56,7 +58,7 @@ public class NewznabXmlTransformerTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(configProvider.getBaseConfig()).thenReturn(baseConfig);
         baseConfig.setMain(new MainConfig());
         baseConfig.getMain().setApiKey("apikey");

core/src/test/java/org/nzbhydra/backup/BackupTaskTest.java

@@ -6,7 +6,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.genericstorage.GenericStorage;
@@ -22,8 +23,10 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class BackupTaskTest {
 
+    BaseConfig config = new BaseConfig();
     @Mock
     private BackupAndRestore backupAndRestore;
     @Mock
@@ -32,14 +35,12 @@ public class BackupTaskTest {
     private ConfigProvider configProvider;
     @Captor
     private ArgumentCaptor<BackupData> backupDataArgumentCaptor;
-    BaseConfig config = new BaseConfig();
-
     @InjectMocks
     private BackupTask testee = new BackupTask();
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
 
         when(configProvider.getBaseConfig()).thenReturn(config);
         config.getMain().setBackupEveryXDays(7);

core/src/test/java/org/nzbhydra/config/BaseConfigTest.java

@@ -9,7 +9,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.category.Category;
 import org.nzbhydra.config.validation.BaseConfigValidator;
 import org.nzbhydra.config.validation.ConfigValidationTools;
@@ -27,22 +28,21 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class BaseConfigTest {
 
     //If true the actual content of the config in code and in baseConfig.yml will be compared
     //If false only the structure will be compare, meaning both sides have to have the same keys but the values can be different
     private static final boolean COMPARE_CONFIG_VALUES = false;
     private Set<String> dontCheckTheseLists = Sets.newHashSet("categories");
-
-    @BeforeEach
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-    }
-
     @InjectMocks
     private BaseConfig testee = new BaseConfig();
     private BaseConfigValidator baseConfigValidator = new BaseConfigValidator();
 
+    @BeforeEach
+    public void setUp() throws Exception {
+
+    }
 
     @Test
     void shouldRecognizeRestartRequired() {
@@ -88,8 +88,6 @@ void applicationPropertiesShouldHaveTheSameKeysAsConfigClasses() throws Exceptio
     }
 
 
-
-
     private void compare(Object left, Object right) {
         if (left instanceof HashMap) {
             compareMaps((HashMap) left, (HashMap) right);

core/src/test/java/org/nzbhydra/config/migration/ConfigMigrationTest.java

@@ -23,7 +23,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.MainConfig;
 
@@ -40,6 +41,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ConfigMigrationTest {
 
     @Mock
@@ -55,7 +57,7 @@ public class ConfigMigrationTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         objectMapper.registerModule(new Jdk8Module());
     }
 

core/src/test/java/org/nzbhydra/downloading/DownloadStatusUpdaterTest.java

@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.downloading.downloaders.Downloader;
@@ -38,6 +39,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class DownloadStatusUpdaterTest {
 
     @Mock
@@ -54,7 +56,7 @@ public class DownloadStatusUpdaterTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(downloaderProvider.getAllDownloaders()).thenReturn(Collections.singletonList(downloaderMock));
         when(downloaderMock.isEnabled()).thenReturn(true);
         when(configProvider.getBaseConfig()).thenReturn(new BaseConfig());

core/src/test/java/org/nzbhydra/downloading/IndexerUniquenessScoreSaverTest.java

@@ -26,7 +26,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.SearchSource;
@@ -53,6 +54,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class IndexerUniquenessScoreSaverTest {
 
     @Mock
@@ -80,7 +82,7 @@ public class IndexerUniquenessScoreSaverTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         final BaseConfig value = new BaseConfig();
         value.getMain().setKeepHistory(true);
         when(configProviderMock.getBaseConfig()).thenReturn(value);

core/src/test/java/org/nzbhydra/downloading/downloaders/DownloaderTest.java

@@ -21,7 +21,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
 import org.nzbhydra.config.downloading.DownloaderConfig;
 import org.nzbhydra.downloading.FileDownloadEntity;
 import org.nzbhydra.downloading.FileDownloadStatus;
@@ -56,7 +56,7 @@ public class DownloaderTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee.nzbHandler = nzbHandler;
         testee.searchResultRepository = searchResultRepository;
         testee.downloaderConfig = new DownloaderConfig();

core/src/test/java/org/nzbhydra/downloading/torrents/TorrentFileHandlerTest.java

@@ -22,7 +22,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.downloading.DownloadResult;
@@ -32,6 +33,7 @@
 
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class TorrentFileHandlerTest {
 
     @Mock
@@ -44,7 +46,7 @@ public class TorrentFileHandlerTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
 
         final BaseConfig baseConfig = new BaseConfig();
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);

core/src/test/java/org/nzbhydra/indexers/AnizbTest.java

@@ -4,8 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -23,11 +24,12 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class AnizbTest {
 
+    BaseConfig baseConfig = new BaseConfig();
     @Mock
     private ConfigProvider configProviderMock;
-    BaseConfig baseConfig = new BaseConfig();
     @Mock
     private QueryGenerator queryGeneratorMock;
 
@@ -37,7 +39,7 @@ public class AnizbTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
         testee.config = new IndexerConfig();
         testee.config.setName("anizb");