You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/05/30 15:21:58 UTC
[2/3] qpid-broker-j git commit: QPID-7605: [Java Broker] AMQP 1.0
support the soleconn AMQP extension
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
new file mode 100644
index 0000000..d0f3f04
--- /dev/null
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
@@ -0,0 +1,286 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.tests.protocol.v1_0.extensions.soleconn;
+
+import static org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionConnectionProperties.SOLE_CONNECTION_FOR_CONTAINER;
+import static org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionConnectionProperties.SOLE_CONNECTION_DETECTION_POLICY;
+import static org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionConnectionProperties.SOLE_CONNECTION_ENFORCEMENT_POLICY;
+import static org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionEnforcementPolicy.REFUSE_CONNECTION;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasKey;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isIn;
+import static org.junit.Assume.assumeThat;
+
+import java.net.InetSocketAddress;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionDetectionPolicy;
+import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Close;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Open;
+import org.apache.qpid.tests.protocol.v1_0.BrokerAdmin;
+import org.apache.qpid.tests.protocol.v1_0.FrameTransport;
+import org.apache.qpid.tests.protocol.v1_0.PerformativeResponse;
+import org.apache.qpid.tests.protocol.v1_0.ProtocolTestBase;
+
+public class RefuseConnectionPolicy extends ProtocolTestBase
+{
+ private InetSocketAddress _brokerAddress;
+
+ @Before
+ public void setUp()
+ {
+ _brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.ANONYMOUS_AMQP);
+ }
+
+ @Test
+ public void basicNegotiation() throws Exception
+ {
+ try (FrameTransport transport = new FrameTransport(_brokerAddress))
+ {
+ transport.doProtocolNegotiation();
+ Open open = new Open();
+ open.setContainerId("testContainerId");
+ open.setDesiredCapabilities(new Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+ open.setProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
+ REFUSE_CONNECTION));
+
+ transport.sendPerformative(open);
+ PerformativeResponse response = (PerformativeResponse) transport.getNextResponse();
+
+ assertThat(response, is(notNullValue()));
+ assertThat(response.getFrameBody(), is(instanceOf(Open.class)));
+ Open responseOpen = (Open) response.getFrameBody();
+ assertThat(Arrays.asList(responseOpen.getOfferedCapabilities()), hasItem(SOLE_CONNECTION_FOR_CONTAINER));
+ if (responseOpen.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
+ {
+ assertThat(responseOpen.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
+ isIn(new UnsignedInteger[]{SoleConnectionDetectionPolicy.STRONG.getValue(),
+ SoleConnectionDetectionPolicy.WEAK.getValue()}));
+ }
+ }
+ }
+
+ @Test
+ public void newConnectionRefused() throws Exception
+ {
+ try (FrameTransport transport1 = new FrameTransport(_brokerAddress))
+ {
+ transport1.doProtocolNegotiation();
+ Open open = new Open();
+ open.setContainerId("testContainerId");
+ open.setDesiredCapabilities(new Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+ open.setProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
+ REFUSE_CONNECTION));
+
+ transport1.sendPerformative(open);
+ PerformativeResponse response = (PerformativeResponse) transport1.getNextResponse();
+
+ assertThat(response, is(notNullValue()));
+ assertThat(response.getFrameBody(), is(instanceOf(Open.class)));
+
+ try (FrameTransport transport2 = new FrameTransport(_brokerAddress))
+ {
+ transport2.doProtocolNegotiation();
+ Open open2 = new Open();
+ open2.setContainerId("testContainerId");
+ open2.setDesiredCapabilities(new Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+ open2.setProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
+ REFUSE_CONNECTION));
+
+ transport2.sendPerformative(open2);
+
+ PerformativeResponse response2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(response2, is(notNullValue()));
+ assertThat(response2.getFrameBody(), is(instanceOf(Open.class)));
+ Open responseOpen2 = (Open) response2.getFrameBody();
+ assertThat(Arrays.asList(responseOpen2.getOfferedCapabilities()), hasItem(SOLE_CONNECTION_FOR_CONTAINER));
+ assertThat(responseOpen2.getProperties(), hasKey(Symbol.valueOf("amqp:connection-establishment-failed")));
+ assertThat(responseOpen2.getProperties().get(Symbol.valueOf("amqp:connection-establishment-failed")), is(true));
+
+ PerformativeResponse closeResponse2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(closeResponse2, is(notNullValue()));
+ assertThat(closeResponse2.getFrameBody(), is(instanceOf(Close.class)));
+ Close close2 = (Close) closeResponse2.getFrameBody();
+ assertThat(close2.getError(), is(notNullValue()));
+ assertThat(close2.getError().getCondition(), is(equalTo(AmqpError.INVALID_FIELD)));
+ assertThat(close2.getError().getInfo(), is(equalTo(Collections.singletonMap(Symbol.valueOf("invalid-field"), Symbol.valueOf("container-id")))));
+ }
+ }
+ }
+
+
+ @Test
+ public void weakDetection() throws Exception
+ {
+ try (FrameTransport transport1 = new FrameTransport(_brokerAddress))
+ {
+ transport1.doProtocolNegotiation();
+ Open open = new Open();
+ open.setContainerId("testContainerId");
+ // Omit setting the desired capability to test weak detection
+
+ transport1.sendPerformative(open);
+ PerformativeResponse response = (PerformativeResponse) transport1.getNextResponse();
+
+ assertThat(response, is(notNullValue()));
+ assertThat(response.getFrameBody(), is(instanceOf(Open.class)));
+
+ try (FrameTransport transport2 = new FrameTransport(_brokerAddress))
+ {
+ transport2.doProtocolNegotiation();
+ Open open2 = new Open();
+ open2.setContainerId("testContainerId");
+ open2.setDesiredCapabilities(new Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+ open2.setProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
+ REFUSE_CONNECTION));
+
+ transport2.sendPerformative(open2);
+
+ PerformativeResponse response2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(response2, is(notNullValue()));
+ assertThat(response2.getFrameBody(), is(instanceOf(Open.class)));
+ Open responseOpen2 = (Open) response2.getFrameBody();
+ assertThat(Arrays.asList(responseOpen2.getOfferedCapabilities()), hasItem(SOLE_CONNECTION_FOR_CONTAINER));
+ assertThat(responseOpen2.getProperties(), hasKey(Symbol.valueOf("amqp:connection-establishment-failed")));
+ assertThat(responseOpen2.getProperties().get(Symbol.valueOf("amqp:connection-establishment-failed")), is(true));
+
+ PerformativeResponse closeResponse2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(closeResponse2, is(notNullValue()));
+ assertThat(closeResponse2.getFrameBody(), is(instanceOf(Close.class)));
+ Close close2 = (Close) closeResponse2.getFrameBody();
+ assertThat(close2.getError(), is(notNullValue()));
+ assertThat(close2.getError().getCondition(), is(equalTo(AmqpError.INVALID_FIELD)));
+ assertThat(close2.getError().getInfo(), is(equalTo(Collections.singletonMap(Symbol.valueOf("invalid-field"), Symbol.valueOf("container-id")))));
+ }
+ }
+ }
+
+ @Test
+ public void strongDetection() throws Exception
+ {
+ try (FrameTransport transport1 = new FrameTransport(_brokerAddress))
+ {
+ transport1.doProtocolNegotiation();
+ Open open = new Open();
+ open.setContainerId("testContainerId");
+ open.setDesiredCapabilities(new Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+ open.setProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
+ REFUSE_CONNECTION));
+
+ transport1.sendPerformative(open);
+ PerformativeResponse response = (PerformativeResponse) transport1.getNextResponse();
+
+ assertThat(response, is(notNullValue()));
+ assertThat(response.getFrameBody(), is(instanceOf(Open.class)));
+ Open responseOpen = (Open) response.getFrameBody();
+ assertThat(Arrays.asList(responseOpen.getOfferedCapabilities()), hasItem(SOLE_CONNECTION_FOR_CONTAINER));
+ if (responseOpen.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
+ {
+ assumeThat(responseOpen.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
+ is(equalTo(SoleConnectionDetectionPolicy.STRONG.getValue())));
+ }
+
+ try (FrameTransport transport2 = new FrameTransport(_brokerAddress))
+ {
+ transport2.doProtocolNegotiation();
+ Open open2 = new Open();
+ open2.setContainerId("testContainerId");
+ // Omit setting the desired capability to test strong detection
+
+ transport2.sendPerformative(open2);
+
+ PerformativeResponse response2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(response2, is(notNullValue()));
+ assertThat(response2.getFrameBody(), is(instanceOf(Open.class)));
+ Open responseOpen2 = (Open) response2.getFrameBody();
+ assertThat(Arrays.asList(responseOpen2.getOfferedCapabilities()), hasItem(SOLE_CONNECTION_FOR_CONTAINER));
+ assertThat(responseOpen2.getProperties(), hasKey(Symbol.valueOf("amqp:connection-establishment-failed")));
+ assertThat(responseOpen2.getProperties().get(Symbol.valueOf("amqp:connection-establishment-failed")), is(true));
+
+ PerformativeResponse closeResponse2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(closeResponse2, is(notNullValue()));
+ assertThat(closeResponse2.getFrameBody(), is(instanceOf(Close.class)));
+ Close close2 = (Close) closeResponse2.getFrameBody();
+ assertThat(close2.getError(), is(notNullValue()));
+ assertThat(close2.getError().getCondition(), is(equalTo(AmqpError.INVALID_FIELD)));
+ assertThat(close2.getError().getInfo(), is(equalTo(Collections.singletonMap(Symbol.valueOf("invalid-field"), Symbol.valueOf("container-id")))));
+ }
+ }
+ }
+
+ @Test
+ public void refuseIsDefault() throws Exception
+ {
+ try (FrameTransport transport1 = new FrameTransport(_brokerAddress))
+ {
+ transport1.doProtocolNegotiation();
+ Open open = new Open();
+ open.setContainerId("testContainerId");
+ open.setDesiredCapabilities(new Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+ // Omit setting the enforcement policy explicitly. The default is refuse.
+
+ transport1.sendPerformative(open);
+ PerformativeResponse response = (PerformativeResponse) transport1.getNextResponse();
+
+ assertThat(response, is(notNullValue()));
+ assertThat(response.getFrameBody(), is(instanceOf(Open.class)));
+
+ try (FrameTransport transport2 = new FrameTransport(_brokerAddress))
+ {
+ transport2.doProtocolNegotiation();
+ Open open2 = new Open();
+ open2.setContainerId("testContainerId");
+ open2.setDesiredCapabilities(new Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+ // Omit setting the enforcement policy explicitly. The default is refuse.
+
+ transport2.sendPerformative(open2);
+
+ PerformativeResponse response2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(response2, is(notNullValue()));
+ assertThat(response2.getFrameBody(), is(instanceOf(Open.class)));
+ Open responseOpen2 = (Open) response2.getFrameBody();
+ assertThat(Arrays.asList(responseOpen2.getOfferedCapabilities()), hasItem(SOLE_CONNECTION_FOR_CONTAINER));
+ assertThat(responseOpen2.getProperties(), hasKey(Symbol.valueOf("amqp:connection-establishment-failed")));
+ assertThat(responseOpen2.getProperties().get(Symbol.valueOf("amqp:connection-establishment-failed")), is(true));
+
+ PerformativeResponse closeResponse2 = (PerformativeResponse) transport2.getNextResponse();
+ assertThat(closeResponse2, is(notNullValue()));
+ assertThat(closeResponse2.getFrameBody(), is(instanceOf(Close.class)));
+ Close close2 = (Close) closeResponse2.getFrameBody();
+ assertThat(close2.getError(), is(notNullValue()));
+ assertThat(close2.getError().getCondition(), is(equalTo(AmqpError.INVALID_FIELD)));
+ assertThat(close2.getError().getInfo(), is(equalTo(Collections.singletonMap(Symbol.valueOf("invalid-field"), Symbol.valueOf("container-id")))));
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/deliverydelay/DeliveryDelayTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/deliverydelay/DeliveryDelayTest.java b/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/deliverydelay/DeliveryDelayTest.java
index 61b4bb0..38b09f0 100644
--- a/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/deliverydelay/DeliveryDelayTest.java
+++ b/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/deliverydelay/DeliveryDelayTest.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSConsumer;
import javax.jms.JMSContext;
@@ -37,8 +36,10 @@ import javax.jms.JMSRuntimeException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.Session;
+import javax.naming.NamingException;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.url.URLSyntaxException;
public class DeliveryDelayTest extends QpidBrokerTestCase
{
@@ -53,9 +54,8 @@ public class DeliveryDelayTest extends QpidBrokerTestCase
public void testDeliveryDelay() throws Exception
{
- ConnectionFactory connectionFactory = getConnectionFactory();
- try (JMSContext context = connectionFactory.createContext(GUEST_USERNAME, GUEST_PASSWORD);
- Connection utilityConnection = getUtilityConnection(connectionFactory))
+ try (JMSContext context = getConnectionFactory().createContext(GUEST_USERNAME, GUEST_PASSWORD);
+ Connection utilityConnection = createUtilityConnection())
{
Destination queue = createQueue(utilityConnection, getTestQueueName(), true);
@@ -91,9 +91,8 @@ public class DeliveryDelayTest extends QpidBrokerTestCase
*/
public void testDeliveryDelayNotSupportedByQueue_MessageRejected() throws Exception
{
- ConnectionFactory connectionFactory = getConnectionFactory();
- try (JMSContext context = connectionFactory.createContext(GUEST_USERNAME, GUEST_PASSWORD);
- Connection utilityConnection = getUtilityConnection(connectionFactory))
+ try (JMSContext context = getConnectionFactory().createContext(GUEST_USERNAME, GUEST_PASSWORD);
+ Connection utilityConnection = createUtilityConnection())
{
Destination queue = createQueue(utilityConnection, getTestQueueName(), false);
JMSProducer producer = context.createProducer().setDeliveryDelay(DELIVERY_DELAY);
@@ -117,9 +116,8 @@ public class DeliveryDelayTest extends QpidBrokerTestCase
*/
public void testDeliveryDelayNotSupportedByQueueViaExchange_MessageRejected() throws Exception
{
- ConnectionFactory connectionFactory = getConnectionFactory();
- try (JMSContext context = connectionFactory.createContext(GUEST_USERNAME, GUEST_PASSWORD);
- Connection utilityConnection = getUtilityConnection(connectionFactory))
+ try (JMSContext context = getConnectionFactory().createContext(GUEST_USERNAME, GUEST_PASSWORD);
+ Connection utilityConnection = createUtilityConnection())
{
String testQueueName = getTestQueueName();
String testExchangeName = getTestName() + "_exch";
@@ -197,9 +195,9 @@ public class DeliveryDelayTest extends QpidBrokerTestCase
}
}
- private Connection getUtilityConnection(final ConnectionFactory connectionFactory) throws JMSException
+ private Connection createUtilityConnection() throws JMSException, NamingException, URLSyntaxException
{
- Connection connection = connectionFactory.createConnection(GUEST_USERNAME, GUEST_PASSWORD);
+ Connection connection = getConnectionBuilder().build();
connection.start();
return connection;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java b/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
index 17bce20..78ee5fc 100644
--- a/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
+++ b/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
@@ -20,7 +20,6 @@
package org.apache.qpid.systests.jms_2_0.subscription;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import javax.jms.Connection;
@@ -85,7 +84,7 @@ public class SharedSubscriptionTest extends QpidBrokerTestCase
public void testSharedDurableSubscription() throws Exception
{
- Connection connection = getConnectionWithPrefetch(0);
+ Connection connection = getConnectionBuilder().setPrefetch(0).setClientId("myClientId").build();
Session publishingSession = connection.createSession();
Session subscriber1Session = connection.createSession();
@@ -119,7 +118,7 @@ public class SharedSubscriptionTest extends QpidBrokerTestCase
restartDefaultBroker();
}
- connection = getConnectionWithPrefetch(0);
+ connection = getConnectionBuilder().setPrefetch(0).setClientId("myClientId").build();
subscriber1Session = connection.createSession();
subscriber2Session = connection.createSession();
@@ -147,7 +146,7 @@ public class SharedSubscriptionTest extends QpidBrokerTestCase
public void testUnsubscribe() throws Exception
{
- Connection connection = getConnectionWithPrefetch(0);
+ Connection connection = getConnectionBuilder().setPrefetch(0).setClientId("myClientId").build();
Session session = connection.createSession();
connection.start();
@@ -170,7 +169,7 @@ public class SharedSubscriptionTest extends QpidBrokerTestCase
restartDefaultBroker();
}
- connection = getConnectionWithPrefetch(0);
+ connection = getConnectionBuilder().setPrefetch(0).setClientId("myClientId").build();
session = connection.createSession();
session.unsubscribe(subscriptionName);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
----------------------------------------------------------------------
diff --git a/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index df93c64..0ef3c5e 100644
--- a/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -239,8 +239,6 @@ public class Asserts
assertEquals("Unexpected value for connection attribute " + Connection.PORT,
TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, connectionData.get(Connection.PORT));
- assertEquals("Unexpected value of connection attribute " + Connection.CLIENT_ID, "clientid",
- connectionData.get(Connection.CLIENT_ID));
assertEquals("Unexpected value of connection attribute " + Connection.PRINCIPAL, "guest",
connectionData.get(Connection.PRINCIPAL));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClientProvider.java
----------------------------------------------------------------------
diff --git a/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClientProvider.java b/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClientProvider.java
index e614ca8..c7ae3d1 100644
--- a/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClientProvider.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClientProvider.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.Hashtable;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -46,7 +47,7 @@ import javax.naming.NamingException;
public class QpidJmsClientProvider implements JmsProvider
{
- private static final String CLIENTID = "clientid";
+ private static final AtomicInteger CLIENTID_COUNTER = new AtomicInteger();
private final AmqpManagementFacade _managementFacade;
private final Hashtable<Object, Object> _initialContextEnvironment = new Hashtable<>();
@@ -114,7 +115,7 @@ public class QpidJmsClientProvider implements JmsProvider
if (!options.containsKey("jms.clientID"))
{
options = new HashMap<>(options);
- options.put("jms.clientID", CLIENTID);
+ options.put("jms.clientID", getNextClientId());
}
else if (options.get("jms.clientID") == null)
{
@@ -187,7 +188,7 @@ public class QpidJmsClientProvider implements JmsProvider
final Map<String, String> options =
Collections.singletonMap("jms.prefetchPolicy.all", String.valueOf(prefetch));
- final ConnectionFactory connectionFactory = getConnectionFactory(factoryName, "test", "clientid", options);
+ final ConnectionFactory connectionFactory = getConnectionFactory(factoryName, "test", getNextClientId(), options);
return connectionFactory.createConnection(QpidBrokerTestCase.GUEST_USERNAME,
QpidBrokerTestCase.GUEST_PASSWORD);
}
@@ -205,7 +206,7 @@ public class QpidJmsClientProvider implements JmsProvider
? "default.ssl"
: "default",
vhost,
- "clientId",
+ getNextClientId(),
options).createConnection(QpidBrokerTestCase.GUEST_USERNAME,
QpidBrokerTestCase.GUEST_PASSWORD);
}
@@ -223,7 +224,7 @@ public class QpidJmsClientProvider implements JmsProvider
{
return getConnectionFactory(Boolean.getBoolean(QpidBrokerTestCase.PROFILE_USE_SSL)
? "default.ssl"
- : "default", vhost, "clientId").createConnection(username, password);
+ : "default", vhost, getNextClientId()).createConnection(username, password);
}
@Override
@@ -482,4 +483,9 @@ public class QpidJmsClientProvider implements JmsProvider
}
}
}
+
+ private String getNextClientId()
+ {
+ return "clientid-" + CLIENTID_COUNTER.getAndIncrement();
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
index 960514b..62b3882 100644
--- a/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
@@ -342,7 +342,7 @@ public class TimeToLiveTest extends QpidBrokerTestCase
public void testActiveTTLwithDurableSubscription() throws Exception
{
//Create Client 1
- TopicConnection clientConnection = (TopicConnection) getConnection();
+ TopicConnection clientConnection = (TopicConnection) getConnectionBuilder().setClientId("clientid").build();
Session clientSession = clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Create and close the durable subscriber
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
index c3ce57e..ae6f7ce 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
@@ -97,7 +97,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
_testQueueName = getTestQueueName();
boolean durableSub = isDurSubTest();
- Connection connection = getConnection();
+ Connection connection = getConnectionBuilder().setClientId("clientid").build();
connection.start();
Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
Destination destination;
@@ -207,7 +207,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
private void doTest(final int deliveryMode, final List<Integer> redeliverMsgs, final boolean synchronous, final boolean durableSub) throws Exception
{
- final Connection clientConnection = getConnection();
+ final Connection clientConnection = getConnectionBuilder().setClientId("clientid").build();
final boolean transacted = deliveryMode == Session.SESSION_TRANSACTED;
final Session clientSession = clientConnection.createSession(transacted, deliveryMode);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 8e907e1..7b3d791 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -137,13 +137,13 @@ public class TopicSessionTest extends QpidBrokerTestCase
public void testUnsubscriptionAfterConnectionClose() throws Exception
{
- TopicConnection con1 = (TopicConnection) getClientConnection("guest", "guest", "clientid");
+ TopicConnection con1 = (TopicConnection) getConnectionBuilder().build();
Topic topic = createTopic(con1, "MyTopic3");
TopicSession session1 = con1.createTopicSession(true, Session.AUTO_ACKNOWLEDGE);
TopicPublisher publisher = session1.createPublisher(topic);
- TopicConnection con2 = (TopicConnection) getClientConnection("guest", "guest", "clientid");
+ TopicConnection con2 = (TopicConnection) getConnectionBuilder().setClientId("clientid").build();
TopicSession session2 = con2.createTopicSession(true, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber sub = session2.createDurableSubscriber(topic, "subscription0");
@@ -157,7 +157,7 @@ public class TopicSessionTest extends QpidBrokerTestCase
con2.close();
publisher.publish(session1.createTextMessage("Hello2"));
session1.commit();
- con2 = (TopicConnection) getClientConnection("guest", "guest", "clientid");
+ con2 = (TopicConnection) getConnectionBuilder().setClientId("clientid").build();
session2 = con2.createTopicSession(true,Session.AUTO_ACKNOWLEDGE);
sub = session2.createDurableSubscriber(topic, "subscription0");
con2.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org