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:19 UTC
[1/3] qpid-broker-j git commit: QPID-8247: Upgrade mockito to version
2.22.0
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 20840e1f1 -> fd3c350c5
QPID-8247: Upgrade mockito to version 2.22.0
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/6fc65f51
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/6fc65f51
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/6fc65f51
Branch: refs/heads/master
Commit: 6fc65f518dcb6c8f1762531eb9b7bb01a1b6316b
Parents: 20840e1
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Oct 10 10:26:50 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Oct 10 10:26:50 2018 +0100
----------------------------------------------------------------------
.../upgrade/DatabaseTemplateTest.java | 7 +-
.../BDBHARemoteReplicationNodeTest.java | 21 ++-
...HAVirtualHostNodeOperationalLoggingTest.java | 33 +----
.../StoreConfigurationChangeListenerTest.java | 8 +-
.../consumer/AbstractConsumerTargetTest.java | 2 +-
.../qpid/server/model/BrokerTestHelper.java | 130 +++----------------
.../qpid/server/model/VirtualHostTest.java | 5 +-
.../model/preferences/UserPreferencesTest.java | 40 +-----
...cerFlowControlOverflowPolicyHandlerTest.java | 19 +--
.../server/security/NonJavaKeyStoreTest.java | 5 +-
...stractDurableConfigurationStoreTestCase.java | 28 ++--
.../server/store/JsonFileConfigStoreTest.java | 23 ++--
.../qpid/server/store/MessageStoreTestCase.java | 100 ++++++--------
.../AsynchronousMessageStoreRecovererTest.java | 16 +--
.../SynchronousMessageStoreRecovererTest.java | 13 +-
.../AbstractStandardVirtualHostNodeTest.java | 3 +-
.../access/config/ClientActionTest.java | 4 +
.../v0_10/ServerSessionDelegateTest.java | 14 +-
.../protocol/v0_8/AMQPConnection_0_8Test.java | 1 +
.../protocol/v1_0/ProtocolEngine_1_0_0Test.java | 1 +
.../logback/RollingPolicyDecoratorTest.java | 25 +---
.../OAuth2InteractiveAuthenticatorTest.java | 1 +
.../auth/OAuth2PreemptiveAuthenticatorTest.java | 3 +
.../TlsOrPlainConnectionFactoryTest.java | 2 +-
.../plugin/session/LoginLogoutReporterTest.java | 10 +-
.../client/ParticipantExecutorTest.java | 5 +-
pom.xml | 6 +-
qpid-systests-parent/pom.xml | 2 +-
28 files changed, 161 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
index 7323804..a06954f 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.store.berkeleydb.upgrade;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
import static org.mockito.Matchers.same;
@@ -49,6 +52,8 @@ public class DatabaseTemplateTest extends UnitTestBase
_sourceDatabase = mock(Database.class);
when(_environment.openDatabase(any(Transaction.class), same(SOURCE_DATABASE), isA(DatabaseConfig.class)))
.thenReturn(_sourceDatabase);
+ when(_environment.openDatabase(isNull(), same(SOURCE_DATABASE), isA(DatabaseConfig.class)))
+ .thenReturn(_sourceDatabase);
}
@Test
@@ -80,7 +85,7 @@ public class DatabaseTemplateTest extends UnitTestBase
DatabaseRunnable databaseOperation = mock(DatabaseRunnable.class);
databaseTemplate.run(databaseOperation);
- verify(databaseOperation).run(_sourceDatabase, (Database)null, (Transaction)null);
+ verify(databaseOperation).run(eq(_sourceDatabase), isNull(), isNull());
verify(_sourceDatabase).close();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
index 2634750..e10d1f9 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
@@ -24,6 +24,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
+import static org.mockito.ArgumentMatchers.isNotNull;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyMap;
@@ -169,8 +171,14 @@ public class BDBHARemoteReplicationNodeTest extends UnitTestBase
{
String remoteReplicationName = getTestName();
BDBHARemoteReplicationNode remoteReplicationNode = createRemoteReplicationNode(remoteReplicationName);
- when(_mockAccessControl.authorise(any(SecurityToken.class), eq(Operation.UPDATE), eq(remoteReplicationNode), anyMap())).thenReturn(Result.DENIED);
-
+ when(_mockAccessControl.authorise(any(SecurityToken.class),
+ eq(Operation.UPDATE),
+ eq(remoteReplicationNode),
+ anyMap())).thenReturn(Result.DENIED);
+ when(_mockAccessControl.authorise(isNull(),
+ eq(Operation.UPDATE),
+ eq(remoteReplicationNode),
+ anyMap())).thenReturn(Result.DENIED);
assertNull(remoteReplicationNode.getDescription());
@@ -191,7 +199,14 @@ public class BDBHARemoteReplicationNodeTest extends UnitTestBase
String remoteReplicationName = getTestName();
BDBHARemoteReplicationNode remoteReplicationNode = createRemoteReplicationNode(remoteReplicationName);
- when(_mockAccessControl.authorise(any(SecurityToken.class), eq(Operation.DELETE), eq(remoteReplicationNode), anyMap())).thenReturn(Result.DENIED);
+ when(_mockAccessControl.authorise(any(SecurityToken.class),
+ eq(Operation.DELETE),
+ eq(remoteReplicationNode),
+ anyMap())).thenReturn(Result.DENIED);
+ when(_mockAccessControl.authorise(isNull(),
+ eq(Operation.DELETE),
+ eq(remoteReplicationNode),
+ anyMap())).thenReturn(Result.DENIED);
assertNull(remoteReplicationNode.getDescription());
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java b/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java
index 67bf9bd..5f882a3 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java
@@ -392,7 +392,7 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends UnitTestBase
return eventLogger;
}
- class LogMessageMatcher extends ArgumentMatcher<LogMessage>
+ class LogMessageMatcher implements ArgumentMatcher<LogMessage>
{
private String _expectedMessage;
private String _expectedMessageFailureDescription = null;
@@ -406,10 +406,8 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends UnitTestBase
}
@Override
- public boolean matches(Object argument)
+ public boolean matches(LogMessage logMessage)
{
- LogMessage logMessage = (LogMessage)argument;
-
boolean expectedMessageMatches = _expectedMessage.equals(logMessage.toString());
if (!expectedMessageMatches)
{
@@ -423,22 +421,9 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends UnitTestBase
return expectedMessageMatches && expectedHierarchyMatches;
}
-
- @Override
- public void describeTo(Description description)
- {
- if (_expectedMessageFailureDescription != null)
- {
- description.appendText(_expectedMessageFailureDescription);
- }
- if (_expectedHierarchyFailureDescription != null)
- {
- description.appendText(_expectedHierarchyFailureDescription);
- }
- }
}
- class LogSubjectMatcher extends ArgumentMatcher<LogSubject>
+ class LogSubjectMatcher implements ArgumentMatcher<LogSubject>
{
private LogSubject _logSubject;
private String _failureDescription = null;
@@ -449,9 +434,8 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends UnitTestBase
}
@Override
- public boolean matches(Object argument)
+ public boolean matches(LogSubject logSubject)
{
- final LogSubject logSubject = (LogSubject)argument;
final boolean foundAMatch = _logSubject.toLogString().equals(logSubject.toLogString());
if (!foundAMatch)
{
@@ -459,14 +443,5 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends UnitTestBase
}
return foundAMatch;
}
-
- @Override
- public void describeTo(Description description)
- {
- if (_failureDescription != null)
- {
- description.appendText(_failureDescription);
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java b/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
index 44b5be5..4c3b5c7 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
@@ -83,8 +83,10 @@ public class StoreConfigurationChangeListenerTest extends UnitTestBase
when(model.getParentType(eq(VirtualHost.class))).thenReturn((Class)Broker.class);
when(child.getModel()).thenReturn(model);
when(child.isDurable()).thenReturn(true);
+ final ConfiguredObjectRecord childRecord = mock(ConfiguredObjectRecord.class);
+ when(child.asObjectRecord()).thenReturn(childRecord);
_listener.childAdded(broker, child);
- verify(_store).update(eq(true), any(ConfiguredObjectRecord.class));
+ verify(_store).update(eq(true), eq(childRecord));
}
@Test
@@ -94,8 +96,10 @@ public class StoreConfigurationChangeListenerTest extends UnitTestBase
Broker broker = mock(Broker.class);
when(broker.getCategoryClass()).thenReturn(Broker.class);
when(broker.isDurable()).thenReturn(true);
+ final ConfiguredObjectRecord record = mock(ConfiguredObjectRecord.class);
+ when(broker.asObjectRecord()).thenReturn(record);
_listener.attributeSet(broker, Broker.DESCRIPTION, null, "test description");
- verify(_store).update(eq(false), any(ConfiguredObjectRecord.class));
+ verify(_store).update(eq(false), eq(record));
}
@Test
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java b/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
index 9e0239b..6c2f24a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
@@ -177,7 +177,7 @@ public class AbstractConsumerTargetTest extends UnitTestBase
_consumerTarget.sendNextMessage();
assertTrue("message credit was not restored", _consumerTarget.isCreditRestored());
- verify(_messageInstance).routeToAlternate(any(Action.class), any(ServerTransaction.class), any());
+ verify(_messageInstance).routeToAlternate(null, null, null);
}
@Test
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index b6f52d1..721c8bc 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -20,16 +20,14 @@
*/
package org.apache.qpid.server.model;
-import static org.apache.bcel.Const.ACC_INTERFACE;
-import static org.apache.bcel.Const.ACC_PUBLIC;
-import static org.apache.bcel.Const.ACC_SUPER;
+import static org.mockito.ArgumentMatchers.isNotNull;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.security.Principal;
import java.security.PrivilegedAction;
import java.util.ArrayList;
@@ -39,13 +37,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.security.auth.Subject;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.generic.ClassGen;
-
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
@@ -80,11 +74,6 @@ public class BrokerTestHelper
Collections.singleton(SYSTEM_PRINCIPAL),
Collections.emptySet(),
Collections.emptySet());
- private static final Map<Class<? extends ConfiguredObject>, Class<? extends ConfiguredObject>>
- SYSTEM_PRINCIPAL_SOURCE_MOCKS = new HashMap<>();
- private static final Map<Class<? extends ConfiguredObject>, Class<? extends ConfiguredObject>>
- SYSTEM_PRINCIPAL_AND_ACCESS_CONTROL_SOURCE_MOCKS = new HashMap<>();
- private static final AtomicInteger GENERATED_INTERFACE_COUNTER = new AtomicInteger();
private static List<VirtualHost> _createdVirtualHosts = new ArrayList<>();
@@ -116,9 +105,12 @@ public class BrokerTestHelper
public static AccessControl createAccessControlMock()
{
AccessControl mock = mock(AccessControl.class);
- when(mock.authorise(any(SecurityToken.class), any(Operation.class), any(ConfiguredObject.class))).thenReturn(
+ when(mock.authorise(any(SecurityToken.class), any(Operation.class), any(PermissionedObject.class))).thenReturn(
+ Result.DEFER);
+ when(mock.authorise(isNull(), any(Operation.class), any(PermissionedObject.class))).thenReturn(
Result.DEFER);
- when(mock.authorise(any(SecurityToken.class), any(Operation.class), any(ConfiguredObject.class), any(Map.class))).thenReturn(Result.DEFER);
+ when(mock.authorise(any(SecurityToken.class), any(Operation.class), any(PermissionedObject.class), any(Map.class))).thenReturn(Result.DEFER);
+ when(mock.authorise(isNull(), any(Operation.class), any(PermissionedObject.class), any(Map.class))).thenReturn(Result.DEFER);
when(mock.getDefault()).thenReturn(Result.ALLOWED);
return mock;
}
@@ -318,110 +310,22 @@ public class BrokerTestHelper
public static <X extends ConfiguredObject> X mockWithSystemPrincipal(Class<X> clazz, Principal principal)
{
- synchronized (SYSTEM_PRINCIPAL_SOURCE_MOCKS)
- {
- Class<?> mockedClass = SYSTEM_PRINCIPAL_SOURCE_MOCKS.get(clazz);
- if(mockedClass == null)
- {
- mockedClass = generateTestableInterface(clazz, TestableSystemPrincipalSource.class);
- SYSTEM_PRINCIPAL_SOURCE_MOCKS.put(clazz, (Class<? extends X>) mockedClass);
- }
- X mock = mock((Class<? extends X>)mockedClass);
- when(((SystemPrincipalSource)mock).getSystemPrincipal()).thenReturn(principal);
-
- return mock;
- }
+ X mock = mock(clazz, withSettings().extraInterfaces(TestableSystemPrincipalSource.class));
+ when(((SystemPrincipalSource)mock).getSystemPrincipal()).thenReturn(principal);
+ return mock;
}
public static <X extends ConfiguredObject> X mockWithSystemPrincipalAndAccessControl(Class<X> clazz,
Principal principal,
AccessControl accessControl)
{
- synchronized (SYSTEM_PRINCIPAL_AND_ACCESS_CONTROL_SOURCE_MOCKS)
- {
- Class<?> mockedClass = SYSTEM_PRINCIPAL_AND_ACCESS_CONTROL_SOURCE_MOCKS.get(clazz);
- if(mockedClass == null)
- {
- mockedClass = generateTestableInterface(clazz, TestableSystemPrincipalSource.class, TestableAccessControlSource.class);
- SYSTEM_PRINCIPAL_AND_ACCESS_CONTROL_SOURCE_MOCKS.put(clazz, (Class<? extends X>) mockedClass);
- }
- X mock = mock((Class<? extends X>)mockedClass);
- when(((SystemPrincipalSource)mock).getSystemPrincipal()).thenReturn(principal);
- when(((AccessControlSource)mock).getAccessControl()).thenReturn(accessControl);
-
- return mock;
- }
- }
-
-
- private static Class<?> generateTestableInterface(final Class<?>... interfaces)
- {
- final String fqcn = BrokerTestHelper.class.getPackage().getName() + ".Testable" + interfaces[0].getSimpleName() + "_" + GENERATED_INTERFACE_COUNTER.incrementAndGet();
- final byte[] classBytes = createSubClassByteCode(fqcn, interfaces);
-
- try
- {
- final ClassLoader classLoader = new TestableMockDelegatingClassloader(fqcn, classBytes);
- Class<?> clazz = classLoader.loadClass(fqcn);
- return clazz;
- }
- catch (ClassNotFoundException cnfe)
- {
- throw new IllegalArgumentException("Could not resolve dynamically generated class " + fqcn, cnfe);
- }
- }
-
- private static byte[] createSubClassByteCode(final String className, final Class<?>[] interfaces)
- {
- String[] ifnames = new String[interfaces.length];
- for(int i = 0; i<interfaces.length; i++)
- {
- ifnames[i] = interfaces[i].getName();
- }
- ClassGen classGen = new ClassGen(className,
- "java.lang.Object",
- "<generated>",
- ACC_PUBLIC | ACC_SUPER | ACC_INTERFACE,
- ifnames);
-
-
- JavaClass javaClass = classGen.getJavaClass();
-
- try(ByteArrayOutputStream out = new ByteArrayOutputStream())
- {
- javaClass.dump(out);
- return out.toByteArray();
- }
- catch (IOException ioex)
- {
- throw new IllegalStateException("Could not write to a ByteArrayOutputStream - should not happen", ioex);
- }
- }
-
- private static final class TestableMockDelegatingClassloader extends ClassLoader
- {
- private final String _className;
- private final Class<? extends ConfiguredObject> _clazz;
-
- private TestableMockDelegatingClassloader(String className, byte[] classBytes)
- {
- super(ConfiguredObject.class.getClassLoader());
- _className = className;
- _clazz = (Class<? extends ConfiguredObject>) defineClass(className, classBytes, 0, classBytes.length);
- }
+ X mock = mock(clazz,
+ withSettings().extraInterfaces(TestableSystemPrincipalSource.class,
+ TestableAccessControlSource.class));
+ when(((SystemPrincipalSource) mock).getSystemPrincipal()).thenReturn(principal);
+ when(((AccessControlSource) mock).getAccessControl()).thenReturn(accessControl);
- @Override
- protected Class<?> findClass(String fqcn) throws ClassNotFoundException
- {
- if (fqcn.equals(_className))
- {
- return _clazz;
- }
- else
- {
- return getParent().loadClass(fqcn);
- }
- }
+ return mock;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
index e69addf..1be4505 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
@@ -839,7 +839,7 @@ public class VirtualHostTest extends UnitTestBase
return argThat(new MinimalConfiguredObjectRecordMatcher(id, type));
}
- private static class MinimalConfiguredObjectRecordMatcher extends ArgumentMatcher<ConfiguredObjectRecord>
+ private static class MinimalConfiguredObjectRecordMatcher implements ArgumentMatcher<ConfiguredObjectRecord>
{
private final UUID _id;
private final String _type;
@@ -851,9 +851,8 @@ public class VirtualHostTest extends UnitTestBase
}
@Override
- public boolean matches(Object argument)
+ public boolean matches(ConfiguredObjectRecord rhs)
{
- ConfiguredObjectRecord rhs = (ConfiguredObjectRecord) argument;
return (_id.equals(rhs.getId()) || _type.equals(rhs.getType()));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
index 634e087..eff3017 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
@@ -222,7 +222,7 @@ public class UserPreferencesTest extends UnitTestBase
return queryPreference;
}
- private class UUIDCollectionMatcher extends ArgumentMatcher<Collection<UUID>>
+ private class UUIDCollectionMatcher implements ArgumentMatcher<Collection<UUID>>
{
private Collection<UUID> _expected;
private String _failureDescription;
@@ -233,32 +233,16 @@ public class UserPreferencesTest extends UnitTestBase
}
@Override
- public boolean matches(final Object o)
+ public boolean matches(final Collection<UUID> o)
{
- if (!(o instanceof Collection))
- {
- _failureDescription = "Not a collection";
- return false;
- }
-
_failureDescription = "Items do not match: expected " + _expected + " actual: " + o;
- return new TreeSet<>(_expected).equals(new TreeSet<>((Collection<UUID>) o));
- }
-
- @Override
- public void describeTo(Description description)
- {
- if (_failureDescription != null)
- {
- description.appendText(_failureDescription);
- }
+ return new TreeSet<>(_expected).equals(new TreeSet<>(o));
}
}
- private class PreferenceRecordMatcher extends ArgumentMatcher<Collection<PreferenceRecord>>
+ private class PreferenceRecordMatcher implements ArgumentMatcher<Collection<PreferenceRecord>>
{
private final Preference _preference;
- private String _failureDescription;
public PreferenceRecordMatcher(final Preference preference)
{
@@ -266,31 +250,25 @@ public class UserPreferencesTest extends UnitTestBase
}
@Override
- public boolean matches(final Object records)
+ public boolean matches(final Collection<PreferenceRecord> preferenceRecords)
{
- _failureDescription = "Unexpected arguments type";
- Collection<PreferenceRecord> preferenceRecords = (Collection<PreferenceRecord>) records;
if (preferenceRecords.size() != 1)
{
return false;
}
- _failureDescription = "Unexpected preference id";
PreferenceRecord record = preferenceRecords.iterator().next();
if (!record.getId().equals(_preference.getId()))
{
return false;
}
- _failureDescription = "Attributes is null";
Map<String, Object> recordAttributes = record.getAttributes();
if (recordAttributes == null)
{
return false;
}
- ;
- _failureDescription = "Expected attributes are not found: " + recordAttributes;
for (Map.Entry entry : _preference.getAttributes().entrySet())
{
if (!Objects.equals(entry.getValue(), recordAttributes.get(entry.getKey())))
@@ -302,13 +280,5 @@ public class UserPreferencesTest extends UnitTestBase
return true;
}
- @Override
- public void describeTo(Description description)
- {
- if (_failureDescription != null)
- {
- description.appendText(_failureDescription);
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
index 691a65e..0fa6024 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
@@ -38,6 +38,7 @@ import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentMatcher;
import org.apache.qpid.server.connection.SessionPrincipal;
import org.apache.qpid.server.logging.EventLogger;
@@ -196,10 +197,9 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends UnitTestBase
Collections.EMPTY_SET);
}
- public static class LogMessageMatcher extends BaseMatcher<LogMessage>
+ public static class LogMessageMatcher implements ArgumentMatcher<LogMessage>
{
private final LogMessage _expected;
- private Object _actual;
LogMessageMatcher(final LogMessage expected)
{
@@ -207,20 +207,9 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends UnitTestBase
}
@Override
- public void describeTo(final Description description)
+ public boolean matches(final LogMessage argument)
{
- description.appendText("Expected '");
- description.appendText(_expected.toString());
- description.appendText("' but got '");
- description.appendText(String.valueOf(_actual));
- description.appendText("'");
- }
-
- @Override
- public boolean matches(final Object argument)
- {
- _actual = argument;
- return argument instanceof LogMessage && _expected.toString().equals((argument).toString());
+ return _expected.toString().equals((argument).toString());
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
index 583ba8b..3d9dca7 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
@@ -304,12 +304,11 @@ public class NonJavaKeyStoreTest extends UnitTestBase
}
- private static class LogMessageArgumentMatcher extends ArgumentMatcher<LogMessage>
+ private static class LogMessageArgumentMatcher implements ArgumentMatcher<LogMessage>
{
@Override
- public boolean matches(final Object argument)
+ public boolean matches(final LogMessage arg)
{
- LogMessage arg = (LogMessage)argument;
return arg.getLogHierarchy().equals(KeyStoreMessages.EXPIRING_LOG_HIERARCHY);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
index 4951b71..34cce96 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
@@ -215,7 +215,7 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends UnitTest
return argThat(new ConfiguredObjectMatcher(id, type, attributes, parents));
}
- private static class ConfiguredObjectMatcher extends ArgumentMatcher<ConfiguredObjectRecord>
+ private static class ConfiguredObjectMatcher implements ArgumentMatcher<ConfiguredObjectRecord>
{
private final Map<String,Object> _matchingMap;
private final UUID _id;
@@ -231,23 +231,17 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends UnitTest
}
@Override
- public boolean matches(final Object argument)
+ public boolean matches(final ConfiguredObjectRecord binding)
{
- if(argument instanceof ConfiguredObjectRecord)
- {
- ConfiguredObjectRecord binding = (ConfiguredObjectRecord) argument;
-
- Map<String,Object> arg = new HashMap<>(binding.getAttributes());
- arg.remove("createdBy");
- arg.remove("createdTime");
- arg.remove("lastUpdatedTime");
- arg.remove("lastUpdatedBy");
- return (_id == ANY_UUID || _id.equals(binding.getId()))
- && _name.equals(binding.getType())
- && (_matchingMap == ANY_MAP || arg.equals(_matchingMap))
- && (_parents == ANY_MAP || matchesParents(binding));
- }
- return false;
+ Map<String,Object> arg = new HashMap<>(binding.getAttributes());
+ arg.remove("createdBy");
+ arg.remove("createdTime");
+ arg.remove("lastUpdatedTime");
+ arg.remove("lastUpdatedBy");
+ return (_id == ANY_UUID || _id.equals(binding.getId()))
+ && _name.equals(binding.getType())
+ && (_matchingMap == ANY_MAP || arg.equals(_matchingMap))
+ && (_parents == ANY_MAP || matchesParents(binding));
}
private boolean matchesParents(ConfiguredObjectRecord binding)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
index 2320610..38a508e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
@@ -468,7 +468,7 @@ public class JsonFileConfigStoreTest extends UnitTestBase
}
- private static class ConfiguredObjectMatcher extends ArgumentMatcher<ConfiguredObjectRecord>
+ private static class ConfiguredObjectMatcher implements ArgumentMatcher<ConfiguredObjectRecord>
{
private final Map<String,Object> _expectedAttributes;
private final UUID _expectedId;
@@ -482,21 +482,14 @@ public class JsonFileConfigStoreTest extends UnitTestBase
}
@Override
- public boolean matches(final Object argument)
+ public boolean matches(final ConfiguredObjectRecord binding)
{
- if(argument instanceof ConfiguredObjectRecord)
- {
- ConfiguredObjectRecord binding = (ConfiguredObjectRecord) argument;
-
- Map<String,Object> arg = new HashMap<String, Object>(binding.getAttributes());
- arg.remove("createdBy");
- arg.remove("createdTime");
- return (_expectedId == ANY_UUID || _expectedId.equals(binding.getId()))
- && _expectedType.equals(binding.getType())
- && (_expectedAttributes == ANY_MAP || arg.equals(_expectedAttributes));
-
- }
- return false;
+ Map<String,Object> arg = new HashMap<>(binding.getAttributes());
+ arg.remove("createdBy");
+ arg.remove("createdTime");
+ return (_expectedId == ANY_UUID || _expectedId.equals(binding.getId()))
+ && _expectedType.equals(binding.getType())
+ && (_expectedAttributes == ANY_MAP || arg.equals(_expectedAttributes));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
index 441b153..496e42e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
@@ -479,37 +479,29 @@ public abstract class MessageStoreTestCase extends UnitTestBase
return enqueueableMessage1;
}
- private class MessageMetaDataMatcher extends ArgumentMatcher<StoredMessage<?>>
+ private class MessageMetaDataMatcher implements ArgumentMatcher<StoredMessage<?>>
{
private long _messageNumber;
- public MessageMetaDataMatcher(long messageNumber)
+ MessageMetaDataMatcher(long messageNumber)
{
super();
_messageNumber = messageNumber;
}
@Override
- public boolean matches(Object obj)
+ public boolean matches(StoredMessage<?> obj)
{
- return obj instanceof StoredMessage && ((StoredMessage<?>)obj).getMessageNumber() == _messageNumber;
+ return obj.getMessageNumber() == _messageNumber;
}
-
- @Override
- public void describeTo(final Description description)
- {
- description.appendText("Expected messageNumber:");
- description.appendValue(_messageNumber);
- }
-
}
private class QueueFilteringMessageInstanceHandler implements MessageInstanceHandler
{
private final UUID _queueId;
- private final Set<Long> _enqueuedIds = new HashSet<Long>();
+ private final Set<Long> _enqueuedIds = new HashSet<>();
- public QueueFilteringMessageInstanceHandler(UUID queueId)
+ QueueFilteringMessageInstanceHandler(UUID queueId)
{
_queueId = queueId;
}
@@ -529,109 +521,93 @@ public abstract class MessageStoreTestCase extends UnitTestBase
return true;
}
- public Set<Long> getEnqueuedIds()
+ Set<Long> getEnqueuedIds()
{
return _enqueuedIds;
}
}
- private class EnqueueRecordMatcher extends ArgumentMatcher<MessageEnqueueRecord>
+ private class EnqueueRecordMatcher implements ArgumentMatcher<MessageEnqueueRecord>
{
private final UUID _queueId;
private final long _messageId;
- public EnqueueRecordMatcher(final UUID queueId, final long messageId)
+ EnqueueRecordMatcher(final UUID queueId, final long messageId)
{
_queueId = queueId;
_messageId = messageId;
}
@Override
- public boolean matches(final Object argument)
+ public boolean matches(final MessageEnqueueRecord record)
{
- if(argument instanceof MessageEnqueueRecord)
- {
- MessageEnqueueRecord record = (MessageEnqueueRecord)argument;
- return record.getQueueId().equals(_queueId) && record.getMessageNumber() == _messageId;
- }
- return false;
+ return record.getQueueId().equals(_queueId) && record.getMessageNumber() == _messageId;
}
}
- private class RecordMatcher extends ArgumentMatcher<Transaction.EnqueueRecord[]>
+ private class RecordMatcher implements ArgumentMatcher<Transaction.EnqueueRecord[]>
{
private final EnqueueRecord[] _expect;
- public RecordMatcher(Transaction.EnqueueRecord[] expect)
+ RecordMatcher(Transaction.EnqueueRecord[] expect)
{
_expect = expect;
}
@Override
- public boolean matches(final Object argument)
+ public boolean matches(final Transaction.EnqueueRecord[] actual)
{
- if(argument.getClass().isArray() && Transaction.EnqueueRecord.class.isAssignableFrom(argument.getClass().getComponentType()))
+ if(actual.length == _expect.length)
{
- Transaction.EnqueueRecord[] actual = (Transaction.EnqueueRecord[]) argument;
- if(actual.length == _expect.length)
+ for(int i = 0; i < actual.length; i++)
{
- for(int i = 0; i < actual.length; i++)
+ if(!actual[i].getResource().getId().equals(_expect[i].getResource().getId())
+ || actual[i].getMessage().getMessageNumber() != _expect[i].getMessage().getMessageNumber())
{
- if(!actual[i].getResource().getId().equals(_expect[i].getResource().getId())
- || actual[i].getMessage().getMessageNumber() != _expect[i].getMessage().getMessageNumber())
- {
- return false;
- }
+ return false;
}
- return true;
}
- else
- {
- return false;
- }
-
+ return true;
+ }
+ else
+ {
+ return false;
}
- return false;
+
}
}
- private class DequeueRecordMatcher extends ArgumentMatcher<Transaction.DequeueRecord[]>
+ private class DequeueRecordMatcher implements ArgumentMatcher<Transaction.DequeueRecord[]>
{
private final Transaction.DequeueRecord[] _expect;
- public DequeueRecordMatcher(Transaction.DequeueRecord[] expect)
+ DequeueRecordMatcher(Transaction.DequeueRecord[] expect)
{
_expect = expect;
}
@Override
- public boolean matches(final Object argument)
+ public boolean matches(final Transaction.DequeueRecord[] actual)
{
- if(argument.getClass().isArray() && Transaction.DequeueRecord.class.isAssignableFrom(argument.getClass().getComponentType()))
+ if(actual.length == _expect.length)
{
- Transaction.DequeueRecord[] actual = (Transaction.DequeueRecord[]) argument;
- if(actual.length == _expect.length)
+ for(int i = 0; i < actual.length; i++)
{
- for(int i = 0; i < actual.length; i++)
+ if(!actual[i].getEnqueueRecord().getQueueId().equals(_expect[i].getEnqueueRecord().getQueueId())
+ || actual[i].getEnqueueRecord().getMessageNumber() != _expect[i].getEnqueueRecord().getMessageNumber())
{
- if(!actual[i].getEnqueueRecord().getQueueId().equals(_expect[i].getEnqueueRecord().getQueueId())
- || actual[i].getEnqueueRecord().getMessageNumber() != _expect[i].getEnqueueRecord().getMessageNumber())
- {
- return false;
- }
+ return false;
}
- return true;
- }
- else
- {
- return false;
}
-
+ return true;
+ }
+ else
+ {
+ return false;
}
- return false;
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
index deef1e6..830ee9f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
@@ -145,19 +145,9 @@ public class AsynchronousMessageStoreRecovererTest extends UnitTestBase
verify(orphanedMessage, times(1)).remove();
verify(newMessage, times(0)).remove();
- verify(queue).recover(argThat(new ArgumentMatcher<ServerMessage>()
- {
- @Override
- public boolean matches(final Object argument)
- {
- if (argument instanceof ServerMessage)
- {
- ServerMessage serverMessage = (ServerMessage)argument;
- return serverMessage.getMessageNumber() == storedMessage.getMessageNumber();
- }
- return false;
- }
- }), same(messageEnqueueRecord));
+ verify(queue).recover(argThat((ArgumentMatcher<ServerMessage>) serverMessage -> serverMessage.getMessageNumber()
+ == storedMessage.getMessageNumber()),
+ same(messageEnqueueRecord));
}
private StoredMessage<?> createTestMessage(final long messageNumber)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
index 666ad0e..1cf562f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
@@ -300,7 +300,7 @@ public class SynchronousMessageStoreRecovererTest extends UnitTestBase
branch.commit();
ServerMessage<?> message = storedMessage.getMetaData().getType().createMessage(storedMessage);
- verify(queue, times(1)).enqueue(eq(message), (Action<? super MessageInstance>)isNull(), any(MessageEnqueueRecord.class));
+ verify(queue, times(1)).enqueue(eq(message), isNull(), isNull());
verify(transaction).commitTran();
}
@@ -450,7 +450,7 @@ public class SynchronousMessageStoreRecovererTest extends UnitTestBase
}
- private final class MessageEnqueueRecordMatcher extends ArgumentMatcher<MessageEnqueueRecord>
+ private final class MessageEnqueueRecordMatcher implements ArgumentMatcher<MessageEnqueueRecord>
{
private final long _messageId;
private final UUID _queueId;
@@ -462,11 +462,10 @@ public class SynchronousMessageStoreRecovererTest extends UnitTestBase
}
@Override
- public boolean matches(Object argument)
+ public boolean matches(MessageEnqueueRecord argument)
{
- return argument instanceof MessageEnqueueRecord
- && ((MessageEnqueueRecord)argument).getMessageNumber() == _messageId
- && ((MessageEnqueueRecord)argument).getQueueId().equals(_queueId);
+ return argument.getMessageNumber() == _messageId
+ && argument.getQueueId().equals(_queueId);
}
}
@@ -475,7 +474,7 @@ public class SynchronousMessageStoreRecovererTest extends UnitTestBase
private final UUID _queueId;
private final long _messageId;
- public TestMessageEnqueueRecord(final UUID queueId, final long messageId)
+ TestMessageEnqueueRecord(final UUID queueId, final long messageId)
{
_queueId = queueId;
_messageId = messageId;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
index f7d3f31..45a20c0 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
@@ -87,12 +87,11 @@ public class AbstractStandardVirtualHostNodeTest extends UnitTestBase
@Before
public void setUp() throws Exception
{
-
+ _taskExecutor = new CurrentThreadTaskExecutor();
_broker = BrokerTestHelper.createBrokerMock();
SystemConfig<?> systemConfig = (SystemConfig<?>) _broker.getParent();
when(systemConfig.getObjectFactory()).thenReturn(new ConfiguredObjectFactoryImpl(mock(Model.class)));
- _taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
index 2135688..e4f33c8 100644
--- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
+++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/ClientActionTest.java
@@ -45,6 +45,7 @@ public class ClientActionTest extends UnitTestBase
{
when(_action.matches(any(Action.class))).thenReturn(true);
when(_ruleAction.getFirewallRule()).thenReturn(null);
+ when(_ruleAction.getAction()).thenReturn(mock(Action.class));
assertTrue(_clientAction.matches(_ruleAction, _addressOfClient));
}
@@ -57,6 +58,7 @@ public class ClientActionTest extends UnitTestBase
when(_action.matches(any(Action.class))).thenReturn(false);
when(_ruleAction.getFirewallRule()).thenReturn(firewallRule);
+ when(_ruleAction.getAction()).thenReturn(mock(Action.class));
assertFalse(_clientAction.matches(_ruleAction, _addressOfClient));
}
@@ -69,6 +71,7 @@ public class ClientActionTest extends UnitTestBase
when(_action.matches(any(Action.class))).thenReturn(true);
when(_ruleAction.getFirewallRule()).thenReturn(firewallRule);
+ when(_ruleAction.getAction()).thenReturn(mock(Action.class));
assertTrue(_clientAction.matches(_ruleAction, _addressOfClient));
}
@@ -80,6 +83,7 @@ public class ClientActionTest extends UnitTestBase
when(_action.matches(any(Action.class))).thenReturn(true);
when(_ruleAction.getFirewallRule()).thenReturn(firewallRule);
+ when(_ruleAction.getAction()).thenReturn(mock(Action.class));
assertTrue(_clientAction.matches(_ruleAction, null));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
index ada7004..f731822 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
@@ -69,16 +69,10 @@ public class ServerSessionDelegateTest extends UnitTestBase
final ExchangeDelete method = new ExchangeDelete(getTestName(), Option.IF_UNUSED);
_delegate.exchangeDelete(_session, method);
- verify(_session).invoke(argThat(new ArgumentMatcher<ExecutionException>()
- {
- @Override
- public boolean matches(Object object)
- {
- ExecutionException exception = (ExecutionException)object;
- return exception.getErrorCode() == ExecutionErrorCode.PRECONDITION_FAILED
- && "Exchange has bindings".equals(exception.getDescription());
- }
- }));
+ verify(_session).invoke(argThat((ArgumentMatcher<ExecutionException>) exception -> exception.getErrorCode()
+ == ExecutionErrorCode.PRECONDITION_FAILED
+ && "Exchange has bindings".equals(
+ exception.getDescription())));
}
@Test
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
index 509ad8b..d235b4b 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
@@ -163,6 +163,7 @@ public class AMQPConnection_0_8Test extends UnitTestBase
_network = mock(ServerNetworkConnection.class);
when(_network.getSender()).thenReturn(_sender);
when(_network.getLocalAddress()).thenReturn(new InetSocketAddress("localhost", 12345));
+ when(_network.getSelectedHost()).thenReturn("localhost");
_transport = Transport.TCP;
_protocol = Protocol.AMQP_0_8;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
index 5cd74f5..d91a5ac 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
@@ -95,6 +95,7 @@ public class ProtocolEngine_1_0_0Test extends UnitTestBase
{
_networkConnection = mock(ServerNetworkConnection.class);
when(_networkConnection.getLocalAddress()).thenReturn(new InetSocketAddress(0));
+ when(_networkConnection.getSelectedHost()).thenReturn("localhost");
_broker = mock(Broker.class);
when(_broker.getModel()).thenReturn(BrokerModel.getInstance());
when(_broker.getNetworkBufferSize()).thenReturn(256*1026);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/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 d6d798e..e2c54ac 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
@@ -48,6 +48,7 @@ import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentMatcher;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
@@ -144,7 +145,7 @@ public class RollingPolicyDecoratorTest extends UnitTestBase
_policy.rollover();
verify(_delegate).rollover();
- Matcher<String[]> matcher = getMatcher(new String[]{_testFile.getName()});
+ ArgumentMatcher<String[]> matcher = getMatcher(new String[]{_testFile.getName()});
verify(_listener).onRollover(eq(_baseFolder.toPath()), argThat(matcher));
}
@@ -153,7 +154,7 @@ public class RollingPolicyDecoratorTest extends UnitTestBase
{
_policy.rollover();
verify(_delegate).rollover();
- Matcher<String[]> matcher = getMatcher(new String[]{_testFile.getName()});
+ ArgumentMatcher<String[]> matcher = getMatcher(new String[]{_testFile.getName()});
verify(_listener).onRollover(eq(_baseFolder.toPath()), argThat(matcher));
_policy.rollover();
verify(_delegate, times(2)).rollover();
@@ -166,32 +167,20 @@ public class RollingPolicyDecoratorTest extends UnitTestBase
_policy.rollover();
verify(_delegate).rollover();
- Matcher<String[]> matcher = getMatcher(new String[]{ _testFile.getName() });
+ ArgumentMatcher<String[]> matcher = getMatcher(new String[]{ _testFile.getName() });
verify(_listener).onRollover(eq(_baseFolder.toPath()), argThat(matcher));
File secondFile = createTestFile("test.2015-06-25.1.gz");
_policy.rollover();
verify(_delegate, times(2)).rollover();
- Matcher<String[]> matcher2 = getMatcher(new String[]{_testFile.getName(), secondFile.getName()});
+ ArgumentMatcher<String[]> matcher2 = getMatcher(new String[]{_testFile.getName(), secondFile.getName()});
verify(_listener).onRollover(eq(_baseFolder.toPath()), argThat(matcher2));
}
- private Matcher<String[]> getMatcher(final String[] expected)
+ private ArgumentMatcher<String[]> getMatcher(final String[] expected)
{
- return new BaseMatcher<String[]>()
- {
- @Override
- public boolean matches(Object item)
- {
- return Arrays.equals(expected, (String[]) item);
- }
- @Override
- public void describeTo(Description description)
- {
- description.appendValueList("[", ",", "]", expected);
- }
- };
+ return item -> Arrays.equals(expected, item);
}
@Test
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/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 0b5f88a..435b7e0 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
@@ -399,6 +399,7 @@ public class OAuth2InteractiveAuthenticatorTest extends UnitTestBase
when(mockRequest.getRequestURL()).thenReturn(url);
when(mockRequest.getRemoteHost()).thenReturn(TEST_REMOTE_HOST);
when(mockRequest.getRemotePort()).thenReturn(TEST_REMOTE_PORT);
+ when(mockRequest.getServerName()).thenReturn(TEST_REMOTE_HOST);
return mockRequest;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/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 ba8f6ee..5c682d2 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
@@ -75,6 +75,7 @@ public class OAuth2PreemptiveAuthenticatorTest extends UnitTestBase
public void testAttemptAuthenticationSuccessful() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
+ when(mockRequest.getServerName()).thenReturn("localhost");
when(mockRequest.getHeader("Authorization")).thenReturn("Bearer " + TEST_VALID_ACCESS_TOKEN);
Subject subject = _authenticator.attemptAuthentication(mockRequest, _mockConfiguration);
assertNotNull("Authenticator failed unexpectedly", subject);
@@ -89,6 +90,7 @@ public class OAuth2PreemptiveAuthenticatorTest extends UnitTestBase
public void testAttemptAuthenticationUnauthorizedUser() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
+ when(mockRequest.getServerName()).thenReturn("localhost");
when(mockRequest.getHeader("Authorization")).thenReturn("Bearer " + TEST_UNAUTHORIZED_ACCESS_TOKEN);
Subject subject = _authenticator.attemptAuthentication(mockRequest, _mockConfiguration);
assertNotNull("Authenticator failed unexpectedly", subject);
@@ -102,6 +104,7 @@ public class OAuth2PreemptiveAuthenticatorTest extends UnitTestBase
public void testAttemptAuthenticationInvalidToken() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
+ when(mockRequest.getServerName()).thenReturn("localhost");
when(mockRequest.getHeader("Authorization")).thenReturn("Bearer " + TEST_INVALID_ACCESS_TOKEN);
Subject subject = _authenticator.attemptAuthentication(mockRequest, _mockConfiguration);
assertNull("Authenticator did not fail with invalid access token", subject);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/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 a278fac..7ed8134 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
@@ -73,7 +73,7 @@ public class TlsOrPlainConnectionFactoryTest extends UnitTestBase
when(sslEngine.getSession()).thenReturn(sslSession);
when(sslSession.getPacketBufferSize()).thenReturn(Integer.MAX_VALUE);
- _factory = new TlsOrPlainConnectionFactory(_sslContextFactory, null);
+ _factory = new TlsOrPlainConnectionFactory(_sslContextFactory, "test");
_actualConnection = mock(AbstractConnection.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/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 1a5277c..cd690dd 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
@@ -74,14 +74,6 @@ public class LoginLogoutReporterTest extends UnitTestBase
private LogMessage isLogMessageWithMessage(final String expectedMessage)
{
- return argThat( new ArgumentMatcher<LogMessage>()
- {
- @Override
- public boolean matches(Object argument)
- {
- LogMessage actual = (LogMessage) argument;
- return actual.toString().equals(expectedMessage);
- }
- });
+ return argThat(actual -> actual.toString().equals(expectedMessage));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/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 f508b0d..cfc5fb7 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
@@ -102,12 +102,11 @@ public class ParticipantExecutorTest extends UnitTestBase
}
}
- private static class ResultHasError extends ArgumentMatcher<ParticipantResult>
+ private static class ResultHasError implements ArgumentMatcher<ParticipantResult>
{
@Override
- public boolean matches(Object argument)
+ public boolean matches(ParticipantResult result)
{
- ParticipantResult result = (ParticipantResult) argument;
return result.hasError();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6f30bb3..429cca3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,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>
<netty-version>4.1.28.Final</netty-version>
<hamcrest-version>1.3</hamcrest-version>
<maven-core-version>3.5.0</maven-core-version>
@@ -212,7 +212,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -611,7 +611,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6fc65f51/qpid-systests-parent/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index 6fb8b0d..f63a2fe 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito-version}</version>
<scope>compile</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-broker-j git commit: QPID-8247: Replace deprecated
Matchers with ArgumentMatchers
Posted by or...@apache.org.
QPID-8247: Replace deprecated Matchers with ArgumentMatchers
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/fd3c350c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/fd3c350c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/fd3c350c
Branch: refs/heads/master
Commit: fd3c350c522d574b5c3fa1c1c44d38c03d573d35
Parents: 6fc65f5
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Oct 10 10:37:22 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Oct 10 10:37:22 2018 +0100
----------------------------------------------------------------------
.../BDBMessageStoreQuotaEventsTest.java | 2 +-
.../berkeleydb/BDBPreferenceStoreTest.java | 2 +-
.../StandardEnvironmentFacadeFactoryTest.java | 2 +-
.../StandardEnvironmentFacadeTest.java | 6 +++---
.../ReplicatedEnvironmentFacadeTest.java | 8 ++++----
.../upgrade/DatabaseTemplateTest.java | 7 +++----
.../BDBHARemoteReplicationNodeTest.java | 9 ++++-----
.../store/ManagementModeStoreHandlerTest.java | 4 ++--
.../StoreConfigurationChangeListenerTest.java | 2 +-
.../ConnectionVersionValidatorTest.java | 6 +++---
.../consumer/AbstractConsumerTargetTest.java | 4 ++--
.../server/exchange/DirectExchangeTest.java | 2 +-
.../server/exchange/FanoutExchangeTest.java | 2 +-
.../server/exchange/HeadersExchangeTest.java | 2 +-
.../qpid/server/exchange/TopicExchangeTest.java | 2 +-
.../qpid/server/model/BrokerTestHelper.java | 4 ++--
.../qpid/server/model/VirtualHostTest.java | 10 +++++-----
.../server/model/adapter/PortFactoryTest.java | 2 +-
.../server/model/port/AmqpPortImplTest.java | 2 +-
.../model/preferences/UserPreferencesTest.java | 2 +-
.../server/queue/AbstractQueueTestBase.java | 6 +++---
.../FlowToDiskOverflowPolicyHandlerTest.java | 2 +-
.../server/queue/LastValueQueueListTest.java | 2 +-
.../server/queue/NotificationCheckTest.java | 4 ++--
.../server/queue/PriorityQueueListTest.java | 2 +-
...cerFlowControlOverflowPolicyHandlerTest.java | 4 ++--
.../server/queue/QueueEntryImplTestBase.java | 6 +++---
.../server/queue/QueueEntryListTestBase.java | 2 +-
.../server/queue/QueueMessageRecoveryTest.java | 2 +-
.../queue/RingOverflowPolicyHandlerTest.java | 6 +++---
.../server/queue/SimpleQueueEntryImplTest.java | 2 +-
.../server/queue/SortedQueueEntryListTest.java | 4 ++--
.../qpid/server/queue/SortedQueueEntryTest.java | 4 ++--
.../queue/StandardQueueEntryListTest.java | 2 +-
.../server/security/NonJavaKeyStoreTest.java | 6 +++---
.../security/TrustStoreMessageSourceTest.java | 2 +-
...ncipalDatabaseAuthenticationManagerTest.java | 4 ++--
...pleLDAPAuthenticationManagerFactoryTest.java | 2 +-
.../sasl/crammd5/CramMd5NegotiatorTest.java | 2 +-
.../auth/sasl/oauth2/OAuth2NegotiatorTest.java | 4 ++--
.../auth/sasl/plain/PlainNegotiatorTest.java | 4 ++--
.../auth/sasl/scram/ScramNegotiatorTest.java | 2 +-
.../AESKeyFileEncrypterFactoryTest.java | 2 +-
...stractDurableConfigurationStoreTestCase.java | 4 ++--
.../server/store/JsonFileConfigStoreTest.java | 4 ++--
.../qpid/server/store/MessageStoreTestCase.java | 6 +++---
.../JsonFilePreferenceStoreTest.java | 4 ++--
.../transport/TCPandSSLTransportTest.java | 2 +-
.../transport/TransactionTimeoutTickerTest.java | 2 +-
.../txn/FlowToDiskTransactionObserverTest.java | 4 ++--
.../AsynchronousMessageStoreRecovererTest.java | 8 ++++----
.../SynchronousMessageStoreRecovererTest.java | 8 ++++----
.../VirtualHostPropertiesNodeTest.java | 2 +-
.../virtualhostalias/VirtualHostAliasTest.java | 2 +-
.../AbstractStandardVirtualHostNodeTest.java | 6 +++---
.../RedirectingVirtualHostNodeTest.java | 2 +-
.../access/config/AclRulePredicatesTest.java | 2 +-
.../config/LegacyAccessControlAdapterTest.java | 6 +++---
...PropertyConverter_Internal_to_v0_10Test.java | 4 ++--
.../v0_10/ServerSessionDelegateTest.java | 2 +-
.../protocol/v0_10/ServerSessionTest.java | 2 +-
.../server/protocol/v0_8/AMQChannelTest.java | 6 +++---
.../protocol/v0_8/AMQPConnection_0_8Test.java | 8 ++++----
.../PropertyConverter_Internal_to_v0_8Test.java | 4 ++--
.../v1_0/store/bdb/BDBLinkStoreTest.java | 6 +++---
.../protocol/v1_0/ConsumerTarget_1_0Test.java | 8 ++++----
.../PropertyConverter_Internal_to_v1_0Test.java | 2 +-
.../protocol/v1_0/ProtocolEngine_1_0_0Test.java | 6 +++---
.../protocol/v1_0/SendingLinkEndpointTest.java | 2 +-
.../server/protocol/v1_0/Session_1_0Test.java | 2 +-
.../PropertyConverter_1_0_to_0_10Test.java | 2 +-
.../PropertyConverter_1_0_to_0_8Test.java | 2 +-
.../store/derby/DerbyPreferenceStoreTest.java | 2 +-
.../logging/logback/CompositeFilterTest.java | 2 +-
.../logback/RollingPolicyDecoratorTest.java | 6 +++---
.../OAuth2InteractiveAuthenticatorTest.java | 10 +++++-----
.../auth/OAuth2PreemptiveAuthenticatorTest.java | 4 ++--
.../TlsOrPlainConnectionFactoryTest.java | 4 ++--
.../ConfiguredObjectToMapConverterTest.java | 6 +++---
.../plugin/session/LoginLogoutReporterTest.java | 4 ++--
.../apache/qpid/disttest/client/ClientTest.java | 6 +++---
.../disttest/client/MessageProviderTest.java | 2 +-
.../client/ParticipantExecutorTest.java | 20 +++-----------------
.../client/ProducerParticipantTest.java | 2 +-
.../disttest/controller/ControllerTest.java | 6 +++---
.../controller/OrdinaryTestRunnerTest.java | 6 +++---
.../disttest/results/ResultsCsvWriterTest.java | 2 +-
.../disttest/results/ResultsXmlWriterTest.java | 2 +-
88 files changed, 171 insertions(+), 187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
index 806002f..8fb41e8 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreQuotaEventsTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.store.berkeleydb;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
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;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
index dd183ab..5e05018 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
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/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
index 8282df1..78a1543 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
index 4eff65b..9522dd3 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
@@ -30,9 +30,9 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
index 73d7ac4..e2d5ce2 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
@@ -48,10 +48,10 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
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/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
index a06954f..4a0d892 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplateTest.java
@@ -20,12 +20,11 @@
*/
package org.apache.qpid.server.store.berkeleydb.upgrade;
-import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.ArgumentMatchers.same;
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/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
index e10d1f9..0b62e3d 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
@@ -24,12 +24,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.ArgumentMatchers.isNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
index cfe7aba..f47476b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
@@ -23,8 +23,8 @@ package org.apache.qpid.server.configuration.store;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
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-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java b/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
index 4c3b5c7..b4ae21a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.configuration.store;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
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-core/src/test/java/org/apache/qpid/server/connection/ConnectionVersionValidatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/connection/ConnectionVersionValidatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/connection/ConnectionVersionValidatorTest.java
index 2b9072f..1de9b25 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/connection/ConnectionVersionValidatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/connection/ConnectionVersionValidatorTest.java
@@ -22,9 +22,9 @@ package org.apache.qpid.server.connection;
import static org.junit.Assert.assertFalse;
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.never;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java b/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
index 6c2f24a..4ba48f8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
@@ -23,8 +23,8 @@ package org.apache.qpid.server.consumer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
index 1269232..153d85b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-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/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
index 016f75f..26d94f8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
@@ -24,7 +24,7 @@ import static org.apache.qpid.server.filter.AMQPFilterTypes.JMS_SELECTOR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 166e486..18678da 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.exchange;
import static org.apache.qpid.server.filter.AMQPFilterTypes.JMS_SELECTOR;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index 200b20d..d2b7f48 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -24,7 +24,7 @@ import static org.apache.qpid.server.filter.AMQPFilterTypes.JMS_SELECTOR;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index 721c8bc..db236f1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -22,8 +22,8 @@ package org.apache.qpid.server.model;
import static org.mockito.ArgumentMatchers.isNotNull;
import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
index 1be4505..dc96a93 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
@@ -25,11 +25,11 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index 6653f6c..f7e36b4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.eq;
+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-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
index d17aa5c..4775334 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-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-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
index eff3017..87dfbbf 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
@@ -19,7 +19,7 @@
package org.apache.qpid.server.model.preferences;
import static org.apache.qpid.server.model.preferences.PreferenceTestHelper.awaitPreferenceFuture;
-import static org.mockito.Matchers.argThat;
+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/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
index 58c8f5a..ac6e984 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
@@ -27,9 +27,9 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.contains;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.contains;
+import static org.mockito.ArgumentMatchers.eq;
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/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
index 4f23fd0..e711364 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
@@ -20,7 +20,7 @@
package org.apache.qpid.server.queue;
-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.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
index 073b67c..b42a988 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
@@ -22,7 +22,7 @@ package org.apache.qpid.server.queue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
index 39e7648..04d1a82 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
@@ -24,8 +24,8 @@ import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_AGE_ALERT;
import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_COUNT_ALERT;
import static org.apache.qpid.server.queue.NotificationCheck.MESSAGE_SIZE_ALERT;
import static org.apache.qpid.server.queue.NotificationCheck.QUEUE_DEPTH_ALERT;
-import static org.mockito.Matchers.contains;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.contains;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
index e77ef81..739da45 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
@@ -21,7 +21,7 @@
package org.apache.qpid.server.queue;
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.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
index 0fa6024..6ebb484 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
@@ -21,8 +21,8 @@ package org.apache.qpid.server.queue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.same;
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-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
index bbd3dad..7a42986 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-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.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/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
index 265b1c0..5ca73da 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-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/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
index 4940df9..857fc9b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
@@ -21,7 +21,7 @@
package org.apache.qpid.server.queue;
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.when;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
index 9d26754..a69af14 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
@@ -19,9 +19,9 @@
package org.apache.qpid.server.queue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
index 0f0285a..f67a1e4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.queue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-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/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
index 9d3c80f..d7c4d8d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
@@ -21,8 +21,8 @@ package org.apache.qpid.server.queue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+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-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
index 4a80275..f7f7183 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
@@ -22,8 +22,8 @@ package org.apache.qpid.server.queue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+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-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
index 6ee283a..8f9d783 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-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/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
index 3d9dca7..e8589e8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
@@ -24,9 +24,9 @@ import static org.apache.qpid.test.utils.TestSSLConstants.KEYSTORE_PASSWORD;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
index 027730d..3fc1393 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-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/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
index d1860f1..3896a1a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+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-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
index 909884f..2edd16d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
@@ -22,7 +22,7 @@ package org.apache.qpid.server.security.auth.manager;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.eq;
+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-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
index 11e8e2b..cc8e8dd 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.security.auth.sasl.crammd5;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
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/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
index 577fa2a..0f61734 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
@@ -24,8 +24,8 @@ package org.apache.qpid.server.security.auth.sasl.oauth2;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
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/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
index 8571151..7c25929 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
@@ -24,8 +24,8 @@ import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.AdditionalMatchers.not;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
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/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
index 788c6e4..3bd0949 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.eq;
+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-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
index 7d287a6..9b27904 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
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/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
index 34cce96..07d10a8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
@@ -20,8 +20,8 @@
*/
package org.apache.qpid.server.store;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
index 38a508e..66ca3cf 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.inOrder;
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-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
index 496e42e..0c8a4ca 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-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.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-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java
index d4586c8..21bc17c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java
@@ -22,8 +22,8 @@ package org.apache.qpid.server.store.preferences;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyCollection;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyCollection;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java b/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
index 5c61df4..ef6d5f4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-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/broker-core/src/test/java/org/apache/qpid/server/transport/TransactionTimeoutTickerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/transport/TransactionTimeoutTickerTest.java b/broker-core/src/test/java/org/apache/qpid/server/transport/TransactionTimeoutTickerTest.java
index 55de5c3..f259c8f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/transport/TransactionTimeoutTickerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/transport/TransactionTimeoutTickerTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.transport;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/txn/FlowToDiskTransactionObserverTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/txn/FlowToDiskTransactionObserverTest.java b/broker-core/src/test/java/org/apache/qpid/server/txn/FlowToDiskTransactionObserverTest.java
index 39d48f2..21e6d6b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/txn/FlowToDiskTransactionObserverTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/txn/FlowToDiskTransactionObserverTest.java
@@ -20,8 +20,8 @@
*/
package org.apache.qpid.server.txn;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.same;
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-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
index 830ee9f..0ae4e6f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
@@ -23,10 +23,10 @@ package org.apache.qpid.server.virtualhost;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.doThrow;
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-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
index 1cf562f..27076e8 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
@@ -21,10 +21,10 @@
package org.apache.qpid.server.virtualhost;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.any;
+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.never;
import static org.mockito.Mockito.times;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNodeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNodeTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNodeTest.java
index 793da15..928d2f6 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNodeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNodeTest.java
@@ -19,7 +19,7 @@
package org.apache.qpid.server.virtualhost;
import static org.junit.Assert.assertNotNull;
-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/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
index d78cc5b..4fa5b2f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.eq;
+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-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
index 45a20c0..af72113 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeTest.java b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeTest.java
index 64fa42e..e551860 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.virtualhostnode;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+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/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
index 2b4c3d5..0cd767b 100644
--- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
+++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclRulePredicatesTest.java
@@ -25,7 +25,7 @@ import static org.apache.qpid.server.security.access.config.ObjectProperties.Pro
import static org.apache.qpid.server.security.access.config.ObjectProperties.Property.NAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
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/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
index b1ec492..9ed63c6 100644
--- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
+++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
@@ -24,9 +24,9 @@ import static org.apache.qpid.server.security.access.config.LegacyOperation.ACCE
import static org.apache.qpid.server.security.access.config.ObjectType.BROKER;
import static org.apache.qpid.server.security.access.config.ObjectType.VIRTUALHOST;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
index cb8980a..9f48b40 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
-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.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/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
index f731822..314d180 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.doReturn;
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/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
index 104cafa..d5bd980 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
@@ -21,7 +21,7 @@ package org.apache.qpid.server.protocol.v0_10;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+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/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
index 1fb9940..f4f68e8 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
index d235b4b..1edaac0 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
@@ -23,10 +23,10 @@ package org.apache.qpid.server.protocol.v0_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+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/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
index 8a92d61..9adb968 100644
--- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
+++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
-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.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/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java b/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
index 8bc0c7f..a9b444b 100644
--- a/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
+++ b/broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
@@ -25,9 +25,9 @@ import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+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/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
index 9647fcf..4233fff 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
@@ -22,10 +22,10 @@ package org.apache.qpid.server.protocol.v1_0;
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.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+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/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
index 4963dd1..02526c6 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
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/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
index d91a5ac..3f1f10f 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
@@ -22,9 +22,9 @@ package org.apache.qpid.server.protocol.v1_0;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fd3c350c/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpointTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpointTest.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpointTest.java
index 136055e..2f79a06 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpointTest.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpointTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.protocol.v1_0;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-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/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
index 83bf658..cfe2320 100644
--- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
+++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
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/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/PropertyConverter_1_0_to_0_10Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/PropertyConverter_1_0_to_0_10Test.java b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/PropertyConverter_1_0_to_0_10Test.java
index 3b5d978..cfe2bba 100644
--- a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/PropertyConverter_1_0_to_0_10Test.java
+++ b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/PropertyConverter_1_0_to_0_10Test.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
-import static org.mockito.Matchers.anyString;
+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/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
index 5eab830..99a7015 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
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
[2/3] qpid-broker-j git commit: QPID-8247: Replace deprecated
Matchers with ArgumentMatchers
Posted by or...@apache.org.
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