[jboss-cvs] JBoss Messaging SVN: r7786 - in trunk/tests/src/org/jboss/messaging/tests/integration: jms and 6 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-08-19 02:22:36 -0400 (Wed, 19 Aug 2009)
New Revision: 7786

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/FloodServerTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/CloseConnectionOnGCTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/remoting/SynchronousCloseTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java
Log:
Fixing a few testsuite leaks (JMSServer.stop)

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -143,10 +143,14 @@
    @Override
    protected void tearDown() throws Exception
    {
+      liveServer.stop();
+
       backupServer.stop();
-
-      liveServer.stop();
       
+      MBeanServerFactory.releaseMBeanServer(backupMBeanServer);
+      
+      MBeanServerFactory.releaseMBeanServer(liveMBeanServer);
+      
       backupServer = null;
       
       liveServer = null;

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/FloodServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/FloodServerTest.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/FloodServerTest.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -123,6 +123,9 @@
    @Override
    protected void tearDown() throws Exception
    {
+      
+      serverManager.stop();
+      
       server.stop();
 
       server = null;

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -346,8 +346,16 @@
    @Override
    protected void tearDown() throws Exception
    {
-      connection.close();           
+
       
+      backupServerManager.stop();
+ 
+      liveServerManager.stop();
+      
+      connection.close();     
+      
+      session.close();
+      
       liveServerManager = null;
       
       backupServerManager = null;

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/CloseConnectionOnGCTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/CloseConnectionOnGCTest.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/CloseConnectionOnGCTest.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -76,6 +76,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/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -80,6 +80,8 @@
    @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/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -745,8 +745,20 @@
    @Override
    protected void tearDown() throws Exception
    {
+      serverManager.stop();
+
       server.stop();
 
+      serverManager = null;
+
+      server = null;
+
+      queue = null;
+
+      context.close();
+
+      context = null;
+
       super.tearDown();
    }
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/remoting/SynchronousCloseTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/remoting/SynchronousCloseTest.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/remoting/SynchronousCloseTest.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -77,6 +77,8 @@
    protected void tearDown() throws Exception
    {
       server.stop();
+      
+      server = null;
 
       super.tearDown();
    }

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java	2009-08-18 20:39:41 UTC (rev 7785)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/NettySecurityClientTest.java	2009-08-19 06:22:36 UTC (rev 7786)
@@ -93,6 +93,8 @@
    {
       messagingService.stop();
 
+      messagingService = null;
+      
       super.tearDown();
    }