replace MockitoJUnitRunner with non-deprecated version

Signed-off-by: Andreas Schmid <service@aaschmid.de>
TNG · Jul 10, 2018 · d4db3bd · d4db3bd
1 parent 4485b90
commit d4db3bd
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/...rc/test/java/com/tngtech/junit/dataprovider/resolver/DataProviderResolverContextTest.java b/...rc/test/java/com/tngtech/junit/dataprovider/resolver/DataProviderResolverContextTest.java
@@ -13,7 +13,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.junit.dataprovider.convert.SingleArgConverter;
 import com.tngtech.junit.dataprovider.convert.StringConverter;

diff --git a/junit4/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderFilterTest.java b/junit4/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderFilterTest.java
@@ -16,7 +16,7 @@
 import org.junit.runner.manipulation.Filter;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 

diff --git a/...t4/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderFrameworkMethodTest.java b/...t4/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderFrameworkMethodTest.java
@@ -15,7 +15,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.internal.placeholder.BasePlaceholder;
 

diff --git a/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/DataConverterTest.java b/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/DataConverterTest.java
@@ -21,7 +21,7 @@
 import org.mockito.InOrder;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 import com.tngtech.java.junit.dataprovider.DataProvider;

diff --git a/...a/com/tngtech/java/junit/dataprovider/internal/DefaultDataProviderMethodResolverTest.java b/...a/com/tngtech/java/junit/dataprovider/internal/DefaultDataProviderMethodResolverTest.java
@@ -15,7 +15,7 @@
 import org.junit.runners.model.TestClass;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 import com.tngtech.java.junit.dataprovider.DataProvider;

diff --git a/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/TestGeneratorTest.java b/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/TestGeneratorTest.java
@@ -19,7 +19,7 @@
 import org.junit.runners.model.FrameworkMethod;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 import com.tngtech.java.junit.dataprovider.DataProvider;

diff --git a/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/TestValidatorTest.java b/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/TestValidatorTest.java
@@ -15,7 +15,7 @@
 import org.junit.runners.model.FrameworkMethod;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 import com.tngtech.java.junit.dataprovider.DataProvider;

diff --git a/...ava/com/tngtech/java/junit/dataprovider/internal/convert/AbstractObjectConverterTest.java b/...ava/com/tngtech/java/junit/dataprovider/internal/convert/AbstractObjectConverterTest.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/...t/java/com/tngtech/java/junit/dataprovider/internal/convert/ObjectArrayConverterTest.java b/...t/java/com/tngtech/java/junit/dataprovider/internal/convert/ObjectArrayConverterTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/...est/java/com/tngtech/java/junit/dataprovider/internal/convert/SingleArgConverterTest.java b/...est/java/com/tngtech/java/junit/dataprovider/internal/convert/SingleArgConverterTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/...c/test/java/com/tngtech/java/junit/dataprovider/internal/convert/StringConverterTest.java b/...c/test/java/com/tngtech/java/junit/dataprovider/internal/convert/StringConverterTest.java
@@ -18,7 +18,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 import com.tngtech.java.junit.dataprovider.DataProvider;

diff --git a/...gtech/java/junit/dataprovider/internal/placeholder/CanonicalClassNamePlaceholderTest.java b/...gtech/java/junit/dataprovider/internal/placeholder/CanonicalClassNamePlaceholderTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/...tech/java/junit/dataprovider/internal/placeholder/CanonicalMethodNamePlaceholderTest.java b/...tech/java/junit/dataprovider/internal/placeholder/CanonicalMethodNamePlaceholderTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/...t/java/com/tngtech/java/junit/dataprovider/internal/placeholder/IndexPlaceholderTest.java b/...t/java/com/tngtech/java/junit/dataprovider/internal/placeholder/IndexPlaceholderTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/...va/com/tngtech/java/junit/dataprovider/internal/placeholder/ParameterPlaceholderTest.java b/...va/com/tngtech/java/junit/dataprovider/internal/placeholder/ParameterPlaceholderTest.java
@@ -12,7 +12,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/.../tngtech/java/junit/dataprovider/internal/placeholder/SimpleClassNamePlaceholderTest.java b/.../tngtech/java/junit/dataprovider/internal/placeholder/SimpleClassNamePlaceholderTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;
 

diff --git a/...tngtech/java/junit/dataprovider/internal/placeholder/SimpleMethodNamePlaceholderTest.java b/...tngtech/java/junit/dataprovider/internal/placeholder/SimpleMethodNamePlaceholderTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.tngtech.java.junit.dataprovider.BaseTest;