[jboss-cvs] JBoss Messaging SVN: r7550 - trunk/tests/src/org/jboss/messaging/tests/integration/http.

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

Author: jmesnil
Date: 2009-07-09 09:59:37 -0400 (Thu, 09 Jul 2009)
New Revision: 7550

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
Log:
use a different server port for each test

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java	2009-07-09 13:39:34 UTC (rev 7549)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java	2009-07-09 13:59:37 UTC (rev 7550)
@@ -21,6 +21,8 @@
  */
 package org.jboss.messaging.tests.integration.http;
 
+import java.io.IOException;
+import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
@@ -49,15 +51,26 @@
    private NettyConnector connector;
    
    private ExecutorService threadPool;
+
+   private int port;
+
+   private static int findFreePort() throws IOException
+   {
+      ServerSocket server = new ServerSocket(0);
+      server.setReuseAddress(true);
+      int port = server.getLocalPort();
+      server.close();
+      return port;
+   }
    
    @Override
    protected void setUp() throws Exception
    {
       super.setUp();
       
-      checkFreePort(TransportConstants.DEFAULT_PORT);
-
       threadPool = Executors.newCachedThreadPool();
+      
+      port = findFreePort();
    }
    
    @Override
@@ -76,8 +89,6 @@
       
       threadPool.shutdownNow();
 
-      checkFreePort(TransportConstants.DEFAULT_PORT);
-
       super.tearDown();
    }
    
@@ -92,6 +103,7 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
+      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -142,6 +154,7 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
+      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -195,6 +208,7 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
+      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -249,6 +263,7 @@
       HashMap<String, Object> conf = new HashMap<String, Object>();
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
+      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -302,6 +317,7 @@
       conf.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, 500l);
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_PROP_NAME, 500l);
+      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -351,6 +367,7 @@
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
       conf.put(TransportConstants.HTTP_RESPONSE_TIME_PROP_NAME, 500l);
       conf.put(TransportConstants.HTTP_SERVER_SCAN_PERIOD_PROP_NAME, 5000l);
+      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler acceptorHandler = new SimpleBufferHandler(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);
@@ -393,6 +410,7 @@
       conf.put(TransportConstants.HTTP_CLIENT_IDLE_SCAN_PERIOD, -1l);
       conf.put(TransportConstants.HTTP_RESPONSE_TIME_PROP_NAME, 500l);
       conf.put(TransportConstants.HTTP_SERVER_SCAN_PERIOD_PROP_NAME, 5000l);
+      conf.put(TransportConstants.PORT_PROP_NAME, port);
       DummyConnectionLifeCycleListener acceptorListener = new DummyConnectionLifeCycleListener(connCreatedLatch);
       SimpleBufferHandler2 acceptorHandler = new SimpleBufferHandler2(acceptorLatch);
       acceptor = new NettyAcceptor(conf, acceptorHandler, acceptorListener, threadPool);