[jboss-cvs] JBoss Messaging SVN: r2976 - 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-08 11:26:24 -0400 (Wed, 08 Aug 2007)
New Revision: 2976

Modified:
   trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java
Log:
Tetss speedup


Modified: trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2007-08-08 10:18:45 UTC (rev 2975)
+++ trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2007-08-08 15:26:24 UTC (rev 2976)
@@ -501,6 +501,7 @@
    
    public Map getRecoveryArea()
    {
+        log.info("Getting recovery area, it is " + this.recoveryArea);
    	return this.recoveryArea;
    }
    

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-08-08 10:18:45 UTC (rev 2975)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-08-08 15:26:24 UTC (rev 2976)
@@ -621,6 +621,9 @@
          receiveMessage("consumerHA", consumerHA, true, true);
 
          session.commit();
+
+         consumerHA.close();
+         session.unsubscribe("T1");
       }
       finally
       {

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java	2007-08-08 10:18:45 UTC (rev 2975)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java	2007-08-08 15:26:24 UTC (rev 2976)
@@ -449,9 +449,6 @@
          conn2.close();
 
          conn3.close();
-
-         this.removeAllMessages(queue[1].getQueueName(), true, 1);
-         this.removeAllMessages(queue[2].getQueueName(), true, 2);
       }
    }
 
@@ -466,7 +463,24 @@
       super.setUp();
    }
 
+   protected void tearDown() throws Exception
+   {
 
+      if (ServerManagement.getServer(0) != null)
+      {      
+         this.removeAllMessages(queue[0].getQueueName(), true, 0);
+      }
+      if (ServerManagement.getServer(1) != null)
+      {
+         this.removeAllMessages(queue[1].getQueueName(), true, 1);
+      }
+      if (ServerManagement.getServer(2) != null)
+      {
+         this.removeAllMessages(queue[2].getQueueName(), true, 2);
+      }
+      super.tearDown();
+   }
+
    // Private --------------------------------------------------------------------------------------
 
    // Inner classes --------------------------------------------------------------------------------

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java	2007-08-08 10:18:45 UTC (rev 2975)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java	2007-08-08 15:26:24 UTC (rev 2976)
@@ -104,6 +104,7 @@
 
          ServerManagement.start(3, "all", false);
          ServerManagement.deployQueue("testDistributedQueue", 3);
+         ServerManagement.deployTopic("testDistributedTopic", 3);
 
          // send/receive message
          prod.send(s.createTextMessage("step3"));
@@ -132,6 +133,7 @@
          ServerManagement.start(4, "all", false);
          log.info("deploying queue on4");
          ServerManagement.deployQueue("testDistributedQueue", 4);
+         ServerManagement.deployTopic("testDistributedTopic", 4);
          log.info("deployed it");
 
          // send/receive message
@@ -349,6 +351,7 @@
             log.info("starting server 1");
             ServerManagement.start(1, "all", false);
             ServerManagement.deployQueue("testDistributedQueue", 1);
+            ServerManagement.deployTopic("testDistributedTopic", 1);
             
             Thread.sleep(5000);
             
@@ -360,6 +363,7 @@
             log.info("Starting server 2");
             ServerManagement.start(2, "all", false);
             ServerManagement.deployQueue("testDistributedQueue", 2);
+            ServerManagement.deployTopic("testDistributedTopic", 2);
             
             Thread.sleep(5000);
             
@@ -371,6 +375,7 @@
             log.info("Starting server 1");
             ServerManagement.start(1, "all", false);
             ServerManagement.deployQueue("testDistributedQueue", 1);
+            ServerManagement.deployTopic("testDistributedTopic", 1);
             
             Thread.sleep(5000);
             
@@ -382,6 +387,7 @@
             log.info("Starting server 2");
             ServerManagement.start(2, "all", false);
             ServerManagement.deployQueue("testDistributedQueue", 2);
+            ServerManagement.deployTopic("testDistributedTopic", 2);
             
             Thread.sleep(5000);