You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2017/08/07 15:06:50 UTC
qpid-jms git commit: QPIDJMS-311 Fixes to enable build and test on
JDK9
Repository: qpid-jms
Updated Branches:
refs/heads/master 5f998009b -> 96e20d076
QPIDJMS-311 Fixes to enable build and test on JDK9
* Update Mockito to 2.8.47+
* Update Jacoco to 0.7.9+
* Use Base64 in Scram-SHA mechanism
* Fix failing Mockito based tests
* Fix deprecation warnings
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/96e20d07
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/96e20d07
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/96e20d07
Branch: refs/heads/master
Commit: 96e20d076d543c83ebbcdb0976ddeb94eea78430
Parents: 5f99800
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Aug 4 17:54:48 2017 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Aug 7 10:52:46 2017 -0400
----------------------------------------------------------------------
pom.xml | 8 +-
qpid-jms-client/pom.xml | 2 +-
.../qpid/jms/jndi/JNDIReferenceFactory.java | 5 +-
.../apache/qpid/jms/message/JmsMapMessage.java | 4 +-
.../org/apache/qpid/jms/message/JmsMessage.java | 4 +-
.../jms/sasl/AbstractScramSHAMechanism.java | 10 +-
.../org/apache/qpid/jms/util/FactoryFinder.java | 15 +-
.../qpid/jms/util/TypeConversionSupport.java | 2 +-
.../org/apache/qpid/jms/JmsContextTest.java | 234 ++++++++++---------
.../qpid/jms/consumer/JmsConsumerTest.java | 6 +-
.../qpid/jms/message/JmsBytesMessageTest.java | 4 +-
.../qpid/jms/message/JmsStreamMessageTest.java | 4 +-
.../JmsDefaultDeserializationPolicyTest.java | 6 +-
.../qpid/jms/producer/JmsProducerTest.java | 23 +-
.../amqp/AmqpSaslAuthenticatorTest.java | 16 +-
.../AmqpJmsMessagePropertyIntercepterTest.java | 9 +-
.../jms/transports/X509AliasKeyManagerTest.java | 2 +-
.../ClassLoadingAwareObjectInputStreamTest.java | 2 +-
.../org/apache/qpid/jms/util/LRUCacheTest.java | 2 +-
.../qpid-jms-activemq-tests/pom.xml | 14 +-
20 files changed, 188 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2e2a12b..28ea51e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,8 @@
<activemq-version>5.15.0</activemq-version>
<junit-version>4.12</junit-version>
<fuse-joram-tests-version>1.0</fuse-joram-tests-version>
- <jetty-version>9.2.13.v20150730</jetty-version>
- <mockito-version>1.10.19</mockito-version>
+ <jetty-version>9.4.6.v20170531</jetty-version>
+ <mockito-version>2.8.47</mockito-version>
<hamcrest-version>1.3</hamcrest-version>
<hadoop-minikdc-version>2.8.1</hadoop-minikdc-version>
@@ -62,7 +62,7 @@
<maven-idea-plugin-version>2.5</maven-idea-plugin-version>
<maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version>
<findbugs-maven-plugin-version>3.0.2</findbugs-maven-plugin-version>
- <jacoco-plugin-version>0.7.5.201505241946</jacoco-plugin-version>
+ <jacoco-plugin-version>0.7.9</jacoco-plugin-version>
<!-- Test properties -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -171,7 +171,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-jms/blob/96e20d07/qpid-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index 5f21047..f7fd3e6 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
index c1a3857..5081eb0 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
@@ -56,14 +56,13 @@ public class JNDIReferenceFactory implements ObjectFactory {
* if building the instance from Reference fails (usually class not found)
*/
@Override
- public Object getObjectInstance(Object object, Name name, Context nameCtx, Hashtable<?, ?> environment)
- throws Exception {
+ public Object getObjectInstance(Object object, Name name, Context nameCtx, Hashtable<?, ?> environment) throws Exception {
Object result = null;
if (object instanceof Reference) {
Reference reference = (Reference) object;
Class<?> theClass = loadClass(this, reference.getClassName());
if (JNDIStorable.class.isAssignableFrom(theClass)) {
- JNDIStorable store = (JNDIStorable) theClass.newInstance();
+ JNDIStorable store = (JNDIStorable) theClass.getDeclaredConstructor().newInstance();
Map<String, String> properties = new HashMap<String, String>();
for (Enumeration<RefAddr> iter = reference.getAll(); iter.hasMoreElements();) {
StringRefAddr addr = (StringRefAddr) iter.nextElement();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
index 4ec02fe..e53460d 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMapMessage.java
@@ -243,12 +243,12 @@ public class JmsMapMessage extends JmsMessage implements MapMessage {
@Override
public void setFloat(String name, float value) throws JMSException {
checkReadOnlyBody();
- put(name, new Float(value));
+ put(name, Float.valueOf(value));
}
@Override
public void setDouble(String name, double value) throws JMSException {
- put(name, new Double(value));
+ put(name, Double.valueOf(value));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
index cd5f679..2e1b985 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
@@ -420,12 +420,12 @@ public class JmsMessage implements javax.jms.Message {
@Override
public void setFloatProperty(String name, float value) throws JMSException {
- setObjectProperty(name, new Float(value));
+ setObjectProperty(name, Float.valueOf(value));
}
@Override
public void setDoubleProperty(String name, double value) throws JMSException {
- setObjectProperty(name, new Double(value));
+ setObjectProperty(name, Double.valueOf(value));
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java
index 5f616fc..4565fc4 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java
@@ -22,11 +22,11 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
import java.util.Arrays;
+import java.util.Base64;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import javax.security.sasl.SaslException;
-import javax.xml.bind.DatatypeConverter;
abstract class AbstractScramSHAMechanism extends AbstractMechanism {
private static final byte[] INT_1 = new byte[]{0, 0, 0, 1};
@@ -126,7 +126,7 @@ abstract class AbstractScramSHAMechanism extends AbstractMechanism {
throw new SaslException("Server challenge '" + serverFirstMessage + "' cannot be parsed, cannot find salt");
}
String base64Salt = parts[1].substring(2);
- salt = DatatypeConverter.parseBase64Binary(base64Salt);
+ salt = Base64.getDecoder().decode(base64Salt);
if (!parts[2].startsWith("i=")) {
throw new SaslException("Server challenge '" + serverFirstMessage + "' cannot be parsed, cannot find iteration count");
}
@@ -140,7 +140,7 @@ abstract class AbstractScramSHAMechanism extends AbstractMechanism {
String clientFinalMessageWithoutProof =
- "c=" + DatatypeConverter.printBase64Binary(GS2_HEADER.getBytes(StandardCharsets.US_ASCII))
+ "c=" + Base64.getEncoder().encodeToString(GS2_HEADER.getBytes(StandardCharsets.US_ASCII))
+ ",r=" + serverNonce;
String authMessage = clientFirstMessageBare
@@ -159,7 +159,7 @@ abstract class AbstractScramSHAMechanism extends AbstractMechanism {
serverSignature = computeHmac(serverKey, authMessage);
String finalMessageWithProof = clientFinalMessageWithoutProof
- + ",p=" + DatatypeConverter.printBase64Binary(clientProof);
+ + ",p=" + Base64.getEncoder().encodeToString(clientProof);
return finalMessageWithProof.getBytes();
} catch (NoSuchAlgorithmException e) {
throw new SaslException(e.getMessage(), e);
@@ -172,7 +172,7 @@ abstract class AbstractScramSHAMechanism extends AbstractMechanism {
if (!parts[0].startsWith("v=")) {
throw new SaslException("Server final message did not contain verifier");
}
- byte[] serverSignature = DatatypeConverter.parseBase64Binary(parts[0].substring(2));
+ byte[] serverSignature = Base64.getDecoder().decode(parts[0].substring(2));
if (!Arrays.equals(this.serverSignature, serverSignature)) {
throw new SaslException("Server signature did not match");
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
index fb4140f..9fbcc5a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
@@ -19,6 +19,7 @@ package org.apache.qpid.jms.util;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,8 +57,11 @@ public class FactoryFinder<T extends Object> {
* @throws ResourceNotFoundException if the path does not exist.
* @throws IOException if the search encounter an IO error.
* @throws ClassNotFoundException if the class that is to be loaded cannot be found.
+ * @throws InvocationTargetException if the constructor of the found factory throws an exception
+ * @throws NoSuchMethodException if the factory class found does not have a suitable constructor
+ * @throws SecurityException if a security error occurs trying to create the factory instance.
*/
- public Object create(String path) throws IllegalAccessException, InstantiationException, IOException, ClassNotFoundException, ResourceNotFoundException;
+ public Object create(String path) throws IllegalAccessException, InstantiationException, IOException, ClassNotFoundException, ResourceNotFoundException, NoSuchMethodException, SecurityException, InvocationTargetException;
}
@@ -115,8 +119,11 @@ public class FactoryFinder<T extends Object> {
* @throws IOException if the search encounter an IO error.
* @throws ClassNotFoundException if the class that is to be loaded cannot be found.
* @throws ClassCastException if the found object is not assignable to the request factory type.
+ * @throws InvocationTargetException if the constructor of the found factory throws an exception
+ * @throws NoSuchMethodException if the factory class found does not have a suitable constructor
+ * @throws SecurityException if a security error occurs trying to create the factory instance.
*/
- public T newInstance(String key) throws IllegalAccessException, InstantiationException, IOException, ClassNotFoundException, ClassCastException, ResourceNotFoundException {
+ public T newInstance(String key) throws IllegalAccessException, InstantiationException, IOException, ClassNotFoundException, ClassCastException, ResourceNotFoundException, InvocationTargetException, NoSuchMethodException, SecurityException {
T factory = cachedFactories.get(key);
if (factory == null) {
Object found = objectFactory.create(path + key);
@@ -156,7 +163,7 @@ public class FactoryFinder<T extends Object> {
final ConcurrentHashMap<String, Properties> propertiesMap = new ConcurrentHashMap<String, Properties>();
@Override
- public Object create(final String path) throws InstantiationException, IllegalAccessException, ClassNotFoundException, IOException, ResourceNotFoundException {
+ public Object create(final String path) throws InstantiationException, IllegalAccessException, ClassNotFoundException, IOException, ResourceNotFoundException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
Class<?> clazz = classMap.get(path);
Properties properties = propertiesMap.get(path);
@@ -173,7 +180,7 @@ public class FactoryFinder<T extends Object> {
}
}
- Object factory = clazz.newInstance();
+ Object factory = clazz.getDeclaredConstructor().newInstance();
if (!PropertyUtil.setProperties(factory, properties).isEmpty()) {
String msg = ""
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java
index 09f5c67..511f0cd 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/TypeConversionSupport.java
@@ -151,7 +151,7 @@ public final class TypeConversionSupport {
CONVERSION_MAP.put(new ConversionKey(Float.class, Double.class), new Converter() {
@Override
public Object convert(Object value) {
- return new Double(((Number) value).doubleValue());
+ return Double.valueOf(((Number) value).doubleValue());
}
});
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsContextTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsContextTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsContextTest.java
index 4f88d7b..ba57e8d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsContextTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsContextTest.java
@@ -22,6 +22,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.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
import java.io.Serializable;
import java.util.UUID;
@@ -47,7 +52,6 @@ import org.apache.qpid.jms.provider.mock.MockRemotePeer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mockito;
/**
@@ -178,9 +182,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
// No session until needed.
- Mockito.verify(connection, Mockito.times(0)).createSession(Matchers.anyInt());
+ Mockito.verify(connection, Mockito.times(0)).createSession(anyInt());
assertNotNull(context.createTemporaryQueue());
- Mockito.verify(connection, Mockito.times(1)).createSession(Matchers.anyInt());
+ Mockito.verify(connection, Mockito.times(1)).createSession(anyInt());
context.close();
}
@@ -191,9 +195,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
- Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createConsumer(Matchers.any(Destination.class))).thenReturn(consumer);
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(connection.createSession(anyInt())).thenReturn(session);
+ Mockito.when(session.createConsumer(any(Destination.class))).thenReturn(consumer);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -204,7 +208,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Destination.class));
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Destination.class));
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -214,9 +218,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
- Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createConsumer(Matchers.any(Destination.class))).thenReturn(consumer);
+ Mockito.when(connection.createSession(anyInt())).thenReturn(session);
+ Mockito.when(session.createConsumer(any(Destination.class))).thenReturn(consumer);
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -227,7 +231,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Destination.class));
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Destination.class));
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -237,9 +241,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createConsumer(Matchers.any(Destination.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createConsumer(any(Destination.class), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -250,7 +254,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -260,9 +264,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createConsumer(Matchers.any(Destination.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createConsumer(any(Destination.class), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -273,7 +277,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -283,9 +287,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createConsumer(Matchers.any(Destination.class), Matchers.anyString(), Matchers.anyBoolean())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createConsumer(any(Destination.class), anyString(), anyBoolean())).thenReturn(consumer);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -296,7 +300,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyBoolean());
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Topic.class), anyString(), anyBoolean());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -306,9 +310,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createConsumer(Matchers.any(Destination.class), Matchers.anyString(), Matchers.anyBoolean())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createConsumer(any(Destination.class), anyString(), anyBoolean())).thenReturn(consumer);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -319,7 +323,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyBoolean());
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Topic.class), anyString(), anyBoolean());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -329,9 +333,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createDurableConsumer(any(Topic.class), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -342,7 +346,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createDurableConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -352,9 +356,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createDurableConsumer(any(Topic.class), anyString())).thenReturn(consumer);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -365,7 +369,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createDurableConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -375,9 +379,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString(), Matchers.anyBoolean())).thenReturn(consumer);
+ Mockito.when(session.createDurableConsumer(any(Topic.class), anyString(), anyString(), anyBoolean())).thenReturn(consumer);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -388,7 +392,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString(), Matchers.anyBoolean());
+ Mockito.verify(session, Mockito.times(1)).createDurableConsumer(any(Topic.class), anyString(), anyString(), anyBoolean());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -398,9 +402,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString(), Matchers.anyBoolean())).thenReturn(consumer);
+ Mockito.when(session.createDurableConsumer(any(Topic.class), anyString(), anyString(), anyBoolean())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -411,7 +415,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString(), Matchers.anyBoolean());
+ Mockito.verify(session, Mockito.times(1)).createDurableConsumer(any(Topic.class), anyString(), anyString(), anyBoolean());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -421,9 +425,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createSharedConsumer(any(Topic.class), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -434,7 +438,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -444,9 +448,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createSharedConsumer(any(Topic.class), anyString())).thenReturn(consumer);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -457,7 +461,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -467,9 +471,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createSharedConsumer(any(Topic.class), anyString(), anyString())).thenReturn(consumer);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -480,7 +484,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedConsumer(any(Topic.class), anyString(), anyString());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -490,9 +494,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createSharedConsumer(any(Topic.class), anyString(), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -503,7 +507,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedConsumer(any(Topic.class), anyString(), anyString());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -513,9 +517,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createSharedDurableConsumer(any(Topic.class), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -526,7 +530,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -536,9 +540,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createSharedDurableConsumer(any(Topic.class), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -549,7 +553,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(any(Topic.class), anyString());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -559,9 +563,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createSharedDurableConsumer(any(Topic.class), anyString(), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -572,7 +576,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(any(Topic.class), anyString(), anyString());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -582,9 +586,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsMessageConsumer consumer = Mockito.mock(JmsMessageConsumer.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString())).thenReturn(consumer);
+ Mockito.when(session.createSharedDurableConsumer(any(Topic.class), anyString(), anyString())).thenReturn(consumer);
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -595,7 +599,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(any(Topic.class), anyString(), anyString());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -605,9 +609,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsQueueBrowser browser = Mockito.mock(JmsQueueBrowser.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createBrowser(Matchers.any(Queue.class))).thenReturn(browser);
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(session.createBrowser(any(Queue.class))).thenReturn(browser);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -618,7 +622,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createBrowser(Matchers.any(Queue.class));
+ Mockito.verify(session, Mockito.times(1)).createBrowser(any(Queue.class));
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -628,9 +632,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsQueueBrowser browser = Mockito.mock(JmsQueueBrowser.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createBrowser(Matchers.any(Queue.class))).thenReturn(browser);
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(session.createBrowser(any(Queue.class))).thenReturn(browser);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -641,7 +645,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createBrowser(Matchers.any(Queue.class));
+ Mockito.verify(session, Mockito.times(1)).createBrowser(any(Queue.class));
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -651,9 +655,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsQueueBrowser browser = Mockito.mock(JmsQueueBrowser.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createBrowser(Matchers.any(Queue.class))).thenReturn(browser);
+ Mockito.when(session.createBrowser(any(Queue.class))).thenReturn(browser);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(true);
@@ -664,7 +668,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createBrowser(Matchers.any(Queue.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createBrowser(any(Queue.class), anyString());
Mockito.verify(connection, Mockito.times(1)).start();
}
@@ -674,9 +678,9 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsSession session = Mockito.mock(JmsSession.class);
JmsQueueBrowser browser = Mockito.mock(JmsQueueBrowser.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
- Mockito.when(session.createBrowser(Matchers.any(Queue.class))).thenReturn(browser);
+ Mockito.when(session.createBrowser(any(Queue.class))).thenReturn(browser);
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
context.setAutoStart(false);
@@ -687,7 +691,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createBrowser(Matchers.any(Queue.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createBrowser(any(Queue.class), anyString());
Mockito.verify(connection, Mockito.times(0)).start();
}
@@ -848,7 +852,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).unsubscribe(Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).unsubscribe(anyString());
}
@Test
@@ -866,7 +870,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createTopic(Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createTopic(anyString());
}
@Test
@@ -884,7 +888,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createQueue(Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createQueue(anyString());
}
@Test
@@ -1046,11 +1050,11 @@ public class JmsContextTest extends JmsConnectionTestSupport {
public void testRuntimeExceptionOnCreateConsumer() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createConsumer(Matchers.any(Destination.class));
+ Mockito.doThrow(IllegalStateException.class).when(session).createConsumer(any(Destination.class));
try {
context.createConsumer(context.createTemporaryQueue());
@@ -1060,18 +1064,18 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Destination.class));
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Destination.class));
}
@Test
public void testRuntimeExceptionOnCreateConsumerWithSelector() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createConsumer(Matchers.any(Destination.class), Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createConsumer(any(Destination.class), anyString());
try {
context.createConsumer(context.createTemporaryQueue(), "a = b");
@@ -1081,18 +1085,18 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Destination.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Destination.class), anyString());
}
@Test
public void testRuntimeExceptionOnCreateConsumerWithSelectorNoLocal() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createConsumer(Matchers.any(Destination.class), Matchers.anyString(), Matchers.anyBoolean());
+ Mockito.doThrow(IllegalStateException.class).when(session).createConsumer(any(Destination.class), anyString(), anyBoolean());
try {
context.createConsumer(context.createTemporaryQueue(), "a = b", true);
@@ -1102,18 +1106,18 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createConsumer(Matchers.any(Destination.class), Matchers.anyString(), Matchers.anyBoolean());
+ Mockito.verify(session, Mockito.times(1)).createConsumer(any(Destination.class), anyString(), anyBoolean());
}
@Test
public void testRuntimeExceptionOnCreateDurableConsumer() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createDurableConsumer(any(Topic.class), anyString());
try {
context.createDurableConsumer(context.createTemporaryTopic(), "name");
@@ -1123,19 +1127,19 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createDurableConsumer(any(Topic.class), anyString());
}
@Test
public void testRuntimeExceptionOnCreateDurableConsumerSelectorNoLocal() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
Mockito.doThrow(IllegalStateException.class).when(session).
- createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString(), Matchers.anyBoolean());
+ createDurableConsumer(any(Topic.class), anyString(), anyString(), anyBoolean());
try {
context.createDurableConsumer(context.createTemporaryTopic(), "name", "a = b", true);
@@ -1145,18 +1149,18 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString(), Matchers.anyBoolean());
+ Mockito.verify(session, Mockito.times(1)).createDurableConsumer(any(Topic.class), anyString(), anyString(), anyBoolean());
}
@Test
public void testRuntimeExceptionOnCreateSharedConsumer() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createSharedConsumer(any(Topic.class), anyString());
try {
context.createSharedConsumer(context.createTemporaryTopic(), "name");
@@ -1166,19 +1170,19 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedConsumer(any(Topic.class), anyString());
}
@Test
public void testRuntimeExceptionOnCreateSharedConsumerSelectorNoLocal() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
Mockito.doThrow(IllegalStateException.class).when(session).
- createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ createSharedConsumer(any(Topic.class), anyString(), anyString());
try {
context.createSharedConsumer(context.createTemporaryTopic(), "name", "a = b");
@@ -1188,18 +1192,18 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedConsumer(any(Topic.class), anyString(), anyString());
}
@Test
public void testRuntimeExceptionOnCreateSharedDurableConsumer() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createSharedDurableConsumer(any(Topic.class), anyString());
try {
context.createSharedDurableConsumer(context.createTemporaryTopic(), "name");
@@ -1209,19 +1213,19 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(any(Topic.class), anyString());
}
@Test
public void testRuntimeExceptionOnCreateSharedDurableConsumerSelectorNoLocal() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
+ Mockito.when(session.createTemporaryTopic()).thenReturn(new JmsTemporaryTopic());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
Mockito.doThrow(IllegalStateException.class).when(session).
- createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ createSharedDurableConsumer(any(Topic.class), anyString(), anyString());
try {
context.createSharedDurableConsumer(context.createTemporaryTopic(), "name", "a = b");
@@ -1231,18 +1235,18 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(Matchers.any(Topic.class), Matchers.anyString(), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createSharedDurableConsumer(any(Topic.class), anyString(), anyString());
}
@Test
public void testRuntimeExceptionOnCreateQueueBrowser() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createBrowser(Matchers.any(Queue.class));
+ Mockito.doThrow(IllegalStateException.class).when(session).createBrowser(any(Queue.class));
try {
context.createBrowser(context.createTemporaryQueue());
@@ -1252,18 +1256,18 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createBrowser(Matchers.any(Queue.class));
+ Mockito.verify(session, Mockito.times(1)).createBrowser(any(Queue.class));
}
@Test
public void testRuntimeExceptionOnCreateQueueBrowserWithSelector() throws JMSException {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsSession session = Mockito.mock(JmsSession.class);
- Mockito.when(connection.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
+ Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
JmsContext context = new JmsContext(connection, JMSContext.AUTO_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createBrowser(Matchers.any(Queue.class), Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createBrowser(any(Queue.class), anyString());
try {
context.createBrowser(context.createTemporaryQueue(), "a == b");
@@ -1273,7 +1277,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
context.close();
}
- Mockito.verify(session, Mockito.times(1)).createBrowser(Matchers.any(Queue.class), Matchers.anyString());
+ Mockito.verify(session, Mockito.times(1)).createBrowser(any(Queue.class), anyString());
}
@Test
@@ -1281,7 +1285,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(connection).createSession(Matchers.anyInt());
+ Mockito.doThrow(IllegalStateException.class).when(connection).createSession(anyInt());
try {
context.createTemporaryQueue();
@@ -1402,7 +1406,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).unsubscribe(Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).unsubscribe(anyString());
try {
context.unsubscribe("subscription");
@@ -1420,7 +1424,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createTopic(Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createTopic(anyString());
try {
context.createTopic("test");
@@ -1438,7 +1442,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createQueue(Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createQueue(anyString());
try {
context.createQueue("test");
@@ -1506,7 +1510,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(connection).setClientID(Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(connection).setClientID(anyString());
try {
context.setClientID("client");
@@ -1538,7 +1542,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
JmsConnection connection = Mockito.mock(JmsConnection.class);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(connection).setExceptionListener(Matchers.any(ExceptionListener.class));
+ Mockito.doThrow(IllegalStateException.class).when(connection).setExceptionListener(nullable(ExceptionListener.class));
try {
context.setExceptionListener(null);
@@ -1608,7 +1612,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createTextMessage(Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createTextMessage(anyString());
try {
context.createTextMessage("test");
@@ -1698,7 +1702,7 @@ public class JmsContextTest extends JmsConnectionTestSupport {
Mockito.when(connection.createSession(Mockito.anyInt())).thenReturn(session);
JmsContext context = new JmsContext(connection, JMSContext.CLIENT_ACKNOWLEDGE);
- Mockito.doThrow(IllegalStateException.class).when(session).createObjectMessage(Matchers.any(Serializable.class));
+ Mockito.doThrow(IllegalStateException.class).when(session).createObjectMessage(any(Serializable.class));
try {
context.createObjectMessage(UUID.randomUUID());
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerTest.java
index d0f576e..019183d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerTest.java
@@ -18,6 +18,7 @@ package org.apache.qpid.jms.consumer;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyLong;
import java.util.Map;
@@ -29,7 +30,6 @@ import org.apache.qpid.jms.JmsConsumer;
import org.apache.qpid.jms.JmsMessageConsumer;
import org.apache.qpid.jms.JmsSession;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mockito;
/**
@@ -94,7 +94,7 @@ public class JmsConsumerTest {
consumer.close();
}
- Mockito.verify(messageConsumer, Mockito.times(1)).receive(Matchers.anyInt());
+ Mockito.verify(messageConsumer, Mockito.times(1)).receive(anyLong());
}
@Test
@@ -279,7 +279,7 @@ public class JmsConsumerTest {
JmsMessageConsumer messageConsumer = Mockito.mock(JmsMessageConsumer.class);
JmsConsumer consumer = new JmsConsumer(session, messageConsumer);
- Mockito.doThrow(IllegalStateException.class).when(messageConsumer).receive(Matchers.anyInt());
+ Mockito.doThrow(IllegalStateException.class).when(messageConsumer).receive(anyLong());
try {
consumer.receive(100);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
index e7711ce..0eb948a 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
@@ -447,8 +447,8 @@ public class JmsBytesMessageTest {
msg.writeObject(Short.valueOf((short) 3));
msg.writeObject(Integer.valueOf(3));
msg.writeObject(Long.valueOf(300L));
- msg.writeObject(new Float(3.3f));
- msg.writeObject(new Double(3.3));
+ msg.writeObject(Float.valueOf(3.3f));
+ msg.writeObject(Double.valueOf(3.3));
msg.writeObject(new byte[3]);
} catch (MessageFormatException mfe) {
fail("objectified primitives should be allowed");
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
index 777f685..4692f70 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
@@ -209,10 +209,10 @@ public class JmsStreamMessageTest {
public void testClearBodyAppliesCorrectState() throws JMSException {
JmsStreamMessage streamMessage = factory.createStreamMessage();
try {
- streamMessage.writeObject(new Long(2));
+ streamMessage.writeObject(Long.valueOf(2));
streamMessage.clearBody();
assertFalse(streamMessage.isReadOnlyBody());
- streamMessage.writeObject(new Long(2));
+ streamMessage.writeObject(Long.valueOf(2));
streamMessage.readObject();
fail("should throw exception");
} catch (MessageNotReadableException mnwe) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/policy/JmsDefaultDeserializationPolicyTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/policy/JmsDefaultDeserializationPolicyTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/policy/JmsDefaultDeserializationPolicyTest.java
index ccb59ff..5f103e4 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/policy/JmsDefaultDeserializationPolicyTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/policy/JmsDefaultDeserializationPolicyTest.java
@@ -248,7 +248,7 @@ public class JmsDefaultDeserializationPolicyTest {
public void testDeserializeVectorUsingPolicy() throws Exception {
Vector<Object> vector = new Vector<Object>();
vector.add("pi");
- vector.add(new Integer(314159));
+ vector.add(Integer.valueOf(314159));
vector.add(new Vector<String>());
vector.add(Boolean.FALSE);
@@ -285,7 +285,7 @@ public class JmsDefaultDeserializationPolicyTest {
HashMap<Object, Object> map = new HashMap<Object, Object>();
map.put("a", "Value");
- map.put("b", new Integer(1));
+ map.put("b", Integer.valueOf(1));
map.put("c", new Vector<Object>());
map.put("d", Boolean.FALSE);
@@ -319,7 +319,7 @@ public class JmsDefaultDeserializationPolicyTest {
assertEquals(4, map.size());
assertEquals("Value", map.get("a"));
- assertEquals(new Integer(1), map.get("b"));
+ assertEquals(Integer.valueOf(1), map.get("b"));
assertEquals(new Vector<Object>(), map.get("c"));
assertEquals(Boolean.FALSE, map.get("d"));
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsProducerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsProducerTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsProducerTest.java
index b00a26e..638a596 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsProducerTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsProducerTest.java
@@ -28,6 +28,12 @@ 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.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
@@ -65,7 +71,6 @@ import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mockito;
/**
@@ -1264,7 +1269,7 @@ public class JmsProducerTest extends JmsConnectionTestSupport {
Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(session.createMessage()).thenReturn(message);
- Mockito.doThrow(IllegalStateException.class).when(message).setJMSCorrelationID(Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(message).setJMSCorrelationID(anyString());
JmsProducer producer = new JmsProducer(session, messageProducer);
@@ -1338,7 +1343,7 @@ public class JmsProducerTest extends JmsConnectionTestSupport {
Mockito.when(session.createTemporaryQueue()).thenReturn(new JmsTemporaryQueue());
Mockito.when(session.createMessage()).thenReturn(Mockito.mock(Message.class));
- Mockito.doThrow(IllegalStateException.class).when(session).createTextMessage(Matchers.anyString());
+ Mockito.doThrow(IllegalStateException.class).when(session).createTextMessage(anyString());
JmsProducer producer = new JmsProducer(session, messageProducer);
@@ -1383,9 +1388,9 @@ public class JmsProducerTest extends JmsConnectionTestSupport {
Mockito.doThrow(new InvalidDestinationException("ide"))
.when(mockSession)
- .send(Mockito.any(JmsMessageProducer.class), Mockito.any(Destination.class), Mockito.any(Message.class),
- Mockito.any(int.class), Mockito.any(int.class), Mockito.any(long.class), Mockito.any(boolean.class),
- Mockito.any(boolean.class), Mockito.any(long.class), Mockito.any(CompletionListener.class));
+ .send(any(JmsMessageProducer.class), nullable(Destination.class), any(Message.class),
+ anyInt(), anyInt(), anyLong(), anyBoolean(),
+ anyBoolean(), anyLong(), nullable(CompletionListener.class));
JmsProducer producer = new JmsProducer(mockSession, mockMessageProducer);
@@ -1394,9 +1399,9 @@ public class JmsProducerTest extends JmsConnectionTestSupport {
fail("Should have thrown an InvalidDestinationRuntimeException");
} catch (InvalidDestinationRuntimeException idre) {}
- Mockito.verify(mockSession).send(Mockito.any(JmsMessageProducer.class), Mockito.any(Destination.class), Mockito.any(Message.class),
- Mockito.any(int.class), Mockito.any(int.class), Mockito.any(long.class), Mockito.any(boolean.class),
- Mockito.any(boolean.class), Mockito.any(long.class), Mockito.any(CompletionListener.class));
+ Mockito.verify(mockSession).send(any(JmsMessageProducer.class), nullable(Destination.class), any(Message.class),
+ anyInt(), anyInt(), anyLong(), anyBoolean(),
+ anyBoolean(), anyLong(), nullable(CompletionListener.class));
}
//----- Internal Support -------------------------------------------------//
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticatorTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticatorTest.java
index c034728..17349fe 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticatorTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticatorTest.java
@@ -16,12 +16,11 @@
*/
package org.apache.qpid.jms.provider.amqp;
-import static org.apache.qpid.proton.engine.Sasl.SaslState;
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.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -36,14 +35,13 @@ import java.util.function.Function;
import javax.security.sasl.SaslException;
+import org.apache.qpid.jms.sasl.Mechanism;
+import org.apache.qpid.proton.engine.Sasl;
+import org.apache.qpid.proton.engine.Sasl.SaslState;
import org.junit.Before;
import org.junit.Test;
import org.mockito.stubbing.Answer;
-import org.apache.qpid.jms.provider.AsyncResult;
-import org.apache.qpid.jms.sasl.Mechanism;
-import org.apache.qpid.proton.engine.Sasl;
-
public class AmqpSaslAuthenticatorTest {
private static final String MECHANISM_NAME = "MY_MECHANISM";
@@ -162,9 +160,9 @@ public class AmqpSaslAuthenticatorTest {
private void configureSaslMockToProduce(final Sasl sasl, final byte[] challenge) {
when(sasl.pending()).thenReturn(challenge.length);
Answer<Void> answer = invocationOnMock -> {
- byte[] buf = invocationOnMock.getArgumentAt(0, byte[].class);
- int offset = invocationOnMock.getArgumentAt(1, int.class);
- int length = invocationOnMock.getArgumentAt(2, int.class);
+ byte[] buf = invocationOnMock.getArgument(0);
+ int offset = invocationOnMock.getArgument(1);
+ int length = invocationOnMock.getArgument(2);
System.arraycopy(challenge, 0, buf, offset, Math.min(length, challenge.length));
return null;
};
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
index 9d1917d..8b29a25 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
@@ -25,6 +25,7 @@ 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.ArgumentMatchers.anySet;
import java.util.Set;
@@ -114,7 +115,7 @@ public class AmqpJmsMessagePropertyIntercepterTest {
AmqpJmsMessageFacade message = createAmqpMessageFacade();
Mockito.when(message.hasAmqpTimeToLiveOverride()).thenReturn(true);
Mockito.when(message.getAmqpTimeToLiveOverride()).thenReturn(65536L);
- Mockito.when(message.getApplicationPropertyNames(Mockito.anySetOf(String.class))).then(new PassPropertyNames());
+ Mockito.when(message.getApplicationPropertyNames(anySet())).then(new PassPropertyNames());
assertTrue(AmqpJmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_AMQP_TTL));
}
@@ -183,7 +184,7 @@ public class AmqpJmsMessagePropertyIntercepterTest {
public void testJmsAmqpReplyToGroupIdInPropertyNamesWhenSet() throws JMSException {
String testValue = "ReplyToGroupId";
AmqpJmsMessageFacade message = createAmqpMessageFacade();
- Mockito.when(message.getApplicationPropertyNames(Mockito.anySetOf(String.class))).then(new PassPropertyNames());
+ Mockito.when(message.getApplicationPropertyNames(anySet())).then(new PassPropertyNames());
Mockito.when(message.getReplyToGroupId()).thenReturn(testValue);
assertTrue(AmqpJmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_AMQP_REPLY_TO_GROUP_ID));
}
@@ -307,13 +308,13 @@ public class AmqpJmsMessagePropertyIntercepterTest {
private AmqpJmsMessageFacade createAmqpMessageFacade() {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
- Mockito.when(message.getApplicationPropertyNames(Mockito.anySetOf(String.class))).then(new PassPropertyNames());
+ Mockito.when(message.getApplicationPropertyNames(anySet())).then(new PassPropertyNames());
return message;
}
private AmqpJmsObjectMessageFacade createAmqpObjectMessageFacade() {
AmqpJmsObjectMessageFacade message = Mockito.mock(AmqpJmsObjectMessageFacade.class);
- Mockito.when(message.getApplicationPropertyNames(Mockito.anySetOf(String.class))).then(new PassPropertyNames());
+ Mockito.when(message.getApplicationPropertyNames(anySet())).then(new PassPropertyNames());
return message;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/X509AliasKeyManagerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/X509AliasKeyManagerTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/X509AliasKeyManagerTest.java
index 0722aaf..418d73e 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/X509AliasKeyManagerTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/X509AliasKeyManagerTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
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-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/ClassLoadingAwareObjectInputStreamTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/ClassLoadingAwareObjectInputStreamTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/ClassLoadingAwareObjectInputStreamTest.java
index 82de42c..b2a14ca 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/ClassLoadingAwareObjectInputStreamTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/ClassLoadingAwareObjectInputStreamTest.java
@@ -340,7 +340,7 @@ public class ClassLoadingAwareObjectInputStreamTest {
}
// Replace the filtered type and try again
- value[3] = new Integer(20);
+ value[3] = Integer.valueOf(20);
serialized = serializeObject(value);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/LRUCacheTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/LRUCacheTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/LRUCacheTest.java
index f8d2958..1c931c2 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/LRUCacheTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/util/LRUCacheTest.java
@@ -43,7 +43,7 @@ public class LRUCacheTest {
public void testResize() throws Exception {
LRUCache<Long, Long> underTest = new LRUCache<Long, Long>(1000);
- Long count = new Long(0);
+ Long count = Long.valueOf(0);
long max = 0;
for (; count < 27276827; count++) {
long start = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/96e20d07/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
index a0ba8c2..3c336e5 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
@@ -78,20 +78,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
<version>${jetty-version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org