[hornetq-commits] JBoss hornetq SVN: r7796 - in trunk/tests/src/org/jboss/messaging/tests/integration: jms/server/management and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Aug 19 16:04:30 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-08-19 16:04:30 -0400 (Wed, 19 Aug 2009)
New Revision: 7796
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/DivertControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
Log:
Testsuite leaks cleanup
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -81,6 +81,7 @@
@Override
protected void tearDown() throws Exception
{
+ jmsServer.stop();
cf = null;
if (server != null && server.isStarted())
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -77,6 +77,10 @@
{
connection.close();
+ connection = null;
+
+ session = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -70,26 +70,28 @@
// Attributes ----------------------------------------------------
+ private MessagingServer server;
+
+ JMSServerManagerImpl serverManager;
+
private InVMContext context;
// Static --------------------------------------------------------
- private MessagingServer startMessagingServer(String acceptorFactory) throws Exception
+ private void startMessagingServer(String acceptorFactory) throws Exception
{
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactory));
- MessagingServer server = Messaging.newMessagingServer(conf, mbeanServer, false);
+ server = Messaging.newMessagingServer(conf, mbeanServer, false);
server.start();
context = new InVMContext();
- JMSServerManagerImpl serverManager = new JMSServerManagerImpl(server);
+ serverManager = new JMSServerManagerImpl(server);
serverManager.setContext(context);
serverManager.start();
serverManager.activated();
-
- return server;
}
// Constructors --------------------------------------------------
@@ -154,15 +156,23 @@
{
return ManagementControlHelper.createJMSServerControl(mbeanServer);
}
+
+ protected void tearDown() throws Exception
+ {
+ serverManager = null;
+
+ server = null;
+
+ super.tearDown();
+ }
// Private -------------------------------------------------------
private void doListConnectionIDs(String acceptorFactory, String connectorFactory) throws Exception
{
- MessagingServer server = null;
try
{
- server = startMessagingServer(acceptorFactory);
+ startMessagingServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -193,6 +203,11 @@
}
finally
{
+ if (serverManager != null)
+ {
+ serverManager.stop();
+ }
+
if (server != null)
{
server.stop();
@@ -202,10 +217,9 @@
private void doListSessions(String acceptorFactory, String connectorFactory) throws Exception
{
- MessagingServer server = null;
try
{
- server = startMessagingServer(acceptorFactory);
+ startMessagingServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -232,6 +246,12 @@
}
finally
{
+ if (serverManager != null)
+ {
+ serverManager.stop();
+ }
+
+
if (server != null)
{
server.stop();
@@ -241,10 +261,9 @@
private void doListClientConnections(String acceptorFactory, String connectorFactory) throws Exception
{
- MessagingServer server = null;
try
{
- server = startMessagingServer(acceptorFactory);
+ startMessagingServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -270,6 +289,12 @@
}
finally
{
+ if (serverManager != null)
+ {
+ serverManager.stop();
+ }
+
+
if (server != null)
{
server.stop();
@@ -279,10 +304,9 @@
private void doCloseConnectionsForAddress(String acceptorFactory, String connectorFactory) throws Exception
{
- MessagingServer server = null;
try
{
- server = startMessagingServer(acceptorFactory);
+ startMessagingServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -320,6 +344,11 @@
}
finally
{
+ if (serverManager != null)
+ {
+ serverManager.stop();
+ }
+
if (server != null)
{
server.stop();
@@ -331,11 +360,9 @@
{
String unknownAddress = randomString();
- MessagingServer server = null;
-
try
{
- server = startMessagingServer(acceptorFactory);
+ startMessagingServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -371,6 +398,11 @@
}
finally
{
+ if (serverManager != null)
+ {
+ serverManager.stop();
+ }
+
if (server != null)
{
server.stop();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -71,7 +71,8 @@
// Attributes ----------------------------------------------------
protected InVMContext context;
-
+ private MessagingServer server;
+
private JMSServerManagerImpl serverManager;
// Static --------------------------------------------------------
@@ -553,7 +554,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- MessagingServer server = Messaging.newMessagingServer(conf, mbeanServer, false);
+ server = Messaging.newMessagingServer(conf, mbeanServer, false);
context = new InVMContext();
serverManager = new JMSServerManagerImpl(server);
@@ -566,6 +567,12 @@
protected void tearDown() throws Exception
{
serverManager.stop();
+
+ server.stop();
+
+ serverManager = null;
+
+ server = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -74,6 +74,10 @@
protected void tearDown() throws Exception
{
connection.close();
+
+ connection = null;
+
+ session = null;
super.tearDown();
}
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-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -441,8 +441,16 @@
@Override
protected void tearDown() throws Exception
{
+ serverManager.stop();
+
server.stop();
+ serverManager = null;
+
+ server = null;
+
+ topic = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -373,9 +373,24 @@
@Override
protected void tearDown() throws Exception
{
+
+ session.close();
+
connection.close();
+ serverManager.stop();
+
server.stop();
+
+ serverManager = null;
+
+ server = null;
+
+ session = null;
+
+ connection = null;
+
+ proxy = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -369,6 +369,11 @@
session.close();
server.stop();
+
+ server = null;
+
+ session = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -315,6 +315,10 @@
session.close();
server.stop();
+
+ session = null;
+
+ server = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -201,7 +201,14 @@
{
server_0.stop();
server_1.stop();
+
+ server_0 = null;
+ bridgeConfig = null;
+
+ server_1 = null;
+
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -183,6 +183,13 @@
server_0.stop();
server_1.stop();
+ session = null;
+
+ server_0 = null;
+
+ server_1 = null;
+
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -163,6 +163,7 @@
{
service.stop();
}
+ service = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -129,6 +129,8 @@
{
session.close();
}
+
+ session = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -182,6 +182,10 @@
{
server_0.stop();
server_1.stop();
+
+ server_0 = null;
+
+ server_1 = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -140,6 +140,8 @@
{
session.close();
}
+
+ session = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -118,6 +118,8 @@
service.stop();
}
+ service = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/DivertControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/DivertControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/DivertControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -124,6 +124,10 @@
service.stop();
checkNoResource(ObjectNames.getDivertObjectName(new SimpleString(divertConfig.getName())));
+
+ service = null;
+
+ divertConfig = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementTestBase.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementTestBase.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -96,6 +96,8 @@
{
MBeanServerFactory.releaseMBeanServer(mbeanServer);
+ mbeanServer = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -324,6 +324,10 @@
{
server.stop();
}
+
+ server = null;
+
+ connectorConfig = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -68,6 +68,8 @@
protected void tearDown() throws Exception
{
session.close();
+
+ session = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -1287,6 +1287,10 @@
session.close();
server.stop();
+
+ session = null;
+
+ server = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -276,6 +276,8 @@
session.close();
}
+ session = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTestBase.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTestBase.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -73,6 +73,8 @@
protected void tearDown() throws Exception
{
service.stop();
+
+ service = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-08-19 19:50:38 UTC (rev 7795)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-08-19 20:04:30 UTC (rev 7796)
@@ -122,6 +122,16 @@
messagingService = null;
clientSession = null;
+
+ clientProducer = null;;
+
+ clientConsumer = null;
+
+ sessionFactory = null;
+
+ configuration = null;;
+
+
super.tearDown();
}
More information about the hornetq-commits
mailing list