[jboss-cvs] JBoss Messaging SVN: r2921 - trunk/tests/src/org/jboss/test/messaging/jms/clustering.

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

Author: timfox
Date: 2007-07-21 06:33:58 -0400 (Sat, 21 Jul 2007)
New Revision: 2921

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java
Log:
Added server shutdown on these tests


Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-07-20 15:03:45 UTC (rev 2920)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-07-21 10:33:58 UTC (rev 2921)
@@ -1088,6 +1088,15 @@
    protected void tearDown() throws Exception
    {
       super.tearDown();
+      
+      for (int i = 0; i < nodeCount; i++)
+      {
+         if (ServerManagement.isStarted(i))
+         {
+            ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+            ServerManagement.stop(i);
+         }
+      }
    }
    
    // Private -------------------------------------------------------

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java	2007-07-20 15:03:45 UTC (rev 2920)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java	2007-07-21 10:33:58 UTC (rev 2921)
@@ -30,6 +30,7 @@
 import javax.jms.TextMessage;
 import javax.management.ObjectName;
 
+import org.jboss.test.messaging.tools.ServerManagement;
 import org.jboss.test.messaging.tools.jmx.ServiceAttributeOverrides;
 
 /**
@@ -98,6 +99,15 @@
    protected void tearDown() throws Exception
    {
       super.tearDown();
+      
+      for (int i = 0; i < nodeCount; i++)
+      {
+         if (ServerManagement.isStarted(i))
+         {
+            ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+            ServerManagement.stop(i);
+         }
+      }
    }
    
    protected void preserveOrderingQueue(boolean persistent) throws Exception