[jboss-cvs] JBoss Messaging SVN: r6541 - trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 23 11:41:03 EDT 2009
Author: jmesnil
Date: 2009-04-23 11:41:03 -0400 (Thu, 23 Apr 2009)
New Revision: 6541
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java
Log:
fixed management tests
* test using JMSUtil helper methods were leaving unclosed connections
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-04-23 14:50:24 UTC (rev 6540)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-04-23 15:41:03 UTC (rev 6541)
@@ -118,7 +118,8 @@
assertEquals(0, queueControl.getMessageCount());
assertEquals(0, queueControl.getConsumerCount());
- MessageConsumer consumer = JMSUtil.createConsumer(queue, true);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ MessageConsumer consumer = JMSUtil.createConsumer(connection, queue);
assertEquals(1, queueControl.getConsumerCount());
@@ -127,6 +128,8 @@
assertEquals(2, queueControl.getMessageCount());
assertEquals(2, queueControl.getMessagesAdded());
+ connection.start();
+
assertNotNull(consumer.receive(500));
assertNotNull(consumer.receive(500));
@@ -136,6 +139,8 @@
consumer.close();
assertEquals(0, queueControl.getConsumerCount());
+
+ connection.close();
}
public void testRemoveMessage() throws Exception
@@ -192,8 +197,13 @@
assertEquals(0, queueControl.getMessageCount());
- MessageConsumer consumer = JMSUtil.createConsumer(queue, true);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ connection.start();
+
+ MessageConsumer consumer = JMSUtil.createConsumer(connection, queue);
assertNull(consumer.receive(500));
+
+ connection.close();
}
public void testRemoveMatchingMessages() throws Exception
@@ -222,10 +232,13 @@
assertEquals(1, queueControl.getMessageCount());
- MessageConsumer consumer = JMSUtil.createConsumer(queue, true);
+ conn.start();
+ MessageConsumer consumer = JMSUtil.createConsumer(conn, queue);
Message msg = consumer.receive(500);
assertNotNull(msg);
assertEquals("baz", msg.getStringProperty("foo"));
+
+ conn.close();
}
public void testChangeMessagePriority() throws Exception
@@ -247,10 +260,14 @@
queueControl.changeMessagePriority(messageID, newPriority);
- MessageConsumer consumer = JMSUtil.createConsumer(queue, true);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ connection.start();
+ MessageConsumer consumer = JMSUtil.createConsumer(connection, queue);
Message message = consumer.receive(500);
assertNotNull(message);
assertEquals(newPriority, message.getJMSPriority());
+
+ connection.close();
}
public void testChangeMessagePriorityWithInvalidPriority() throws Exception
@@ -272,10 +289,14 @@
{
}
- MessageConsumer consumer = JMSUtil.createConsumer(queue, true);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ connection.start();
+ MessageConsumer consumer = JMSUtil.createConsumer(connection, queue);
Message message = consumer.receive(500);
assertNotNull(message);
assertTrue(message.getJMSPriority() != invalidPriority);
+
+ connection.close();
}
public void testChangeMessagePriorityWithUnknownMessageID() throws Exception
@@ -346,10 +367,15 @@
assertEquals(0, queueControl.getMessageCount());
assertEquals(1, expiryQueueControl.getMessageCount());
- MessageConsumer consumer = JMSUtil.createConsumer(expiryQueue, true);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ connection.start();
+
+ MessageConsumer consumer = JMSUtil.createConsumer(connection, expiryQueue);
Message message = consumer.receive(500);
assertNotNull(message);
assertEquals(messageIDs[0], message.getJMSMessageID());
+
+ connection.close();
}
public void testExpireMessageWithUnknownMessageID() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java 2009-04-23 14:50:24 UTC (rev 6540)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java 2009-04-23 15:41:03 UTC (rev 6541)
@@ -25,11 +25,9 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN;
@@ -38,9 +36,10 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PING_PERIOD;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import javax.jms.Connection;
@@ -108,84 +107,25 @@
return cf.createConnection();
}
- static MessageConsumer createConsumer(Destination destination, boolean startConnection, String connectorFactory) throws JMSException
+ static MessageConsumer createConsumer(Connection connection, Destination destination, String connectorFactory) throws JMSException
{
- JBossConnectionFactory cf = new JBossConnectionFactory(new TransportConfiguration(connectorFactory),
- null,
- DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
- DEFAULT_PING_PERIOD,
- DEFAULT_CONNECTION_TTL,
- DEFAULT_CALL_TIMEOUT,
- null,
- DEFAULT_ACK_BATCH_SIZE,
- DEFAULT_ACK_BATCH_SIZE,
- DEFAULT_CONSUMER_WINDOW_SIZE,
- DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_PRODUCER_WINDOW_SIZE,
- DEFAULT_PRODUCER_MAX_RATE,
- DEFAULT_MIN_LARGE_MESSAGE_SIZE,
- true,
- true,
- true,
- DEFAULT_AUTO_GROUP,
- DEFAULT_MAX_CONNECTIONS,
- DEFAULT_PRE_ACKNOWLEDGE,
- DEFAULT_RETRY_INTERVAL,
- DEFAULT_RETRY_INTERVAL_MULTIPLIER,
- DEFAULT_RECONNECT_ATTEMPTS,
- DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
+ Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Connection conn = cf.createConnection();
-
- Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- if (startConnection)
- {
- conn.start();
- }
-
return s.createConsumer(destination);
}
- public static MessageConsumer createConsumer(Destination destination, boolean startConnection) throws JMSException
+ public static MessageConsumer createConsumer(Connection connection, Destination destination) throws JMSException
{
- return createConsumer(destination,
- startConnection,
+ return createConsumer(connection,
+ destination,
InVMConnectorFactory.class.getName());
}
- static TopicSubscriber createDurableSubscriber(Topic topic, String clientID, String subscriptionName) throws JMSException
+ static TopicSubscriber createDurableSubscriber(Connection connection, Topic topic, String clientID, String subscriptionName) throws JMSException
{
- JBossConnectionFactory cf = new JBossConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName()),
- null,
- DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
- DEFAULT_PING_PERIOD,
- DEFAULT_CONNECTION_TTL,
- DEFAULT_CALL_TIMEOUT,
- null,
- DEFAULT_ACK_BATCH_SIZE,
- DEFAULT_ACK_BATCH_SIZE,
- DEFAULT_CONSUMER_WINDOW_SIZE,
- DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_PRODUCER_WINDOW_SIZE,
- DEFAULT_PRODUCER_MAX_RATE,
- DEFAULT_MIN_LARGE_MESSAGE_SIZE,
- DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
- true,
- DEFAULT_AUTO_GROUP,
- DEFAULT_MAX_CONNECTIONS,
- DEFAULT_PRE_ACKNOWLEDGE,
- DEFAULT_RETRY_INTERVAL,
- DEFAULT_RETRY_INTERVAL_MULTIPLIER,
- DEFAULT_RECONNECT_ATTEMPTS,
- DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
+ connection.setClientID(clientID);
+ Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Connection conn = cf.createConnection();
-
- conn.setClientID(clientID);
- Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
return s.createDurableSubscriber(topic, subscriptionName);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java 2009-04-23 14:50:24 UTC (rev 6540)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java 2009-04-23 15:41:03 UTC (rev 6541)
@@ -28,8 +28,7 @@
import javax.jms.Connection;
import javax.jms.Session;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
+import javax.jms.TopicSubscriber;
import javax.management.openmbean.TabularData;
import org.jboss.messaging.core.config.Configuration;
@@ -42,7 +41,6 @@
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.TopicControlMBean;
import org.jboss.messaging.tests.integration.management.ManagementTestBase;
-import org.jboss.messaging.tests.util.UnitTestCase;
/**
* A TopicControlTest
@@ -88,23 +86,35 @@
public void testGetXXXSubscriptionsCount() throws Exception
{
+ Connection connection_1 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+
// 1 non-durable subscriber, 2 durable subscribers
- JMSUtil.createConsumer(topic, false);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName + "2");
+ JMSUtil.createConsumer(connection_1, topic);
+
+ 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");
TopicControlMBean topicControl = createManagementControl();
assertEquals(3, topicControl.getSubcriptionsCount());
assertEquals(1, topicControl.getNonDurableSubcriptionsCount());
assertEquals(2, topicControl.getDurableSubcriptionsCount());
+
+ connection_1.close();
+ connection_2.close();
+ connection_3.close();
}
public void testGetXXXMessagesCount() throws Exception
{
// 1 non-durable subscriber, 2 durable subscribers
- JMSUtil.createConsumer(topic, true);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName + "2");
+ Connection connection_1 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ JMSUtil.createConsumer(connection_1, topic);
+ 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");
TopicControlMBean topicControl = createManagementControl();
@@ -117,19 +127,30 @@
assertEquals(3 * 2, topicControl.getMessageCount());
assertEquals(1 * 2, topicControl.getNonDurableMessagesCount());
assertEquals(2 * 2, topicControl.getDurableMessagesCount());
+
+ connection_1.close();
+ connection_2.close();
+ connection_3.close();
}
public void testListXXXSubscriptionsCount() throws Exception
{
// 1 non-durable subscriber, 2 durable subscribers
- JMSUtil.createConsumer(topic, false);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName + "2");
+ Connection connection_1 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ JMSUtil.createConsumer(connection_1, topic);
+ 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");
TopicControlMBean topicControl = createManagementControl();
assertEquals(3, topicControl.listAllSubscriptions().size());
assertEquals(1, topicControl.listNonDurableSubscriptions().size());
assertEquals(2, topicControl.listDurableSubscriptions().size());
+
+ connection_1.close();
+ connection_2.close();
+ connection_3.close();
}
public void testCountMessagesForSubscription() throws Exception
@@ -138,10 +159,9 @@
long matchingValue = randomLong();
long unmatchingValue = matchingValue + 1;
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ JMSUtil.createDurableSubscriber(connection, topic, clientID, subscriptionName);
- Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
- connection.setClientID(clientID);
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
JMSUtil.sendMessageWithProperty(session, topic, key, matchingValue);
@@ -154,6 +174,8 @@
assertEquals(2, topicControl.countMessagesForSubscription(clientID, subscriptionName, key + " =" + matchingValue));
assertEquals(1, topicControl.countMessagesForSubscription(clientID, subscriptionName, key + " =" + unmatchingValue));
+
+ connection.close();
}
public void testCountMessagesForUnknownSubscription() throws Exception
@@ -190,20 +212,26 @@
public void testDropDurableSubscriptionWithExistingSubscription() throws Exception
{
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ JMSUtil.createDurableSubscriber(connection, topic, clientID, subscriptionName);
+
TopicControlMBean topicControl = createManagementControl();
assertEquals(1, topicControl.getDurableSubcriptionsCount());
topicControl.dropDurableSubscription(clientID, subscriptionName);
assertEquals(0, topicControl.getDurableSubcriptionsCount());
+
+ connection.close();
}
public void testDropDurableSubscriptionWithUnknownSubscription() throws Exception
{
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ JMSUtil.createDurableSubscriber(connection, topic, clientID, subscriptionName);
+
TopicControlMBean topicControl = createManagementControl();
assertEquals(1, topicControl.getDurableSubcriptionsCount());
@@ -218,26 +246,38 @@
}
assertEquals(1, topicControl.getDurableSubcriptionsCount());
+
+ connection.close();
}
public void testDropAllSubscriptions() throws Exception
{
- JMSUtil.createConsumer(topic, true);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName + "2");
+ Connection connection_1 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ TopicSubscriber durableSubscriber_1 = JMSUtil.createDurableSubscriber(connection_1, topic, clientID, subscriptionName);
+ Connection connection_2 = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ TopicSubscriber durableSubscriber_2 = JMSUtil.createDurableSubscriber(connection_2, topic, clientID, subscriptionName + "2");
TopicControlMBean topicControl = createManagementControl();
- assertEquals(3, topicControl.getSubcriptionsCount());
+ assertEquals(2, topicControl.getSubcriptionsCount());
+ durableSubscriber_1.close();
+ durableSubscriber_2.close();
+
+ assertEquals(2, topicControl.getSubcriptionsCount());
topicControl.dropAllSubscriptions();
assertEquals(0, topicControl.getSubcriptionsCount());
+
+ connection_1.close();
+ connection_2.close();
}
public void testRemoveAllMessages() throws Exception
{
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName + "2");
+ 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.sendMessages(topic, 3);
@@ -247,12 +287,17 @@
int removedCount = topicControl.removeAllMessages();
assertEquals(3 * 2, removedCount);
assertEquals(0, topicControl.getMessageCount());
+
+ connection_1.close();
+ connection_2.close();
}
public void testListMessagesForSubscription() throws Exception
{
- JMSUtil.createDurableSubscriber(topic, clientID, subscriptionName);
+ Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+ JMSUtil.createDurableSubscriber(connection, topic, clientID, subscriptionName);
+
JMSUtil.sendMessages(topic, 3);
TopicControlMBean topicControl = createManagementControl();
More information about the jboss-cvs-commits
mailing list