Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F8FD7979 for ; Wed, 9 Nov 2011 22:58:18 +0000 (UTC) Received: (qmail 86447 invoked by uid 500); 9 Nov 2011 22:58:18 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 86381 invoked by uid 500); 9 Nov 2011 22:58:18 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 86374 invoked by uid 99); 9 Nov 2011 22:58:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Nov 2011 22:58:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Nov 2011 22:58:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C615A23889BB for ; Wed, 9 Nov 2011 22:57:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200021 - in /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider: ftp/test/FtpProviderTestCase.java sftp/test/SftpProviderTestCase.java Date: Wed, 09 Nov 2011 22:57:53 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111109225753.C615A23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Wed Nov 9 22:57:53 2011 New Revision: 1200021 URL: http://svn.apache.org/viewvc?rev=1200021&view=rev Log: Testing FTP: Find a free socket port at runtime instead of hard-coding one. Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java?rev=1200021&r1=1200020&r2=1200021&view=diff ============================================================================== --- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java (original) +++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java Wed Nov 9 22:57:53 2011 @@ -16,6 +16,7 @@ */ package org.apache.commons.vfs2.provider.ftp.test; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; @@ -30,6 +31,7 @@ import org.apache.commons.vfs2.provider. import org.apache.commons.vfs2.test.AbstractProviderTestConfig; import org.apache.commons.vfs2.test.ProviderTestConfig; import org.apache.commons.vfs2.test.ProviderTestSuite; +import org.apache.commons.vfs2.util.FreeSocketPortUtil; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.FtpServerFactory; import org.apache.ftpserver.ftplet.FtpException; @@ -46,12 +48,12 @@ import org.junit.Assert; */ public class FtpProviderTestCase extends AbstractProviderTestConfig implements ProviderTestConfig { - private static final int DEFAULT_PORT = 2121; + private static int SocketPort; /** * Use %40 for @ in the FTP URL password */ - private static final String DEFAULT_URI = "ftp://test:test@localhost:" + DEFAULT_PORT; + private static String ConnectionUri; private static FtpServer Server; @@ -89,7 +91,7 @@ public class FtpProviderTestCase extends serverFactory.setUserManager(userManager); ListenerFactory factory = new ListenerFactory(); // set the port of the listener - factory.setPort(DEFAULT_PORT); + factory.setPort(SocketPort); // replace the default listener serverFactory.addListener("default", factory.createListener()); @@ -136,6 +138,13 @@ public class FtpProviderTestCase extends } } + public FtpProviderTestCase() throws IOException + { + SocketPort = FreeSocketPortUtil.findFreeLocalPort(); + // Use %40 for @ in the a URL a @ + ConnectionUri = "ftp://test:test@localhost:" + SocketPort; + } + /** * Returns the base folder for tests. You can override the DEFAULT_URI by using the system property name defined by TEST_URI. */ @@ -145,7 +154,7 @@ public class FtpProviderTestCase extends String uri = getSystemTestUriOverride(); if (uri == null) { - uri = DEFAULT_URI; + uri = ConnectionUri; } FileSystemOptions opts = new FileSystemOptions(); FtpFileSystemConfigBuilder.getInstance().setPassiveMode(opts, true); Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java?rev=1200021&r1=1200020&r2=1200021&view=diff ============================================================================== --- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java (original) +++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/sftp/test/SftpProviderTestCase.java Wed Nov 9 22:57:53 2011 @@ -276,7 +276,7 @@ public class SftpProviderTestCase extend public SftpProviderTestCase() throws IOException { SocketPort = FreeSocketPortUtil.findFreeLocalPort(); - // Use %40 for @ in the FTP URL password if you need a @ + // Use %40 for @ in the a URL a @ ConnectionUri = String.format("sftp://%s@localhost:%d", DEFAULT_USER, SocketPort); }