You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/10/10 10:55:20 UTC
[2/3] qpid-broker-j git commit: QPID-8247: Replace deprecated
Matchers with ArgumentMatchers
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
index 375bf1e..629f35f 100644
--- a/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
+++ b/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
index c6dcf1a..d7b9379 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
@@ -21,7 +21,7 @@
package org.apache.qpid.server.logging.logback;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
index e2c54ac..05f3a01 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
@@ -21,9 +21,9 @@
package org.apache.qpid.server.logging.logback;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
index 435b7e0..1e5560a 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
@@ -23,11 +23,11 @@ package org.apache.qpid.server.management.plugin.auth;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.matches;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.matches;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
index 5c682d2..7a9affd 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
@@ -21,8 +21,8 @@ package org.apache.qpid.server.management.plugin.auth;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
index 7ed8134..73ca922 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
@@ -24,8 +24,8 @@ package org.apache.qpid.server.management.plugin.portunification;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
index 6f26f3e..2a01026 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
@@ -23,9 +23,9 @@ import static org.apache.qpid.server.management.plugin.servlet.rest.ConfiguredOb
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
index cd690dd..ef6d440 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
@@ -19,8 +19,8 @@
*/
package org.apache.qpid.server.management.plugin.session;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
index bb0ba4a..d38d382 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/ClientTest.java
@@ -19,9 +19,9 @@
*/
package org.apache.qpid.disttest.client;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
index e8e824a..9988a0d 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.qpid.disttest.client;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
index cfc5fb7..6d80655 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantExecutorTest.java
@@ -19,35 +19,21 @@
package org.apache.qpid.disttest.client;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import java.util.concurrent.Executor;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.mockito.InOrder;
import org.apache.qpid.disttest.DistributedTestException;
import org.apache.qpid.disttest.message.ParticipantResult;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
-
import org.apache.qpid.test.utils.UnitTestBase;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
public class ParticipantExecutorTest extends UnitTestBase
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
index c7bce66..c7562ef 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java
@@ -19,7 +19,7 @@
package org.apache.qpid.disttest.client;
import static org.apache.qpid.disttest.client.ParticipantTestHelper.assertExpectedProducerResults;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java b/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
index 98ac110..585db91 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
@@ -21,9 +21,9 @@ package org.apache.qpid.disttest.controller;
import static org.apache.qpid.disttest.PerfTestConstants.COMMAND_RESPONSE_TIMEOUT;
import static org.apache.qpid.disttest.PerfTestConstants.REGISTRATION_TIMEOUT;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/controller/OrdinaryTestRunnerTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/controller/OrdinaryTestRunnerTest.java b/perftests/src/test/java/org/apache/qpid/disttest/controller/OrdinaryTestRunnerTest.java
index f81f15c..aec6cb8 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/controller/OrdinaryTestRunnerTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/controller/OrdinaryTestRunnerTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.qpid.disttest.controller;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java b/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java
index bc14da0..35f32d6 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.qpid.disttest.results;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
----------------------------------------------------------------------
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java b/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
index d4edcd4..bd1dc83 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org