commit 3ded7176d65b44edf72ec6da240771fbe9c0589c
author Alex Rudyy <orudyy@apache.org> Thu May 02 00:00:54 2019 +0100
committer Alex Rudyy <orudyy@apache.org> Fri May 03 23:19:59 2019 +0100
tree 71d6d1487f9c03098917075cda42ffdaced5f881
parent 948ef002b4404a66d8164e0c47517567f8a1c1e3

QPID-8282: Upgrade mockito to version 2.22.0

client/pom.xml

diff --git a/client/pom.xml b/client/pom.xml
index 76f84c8..59e99c7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -68,7 +68,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java

diff --git a/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java b/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
index 2a0cb99..8ebd4eb 100644
--- a/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
@@ -20,9 +20,9 @@
  */
 package org.apache.qpid.client.handler;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;

client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java

diff --git a/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java b/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
index 2bde82b..6afd593 100644
--- a/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
@@ -21,10 +21,10 @@
 package org.apache.qpid.client.message;
 
 
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -112,10 +112,9 @@
         return argThat( new ArgumentMatcher<AMQDestination>()
         {
             @Override
-            public boolean matches(Object argument)
+            public boolean matches(AMQDestination argument)
             {
-                AMQDestination actual = (AMQDestination) argument;
-                return actual.getAddressName().equals(expectedAddress);
+                return argument.getAddressName().equals(expectedAddress);
             }
         });
     }

client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java

diff --git a/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java b/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
index be6da1f..73d69e3 100644
--- a/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.client.message;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java

diff --git a/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java b/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
index 21f7e24..f89e76f 100644
--- a/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
+++ b/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.client.message;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

pom.xml

diff --git a/pom.xml b/pom.xml
index 257ec8d..e0db178 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
 
     <!-- test dependency version numbers -->
     <junit-version>4.11</junit-version>
-    <mockito-version>1.9.5</mockito-version>
+    <mockito-version>2.22.0</mockito-version>
     <hamcrest-version>1.3</hamcrest-version>
     <httpclient-version>4.5.3</httpclient-version>
 
@@ -167,7 +167,7 @@
 
       <dependency>
         <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
+        <artifactId>mockito-core</artifactId>
         <version>${mockito-version}</version>
         <scope>test</scope>
       </dependency>