Cleanup mockito deprecation

Migrate to new API.

Change-Id: Id824fa266ff31472d10a12909445083c3dc9f9ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
index af1553764556c2e113659bc8ec6ad32dcb9fdce4..4112923212e37e748c64d665d2e7ab150fb52be4 100644 (file)
--- a/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
+++ b/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
@@ -24,7 +24,7 @@ public class ArgumentsExtractorVerifier implements VerificationMode {
     @Override
     public void verify(final VerificationData data) {
         List<Invocation> actualInvocations =
-            InvocationsFinder.findInvocations(data.getAllInvocations(), data.getWanted());
+            InvocationsFinder.findInvocations(data.getAllInvocations(), data.getTarget());
         if (actualInvocations.size() != 1) {
             throw new MockitoException("This verifier can only be used with 1 invocation, got "
                     + actualInvocations.size());
@@ -36,7 +36,7 @@ public class ArgumentsExtractorVerifier implements VerificationMode {
     }
 
     @Override
-    public VerificationMode description(String description) {
+    public VerificationMode description(final String description) {
         return VerificationModeFactory.description(this, description);
     }
 

diff --git a/common/mockito-configuration/src/main/java/org/mockito/configuration/package-info.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/package-info.java
index 5031862ba5ab573f1f3d94c517ba8b615d19ccbd..de51c9a7c27d71388405017da2455103fed41763 100644 (file)
--- a/common/mockito-configuration/src/main/java/org/mockito/configuration/package-info.java
+++ b/common/mockito-configuration/src/main/java/org/mockito/configuration/package-info.java
@@ -19,7 +19,7 @@
  * <p>TODO Point to the "other/new artifact with more sane Mockito helper, with
  * explicit API.
  *
- * @see MockitoConfiguration
+ * @see org.mockito.configuration.MockitoConfiguration
  * @see org.mockito.configuration.IMockitoConfiguration
  */
 package org.mockito.configuration;

diff --git a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
index 6a88e902d2c03a31dbe0f6d423e01ffaab986f91..4c26d8bacb3b5101480c6479dedf703964000f34 100644 (file)
--- a/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
+++ b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
@@ -13,7 +13,6 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
 import java.util.List;
-
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -26,7 +25,7 @@ public class ArgumentsExtractorVerifierTest {
     @Test
     public void test() {
         MockitoAnnotations.initMocks(this);
-        doReturn(true).when(this.mockedList).add(any(String.class));
+        doReturn(Boolean.TRUE).when(this.mockedList).add(any(String.class));
         final String argument = "something";
         this.mockedList.add(argument);
         // retrieve argument
@@ -34,5 +33,4 @@ public class ArgumentsExtractorVerifierTest {
         verify(this.mockedList, argumentsExtractorVerifier).add(any(String.class));
         assertArrayEquals(new Object[] { argument }, argumentsExtractorVerifier.getArguments());
     }
-
 }

diff --git a/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
index a478dc1b6fc73db0dabc8b81ecc5a4b90f2d2306..c8c290ff783c3ec2ea39a97828b242089bc2f8d9 100644 (file)
--- a/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
+++ b/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
@@ -9,17 +9,16 @@ package org.mockito.configuration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 
 import java.io.Closeable;
 import java.io.IOException;
-
 import org.junit.Test;
-import org.mockito.Mockito;
 
 public class DefaultAnswerTest {
     @Test
     public void testAnswering() throws IOException {
-        Closeable mock = Mockito.mock(Closeable.class);
+        Closeable mock = mock(Closeable.class);
         try {
             mock.close();
             fail();