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

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

Author: clebert.suconic at jboss.com
Date: 2006-12-05 11:35:36 -0500 (Tue, 05 Dec 2006)
New Revision: 1707

Modified:
   branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java
   branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
Log:
Fixing Test

Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java	2006-12-05 15:25:53 UTC (rev 1706)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java	2006-12-05 16:35:36 UTC (rev 1707)
@@ -85,34 +85,34 @@
       {
          ServerManagement.start("all", 0);
          ServerManagement.start("all", 1);
-//         ServerManagement.start("all", 2);
+         ServerManagement.start("all", 2);
 
-//         ServerManagement.deployClusteredQueue("testDistributedQueue", 0);
-//         ServerManagement.deployClusteredTopic("testDistributedTopic", 0);
-//
-//         ServerManagement.deployClusteredQueue("testDistributedQueue", 1);
-//         ServerManagement.deployClusteredTopic("testDistributedTopic", 1);
-//
-//         ServerManagement.deployClusteredQueue("testDistributedQueue", 2);
-//         ServerManagement.deployClusteredTopic("testDistributedTopic", 2);
-//
-//         ic1 = new InitialContext(ServerManagement.getJNDIEnvironment(0));
-//         ic2 = new InitialContext(ServerManagement.getJNDIEnvironment(1));
-//         ic3 = new InitialContext(ServerManagement.getJNDIEnvironment(2));
-//
-//         queue1 = (Queue)ic1.lookup("queue/testDistributedQueue");
-//         queue2 = (Queue)ic2.lookup("queue/testDistributedQueue");
-//         queue3 = (Queue)ic3.lookup("queue/testDistributedQueue");
-//
-//         topic1 = (Topic)ic1.lookup("topic/testDistributedTopic");
-//         topic2 = (Topic)ic2.lookup("topic/testDistributedTopic");
-//         topic3 = (Topic)ic3.lookup("topic/testDistributedTopic");
-//
-//         cf1 = (ConnectionFactory)ic1.lookup("/ConnectionFactory");
-//         cf2 = (ConnectionFactory)ic2.lookup("/ConnectionFactory");
-//         cf3 = (ConnectionFactory)ic3.lookup("/ConnectionFactory");
-//
-//         drainQueues();
+         ServerManagement.deployClusteredQueue("testDistributedQueue", 0);
+         ServerManagement.deployClusteredTopic("testDistributedTopic", 0);
+
+         ServerManagement.deployClusteredQueue("testDistributedQueue", 1);
+         ServerManagement.deployClusteredTopic("testDistributedTopic", 1);
+
+         ServerManagement.deployClusteredQueue("testDistributedQueue", 2);
+         ServerManagement.deployClusteredTopic("testDistributedTopic", 2);
+
+         ic1 = new InitialContext(ServerManagement.getJNDIEnvironment(0));
+         ic2 = new InitialContext(ServerManagement.getJNDIEnvironment(1));
+         ic3 = new InitialContext(ServerManagement.getJNDIEnvironment(2));
+
+         queue1 = (Queue)ic1.lookup("queue/testDistributedQueue");
+         queue2 = (Queue)ic2.lookup("queue/testDistributedQueue");
+         queue3 = (Queue)ic3.lookup("queue/testDistributedQueue");
+
+         topic1 = (Topic)ic1.lookup("topic/testDistributedTopic");
+         topic2 = (Topic)ic2.lookup("topic/testDistributedTopic");
+         topic3 = (Topic)ic3.lookup("topic/testDistributedTopic");
+
+         cf1 = (ConnectionFactory)ic1.lookup("/ConnectionFactory");
+         cf2 = (ConnectionFactory)ic2.lookup("/ConnectionFactory");
+         cf3 = (ConnectionFactory)ic3.lookup("/ConnectionFactory");
+
+         drainQueues();
       }
       catch (Exception e)
       {

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-05 15:25:53 UTC (rev 1706)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2006-12-05 16:35:36 UTC (rev 1707)
@@ -25,7 +25,6 @@
 import javax.jms.MessageConsumer;
 import javax.jms.TextMessage;
 import org.jboss.jms.message.MessageProxy;
-import org.jboss.logging.Logger;
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
@@ -54,8 +53,6 @@
 
    public void testLeaveFailover() throws Exception
    {
-      log.info("XXXXXXXXXXXXXXX DONE XXXXXXXXXXXXXXXXXXXXXX");
-      Thread.sleep(999999999);
       try
       {
          System.out.println("Number of nodes on Cluster = " + ServerManagement.getServer(0).getNumberOfNodesOnCluster());