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/31 10:18:13 UTC
qpid-broker-j git commit: QPID-7605: [Java Broker] Fix tests
Repository: qpid-broker-j
Updated Branches:
refs/heads/master dd6b280df -> 814927a32
QPID-7605: [Java Broker] Fix tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/814927a3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/814927a3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/814927a3
Branch: refs/heads/master
Commit: 814927a32895137ddfcec584c657419d1a46556b
Parents: dd6b280
Author: Lorenz Quack <lq...@apache.org>
Authored: Wed May 31 11:17:50 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Wed May 31 11:17:50 2017 +0100
----------------------------------------------------------------------
.../qpid/test/utils/QpidJmsClientProvider.java | 11 +++++------
.../qpid/test/unit/ct/DurableSubscriberTest.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/814927a3/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 c7ae3d1..6d26b63 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
@@ -49,7 +49,6 @@ public class QpidJmsClientProvider implements JmsProvider
{
private static final AtomicInteger CLIENTID_COUNTER = new AtomicInteger();
private final AmqpManagementFacade _managementFacade;
- private final Hashtable<Object, Object> _initialContextEnvironment = new Hashtable<>();
public QpidJmsClientProvider(AmqpManagementFacade managementFacade)
{
@@ -132,7 +131,7 @@ public class QpidJmsClientProvider implements JmsProvider
options.put("jms.populateJMSXUserID", "true");
}
-
+ final Hashtable<Object, Object> initialContextEnvironment = new Hashtable<>();
if ("failover".equals(factoryName))
{
if (!options.containsKey("failover.maxReconnectAttempts"))
@@ -146,7 +145,7 @@ public class QpidJmsClientProvider implements JmsProvider
.append(")");
appendOptions(options, stem);
- _initialContextEnvironment.put("property.connectionfactory.failover.remoteURI",
+ initialContextEnvironment.put("property.connectionfactory.failover.remoteURI",
stem.toString());
}
else if ("default".equals(factoryName))
@@ -156,16 +155,16 @@ public class QpidJmsClientProvider implements JmsProvider
appendOptions(options, stem);
- _initialContextEnvironment.put("property.connectionfactory.default.remoteURI", stem.toString());
+ initialContextEnvironment.put("property.connectionfactory.default.remoteURI", stem.toString());
}
else if ("default.ssl".equals(factoryName))
{
final StringBuilder stem = new StringBuilder("amqps://localhost:").append(String.valueOf(System.getProperty("test.port.ssl")));
appendOptions(options, stem);
- _initialContextEnvironment.put("connectionfactory.default.ssl", stem.toString());
+ initialContextEnvironment.put("connectionfactory.default.ssl", stem.toString());
}
- return (ConnectionFactory) new InitialContext(_initialContextEnvironment).lookup(factoryName);
+ return (ConnectionFactory) new InitialContext(initialContextEnvironment).lookup(factoryName);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/814927a3/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java b/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
index 1c37899..df325e8 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
@@ -50,7 +50,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
if (isBrokerStorePersistent())
{
//create and register a durable subscriber with a message selector and then close it
- TopicConnection durConnection = (TopicConnection) getConnection();
+ TopicConnection durConnection = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
final Topic topic = createTopic(durConnection, _topicName);
TopicSession durSession = durConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub1 = durSession.createDurableSubscriber(topic, "dursub", "testprop='true'", false);
@@ -84,7 +84,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
pubSession.close();
//now recreate the durable subscriber and check the received messages
- TopicConnection durConnection2 = (TopicConnection) getConnection();
+ TopicConnection durConnection2 = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub2 = durSession2.createDurableSubscriber(topic, "dursub", "testprop='true'", false);
durConnection2.start();
@@ -126,7 +126,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
final String SUB_NAME=getTestQueueName();
//create and register a durable subscriber then unsubscribe it
- TopicConnection durConnection = (TopicConnection) getConnection();
+ TopicConnection durConnection = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
Topic topic = createTopic(durConnection, _topicName);
TopicSession durSession = durConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub1 = durSession.createDurableSubscriber(topic, SUB_NAME);
@@ -137,7 +137,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
durConnection.close();
//create and register a durable subscriber with a message selector and then close it
- TopicConnection durConnection2 = (TopicConnection) getConnection();
+ TopicConnection durConnection2 = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub2 = durSession2.createDurableSubscriber(topic, SUB_NAME, "testprop='true'", false);
durConnection2.start();
@@ -174,7 +174,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
//now recreate the durable subscriber with selector to check there are no exceptions generated
//and then verify the messages are received correctly
- TopicConnection durConnection3 = (TopicConnection) getConnection();
+ TopicConnection durConnection3 = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
TopicSession durSession3 = (TopicSession) durConnection3.createSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub3 = durSession3.createDurableSubscriber(topic, SUB_NAME, "testprop='true'", false);
durConnection3.start();
@@ -219,7 +219,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
final String SUB_NAME=getTestQueueName();
//create and register a durable subscriber with selector then unsubscribe it
- TopicConnection durConnection = (TopicConnection) getConnection();
+ TopicConnection durConnection = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
Topic topic = createTopic(durConnection, _topicName);
TopicSession durSession = durConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub1 = durSession.createDurableSubscriber(topic, SUB_NAME, "testprop='true'", false);
@@ -230,7 +230,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
durConnection.close();
//create and register a durable subscriber without the message selector and then close it
- TopicConnection durConnection2 = (TopicConnection) getConnection();
+ TopicConnection durConnection2 = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
TopicSession durSession2 = durConnection2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub2 = durSession2.createDurableSubscriber(topic, SUB_NAME);
durConnection2.start();
@@ -267,7 +267,7 @@ public class DurableSubscriberTest extends QpidBrokerTestCase
//now recreate the durable subscriber without selector to check there are no exceptions generated
//then verify ALL messages sent are received
- TopicConnection durConnection3 = (TopicConnection) getConnection();
+ TopicConnection durConnection3 = (TopicConnection) getConnectionBuilder().setClientId("testClientId").build();
TopicSession durSession3 = (TopicSession) durConnection3.createSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber durSub3 = durSession3.createDurableSubscriber(topic, SUB_NAME);
durConnection3.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org