Skip to content

Commit

Permalink
JBPAPP-7230 & JBPAPP-7229 - ClientID fixes (fixing test)
Browse files Browse the repository at this point in the history
  • Loading branch information
@clebertsuconic
clebertsuconic committed Sep 21, 2011
1 parent e889b71 commit cf36a7f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java
View file
Expand Up @@ -98,7 +98,7 @@ public void testGetXXXSubscriptionsCount() throws Exception
Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName);
Connection connection_3 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_3, topic, clientID, subscriptionName + "2");
JMSUtil.createDurableSubscriber(connection_3, topic, clientID + "2", subscriptionName + "2");

TopicControl topicControl = createManagementControl();
Assert.assertEquals(3, topicControl.getSubscriptionCount());
Expand All @@ -118,7 +118,7 @@ public void testGetXXXMessagesCount() throws Exception
Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName);
Connection connection_3 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_3, topic, clientID, subscriptionName + "2");
JMSUtil.createDurableSubscriber(connection_3, topic, clientID+"_2", subscriptionName + "2");

TopicControl topicControl = createManagementControl();

Expand All @@ -145,7 +145,7 @@ public void testListXXXSubscriptionsCount() throws Exception
Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
TopicSubscriber subs1 = JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName);
Connection connection_3 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
TopicSubscriber subs2 = JMSUtil.createDurableSubscriber(connection_3, topic, clientID, subscriptionName + "2");
TopicSubscriber subs2 = JMSUtil.createDurableSubscriber(connection_3, topic, clientID + "2", subscriptionName + "2");

TopicControl topicControl = createManagementControl();
Assert.assertEquals(3, topicControl.listAllSubscriptions().length);
Expand All @@ -171,15 +171,15 @@ public void testListXXXSubscriptionsAsJSON() throws Exception
Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName);
Connection connection_3 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_3, topic, clientID, subscriptionName + "2");
JMSUtil.createDurableSubscriber(connection_3, topic, clientID+"2", subscriptionName + "2");

TopicControl topicControl = createManagementControl();
String jsonString = topicControl.listDurableSubscriptionsAsJSON();
SubscriptionInfo[] infos = SubscriptionInfo.from(jsonString);
Assert.assertEquals(2, infos.length);
Assert.assertEquals(clientID, infos[0].getClientID());
Assert.assertEquals(subscriptionName, infos[0].getName());
Assert.assertEquals(clientID, infos[1].getClientID());
Assert.assertEquals(clientID+"2", infos[1].getClientID());
Assert.assertEquals(subscriptionName + "2", infos[1].getName());

jsonString = topicControl.listNonDurableSubscriptionsAsJSON();
Expand Down Expand Up @@ -344,7 +344,7 @@ public void testRemoveAllMessages() throws Exception
Connection connection_1 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_1, topic, clientID, subscriptionName);
Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName + "2");
JMSUtil.createDurableSubscriber(connection_2, topic, clientID+"2", subscriptionName + "2");

JMSUtil.sendMessages(topic, 3);

Expand Down Expand Up @@ -438,7 +438,7 @@ public void testGetMessagesAdded() throws Exception
Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName);
Connection connection_3 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
JMSUtil.createDurableSubscriber(connection_3, topic, clientID, subscriptionName + "2");
JMSUtil.createDurableSubscriber(connection_3, topic, clientID+"2", subscriptionName + "2");

TopicControl topicControl = createManagementControl();

Expand All @@ -460,7 +460,7 @@ public void testGetMessagesDelivering() throws Exception
Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
MessageConsumer cons_2 = JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName, Session.CLIENT_ACKNOWLEDGE);
Connection connection_3 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
MessageConsumer cons_3 = JMSUtil.createDurableSubscriber(connection_3, topic, clientID, subscriptionName + "2", Session.CLIENT_ACKNOWLEDGE);
MessageConsumer cons_3 = JMSUtil.createDurableSubscriber(connection_3, topic, clientID+"2", subscriptionName + "2", Session.CLIENT_ACKNOWLEDGE);

TopicControl topicControl = createManagementControl();

Expand Down

0 comments on commit cf36a7f

Please sign in to comment.