[jboss-cvs] JBoss Messaging SVN: r7544 - in trunk/tests/src/org/jboss/messaging/tests: util and 1 other directory.

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

Author: jmesnil
Date: 2009-07-08 09:41:50 -0400 (Wed, 08 Jul 2009)
New Revision: 7544

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
   trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
Log:
in ClusterTestBase fixtures, check that ports used by netty are free before and after the tests

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java	2009-07-08 12:19:26 UTC (rev 7543)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java	2009-07-08 13:41:50 UTC (rev 7544)
@@ -56,6 +56,7 @@
 import org.jboss.messaging.core.server.MessagingServer;
 import org.jboss.messaging.core.server.cluster.ClusterConnection;
 import org.jboss.messaging.core.server.cluster.RemoteQueueBinding;
+import org.jboss.messaging.integration.transports.netty.TransportConstants;
 import org.jboss.messaging.tests.util.ServiceTestBase;
 import org.jboss.messaging.utils.Pair;
 import org.jboss.messaging.utils.SimpleString;
@@ -73,6 +74,18 @@
 {
    private static final Logger log = Logger.getLogger(ClusterTestBase.class);
 
+   private static final int[] PORTS = {TransportConstants.DEFAULT_PORT,
+                                       TransportConstants.DEFAULT_PORT + 1,
+                                       TransportConstants.DEFAULT_PORT + 2,
+                                       TransportConstants.DEFAULT_PORT + 3,
+                                       TransportConstants.DEFAULT_PORT + 4,
+                                       TransportConstants.DEFAULT_PORT + 5,
+                                       TransportConstants.DEFAULT_PORT + 6,
+                                       TransportConstants.DEFAULT_PORT + 7,
+                                       TransportConstants.DEFAULT_PORT + 8,
+                                       TransportConstants.DEFAULT_PORT + 9,
+   };
+
    private static final long WAIT_TIMEOUT = 10000;
 
    @Override
@@ -80,8 +93,18 @@
    {
       super.setUp();
 
+      checkFreePort(PORTS);
+      
       clearData();
    }
+   
+   @Override
+   protected void tearDown() throws Exception
+   {
+      checkFreePort(PORTS);
+      
+      super.tearDown();
+   }
 
    // Private -------------------------------------------------------------------------------------------------------
 

Modified: trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java	2009-07-08 12:19:26 UTC (rev 7543)
+++ trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java	2009-07-08 13:41:50 UTC (rev 7544)
@@ -67,6 +67,7 @@
 import org.jboss.messaging.core.server.ServerMessage;
 import org.jboss.messaging.core.server.impl.ServerMessageImpl;
 import org.jboss.messaging.core.transaction.impl.XidImpl;
+import org.jboss.messaging.integration.transports.netty.TransportConstants;
 import org.jboss.messaging.jms.client.JBossTextMessage;
 import org.jboss.messaging.utils.SimpleString;
 import org.jboss.messaging.utils.UUIDGenerator;
@@ -537,7 +538,7 @@
       
       InVMRegistry.instance.clear();
       
-      checkFreePort(5445, 5545);
+      checkFreePort(TransportConstants.DEFAULT_PORT);
       
       log.info("###### starting test " + this.getClass().getName() + "." + this.getName());
    }
@@ -549,7 +550,7 @@
 
       assertEquals(0, InVMRegistry.instance.size());          
 
-      checkFreePort(5445, 5545);
+      checkFreePort(TransportConstants.DEFAULT_PORT);
 
       super.tearDown();
    }