[jboss-cvs] JBoss Messaging SVN: r2968 - in trunk/tests: src/org/jboss/test/messaging/jms/clustering and 1 other directory.

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

Author: timfox
Date: 2007-08-07 08:49:16 -0400 (Tue, 07 Aug 2007)
New Revision: 2968

Modified:
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
Log:
tests speedup


Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-08-07 12:44:43 UTC (rev 2967)
+++ trunk/tests/build.xml	2007-08-07 12:49:16 UTC (rev 2968)
@@ -761,15 +761,11 @@
 <include name="**/jms/clustering/ClusterConnectionManagerTest.class"/>
 <include name="**/jms/clustering/ClusteredConnectionFactoryTest.class"/>
 <include name="**/jms/clustering/ClusteringAspectInternalTest.class"/>
+<include name="**/jms/clustering/ClusterViewUpdateTest.class"/>
 
 
 
 
-
-
-
-
-<include name="**/jms/clustering/ClusterViewUpdateTest.class"/>
 <include name="**/jms/clustering/DisableLoadBalancingAndFailoverTest.class"/>
 <include name="**/jms/clustering/DistributedQueueDontUseXATest.class"/>
 <include name="**/jms/clustering/DistributedQueueUseXATest.class"/>

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java	2007-08-07 12:44:43 UTC (rev 2967)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java	2007-08-07 12:49:16 UTC (rev 2968)
@@ -95,16 +95,17 @@
 
       log.info("ServerId=" + getServerId(conn1));
       assertEquals(0, getServerId(conn1));
-     
-      conn1.close();
-      
+       
       //restart
-      ServerManagement.start(1, "all");
+      log.info("Restarting server");
+      ServerManagement.start(1, "all", false);
       
       Thread.sleep(5000);
       
       assertEquals(2, cfDelegate.getDelegates().length);
       
+      conn1.close();
+            
       ServerManagement.stop(1);
    }
    
@@ -138,14 +139,16 @@
       // Second part, verifies a possible race condition on failoverMap and handleFilover
       assertEquals(0, getServerId(conn1));
      
-      conn1.close();
-      
       //restart
-      ServerManagement.start(1, "all");
+      ServerManagement.start(1, "all", false);
       
       Thread.sleep(5000);
       
       assertEquals(2, cfDelegate.getDelegates().length);
+      
+      conn1.close();
+      
+      ServerManagement.stop(1);
    }
 
    public void testUpdateMixedConnectionFactory() throws Exception
@@ -200,7 +203,7 @@
       assertEquals(0, getServerId(httpConn1));
 
       conn1.close();
-      httpConn.close();
+      httpConn1.close();
    }
 
    /**

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java	2007-08-07 12:44:43 UTC (rev 2967)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java	2007-08-07 12:49:16 UTC (rev 2968)
@@ -70,7 +70,7 @@
 
       // We start programatically the eighth node.
 
-      ServerManagement.start(7, "all");
+      ServerManagement.start(7, "all", false);
 
       // wait for change to propagate
 
@@ -248,7 +248,7 @@
 
       // We get the first node to re-join
 
-      ServerManagement.start(0, "all");
+      ServerManagement.start(0, "all", false);
 
       if (!clusterEvent.viewChanged(30000))
       {