You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2010/01/14 17:33:02 UTC
svn commit: r899275 - in /mina/trunk/core/src/test/java/org/apache/mina/transport: AbstractConnectorTest.java AbstractFileRegionTest.java socket/nio/NioFileRegionTest.java socket/nio/SocketConnectorTest.java

Author: elecharny
Date: Thu Jan 14 16:33:01 2010
New Revision: 899275

URL: http://svn.apache.org/viewvc?rev=899275&view=rev
Log:
Better fix for the Mac OSX port finder issue (applying Niklas patch correctly)

Modified:
    mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
    mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java
    mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java
    mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java

Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java?rev=899275&r1=899274&r2=899275&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java Thu Jan 14 16:33:01 2010
@@ -47,7 +47,7 @@
     protected abstract IoConnector createConnector();
 
     public void testConnectFutureSuccessTiming() throws Exception {
-        int port = AvailablePortFinder.getNextAvailable(2025);
+        int port = AvailablePortFinder.getNextAvailable(1025);
         IoAcceptor acceptor = createAcceptor();
         acceptor.setHandler(new IoHandlerAdapter());
         acceptor.bind(new InetSocketAddress(port));
@@ -135,7 +135,8 @@
         final CountDownLatch latch = new CountDownLatch(2);
         final ConnectFuture[] callbackFuture = new ConnectFuture[1];
         
-        int port = AvailablePortFinder.getNextAvailable(3025);
+        int port = AvailablePortFinder.getNextAvailable(1025);
+
         IoAcceptor acceptor = createAcceptor();
         IoConnector connector = createConnector();
 

Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java?rev=899275&r1=899274&r2=899275&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java Thu Jan 14 16:33:01 2010
@@ -36,6 +36,7 @@
 import org.apache.mina.core.service.IoConnector;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IoSession;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 
@@ -60,7 +61,7 @@
         final boolean[] success = {false};
         final Throwable[] exception = {null};
         
-        int port = AvailablePortFinder.getNextAvailable(4025);
+        int port = AvailablePortFinder.getNextAvailable(1025);
         IoAcceptor acceptor = createAcceptor();
         IoConnector connector = createConnector();
 
@@ -93,6 +94,8 @@
                 }
             });
             
+            ((NioSocketAcceptor)acceptor).setReuseAddress(true);
+            
             acceptor.bind(new InetSocketAddress(port));
             
             connector.setHandler(new IoHandlerAdapter() {

Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java?rev=899275&r1=899274&r2=899275&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java Thu Jan 14 16:33:01 2010
@@ -32,7 +32,9 @@
 
     @Override
     protected IoAcceptor createAcceptor() {
-        return new NioSocketAcceptor();
+        NioSocketAcceptor acceptor = new NioSocketAcceptor();
+        acceptor.setReuseAddress(true);
+        return acceptor;
     }
 
     @Override

Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java?rev=899275&r1=899274&r2=899275&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java Thu Jan 14 16:33:01 2010
@@ -32,7 +32,10 @@
 
     @Override
     protected IoAcceptor createAcceptor() {
-        return new NioSocketAcceptor();
+        NioSocketAcceptor acceptor = new NioSocketAcceptor();
+        
+        acceptor.setReuseAddress(true);
+        return acceptor;
     }
 
     @Override