[jboss-cvs] JBoss Messaging SVN: r1736 - in branches/Branch_Client_Failover_Experiment/tests: . src/org/jboss/test/messaging/jms/clustering

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

Author: timfox
Date: 2006-12-09 10:11:31 -0500 (Sat, 09 Dec 2006)
New Revision: 1736

Modified:
   branches/Branch_Client_Failover_Experiment/tests/build.xml
   branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
Log:
All tests now pass



Modified: branches/Branch_Client_Failover_Experiment/tests/build.xml
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/build.xml	2006-12-09 14:54:47 UTC (rev 1735)
+++ branches/Branch_Client_Failover_Experiment/tests/build.xml	2006-12-09 15:11:31 UTC (rev 1736)
@@ -727,7 +727,7 @@
                     haltonerror="${junit.batchtest.haltonerror}">
             <formatter type="plain" usefile="${junit.formatter.usefile}"/>
             <fileset dir="${build.tests.classes}">
-               <include name="**/jms/clustering/HATest.class"/>
+               <include name="**/jms/clustering/*Test.class"/>
                <!--
                <include name="**/jms/clustering/SimpleClusteringTest.class"/>
                -->

Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2006-12-09 14:54:47 UTC (rev 1735)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2006-12-09 15:11:31 UTC (rev 1736)
@@ -189,20 +189,6 @@
       
    }
  
-   public void testStartStopProblem() throws Exception
-   {
-      //Three nodes should be running now
-      
-      //Stop one of them
-      
-      ServerManagement.stop(0, true);
-      
-      //Stop another
-      
-      ServerManagement.stop(1, true);                 
-   }
-   
-   
    /*
     * Test that the failover mapping is created correctly
     */
@@ -225,6 +211,8 @@
       
       //The order here depends on the order the servers were started in
       
+      //If any servers get stopped and then started then the order will change
+ 
       log.info("cf1 serverid=" + cf1.getServerId());
       
       log.info("cf2 serverid=" + cf2.getServerId());
@@ -325,7 +313,7 @@
       
       cf1 = delegate3.getDelegates()[0];
       
-      assertEquals(0, cf1.getServerId());
+      assertEquals(2, cf1.getServerId());
       
       
       assertEquals(1, failoverMap3.size());