Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 25572 invoked from network); 28 Oct 2005 16:03:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Oct 2005 16:03:00 -0000 Received: (qmail 82013 invoked by uid 500); 28 Oct 2005 16:03:00 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 81976 invoked by uid 500); 28 Oct 2005 16:02:59 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 81965 invoked by uid 99); 28 Oct 2005 16:02:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2005 09:02:59 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 28 Oct 2005 09:02:55 -0700 Received: (qmail 25404 invoked by uid 65534); 28 Oct 2005 16:02:37 -0000 Message-ID: <20051028160237.25400.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r329232 - in /directory/network: branches/0.8/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java trunk/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java Date: Fri, 28 Oct 2005 16:02:36 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Fri Oct 28 09:02:24 2005 New Revision: 329232 URL: http://svn.apache.org/viewcvs?rev=329232&view=rev Log: * Removed unused tests in ConnectorTest * Merged the changes of ConnectorTest in trunk to branches/0.8 Modified: directory/network/branches/0.8/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java directory/network/trunk/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java Modified: directory/network/branches/0.8/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java URL: http://svn.apache.org/viewcvs/directory/network/branches/0.8/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java?rev=329232&r1=329231&r2=329232&view=diff ============================================================================== --- directory/network/branches/0.8/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java (original) +++ directory/network/branches/0.8/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java Fri Oct 28 09:02:24 2005 @@ -18,9 +18,9 @@ */ package org.apache.mina.examples.echoserver; +import java.net.BindException; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.net.SocketAddress; import junit.framework.Assert; @@ -44,20 +44,10 @@ */ public class ConnectorTest extends AbstractTest { - private int clientPort; - public ConnectorTest() { } - public void setUp() throws Exception - { - super.setUp(); - clientPort = port; - clientPort = AvailablePortFinder.getNextAvailable( clientPort + 1 ); - System.out.println( "Using port " + clientPort + " as local address" ); - } - public void testTCP() throws Exception { IoConnector connector = new SocketConnector(); @@ -95,42 +85,50 @@ private void testConnector( IoConnector connector ) throws Exception { - InetSocketAddress localAddress = new InetSocketAddress( clientPort ); - - System.out.println("* Without localAddress and initializer"); - testConnector( connector, null ); - - System.out.println("* Without localAddress and with initializer"); - testConnector( connector, null ); - - // Tests below fail in Windows platform. - if( System.getProperty("os.name").toLowerCase().indexOf( "windows" ) >= 0 ) - { - // skip further tests - System.out.println( "** Skipping some tests that fails in Windows platform." ); - return; - } - - System.out.println("* With localAddress and without initializer"); - testConnector( connector, localAddress ); + System.out.println("* Without localAddress"); + testConnector( connector, false ); - // It takes some time for local address to be cleared by OS, - // so let's just get a new one rather than waiting for it. - clientPort = AvailablePortFinder.getNextAvailable( clientPort + 1 ); - localAddress = new InetSocketAddress( clientPort ); - - System.out.println("* With localAddress and initializer"); - testConnector( connector, localAddress ); + System.out.println("* With localAddress"); + testConnector( connector, true ); } - private void testConnector( IoConnector connector, SocketAddress localAddress ) throws Exception + private void testConnector( IoConnector connector, boolean useLocalAddress ) throws Exception { EchoConnectorHandler handler = new EchoConnectorHandler(); ByteBuffer readBuf = handler.readBuf; - IoSession session = connector.connect( - new InetSocketAddress( InetAddress.getLocalHost(), port ), - localAddress, - handler ); + + IoSession session = null; + if( !useLocalAddress ) + { + session = connector.connect( + new InetSocketAddress( InetAddress.getLocalHost(), port ), + handler ); + } + else + { + int clientPort = port; + for( int i = 0; i < 65536; i ++ ) + { + clientPort = AvailablePortFinder.getNextAvailable( clientPort + 1 ); + try + { + session = connector.connect( + new InetSocketAddress( InetAddress.getLocalHost(), port ), + new InetSocketAddress( clientPort ), + handler ); + break; + } + catch( BindException e ) + { + // Try again until we succeed to bind. + } + } + + if( session == null ) + { + Assert.fail( "Failed to find out an appropriate local address." ); + } + } for( int i = 0; i < 10; i ++ ) { Modified: directory/network/trunk/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java?rev=329232&r1=329231&r2=329232&view=diff ============================================================================== --- directory/network/trunk/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java (original) +++ directory/network/trunk/src/test/org/apache/mina/examples/echoserver/ConnectorTest.java Fri Oct 28 09:02:24 2005 @@ -52,11 +52,6 @@ { } - public void setUp() throws Exception - { - super.setUp(); - } - public void testTCP() throws Exception { IoConnector connector = new SocketConnector();