Author: struberg
Date: Wed Jun 8 22:17:02 2011
New Revision: 1133584
URL: http://svn.apache.org/viewvc?rev=1133584&view=rev
Log:
WAGON-335 use different ports for the test server fixtures for each wagon module
This prevents us from getting 'Address already in use' Exceptions when building
wagon in parallel mode
Modified:
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpsGetWagonTests.java
Modified:
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
(original)
+++
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
Wed Jun 8 22:17:02 2011
@@ -19,14 +19,6 @@ package org.apache.maven.wagon;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
@@ -42,6 +34,14 @@ import org.codehaus.plexus.util.FileUtil
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
+import java.io.File;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* @author <a href="mailto:[email protected]";>Jason van Zyl</a>
* @version $Id$
@@ -131,6 +131,13 @@ public abstract class WagonTestCase
*/
protected abstract String getProtocol();
+ /**
+ * The number of the port which should get used to start the test server
+ *
+ * @return the port number for the test server
+ */
+ protected abstract int getTestRepositoryPort();
+
// ----------------------------------------------------------------------
// 1. Create a local file repository which mimic a users local file
// Repository.
Modified:
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
(original)
+++
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
Wed Jun 8 22:17:02 2011
@@ -19,22 +19,6 @@ package org.apache.maven.wagon.http;
* under the License.
*/
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLDecoder;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.zip.GZIPOutputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.FileTestUtils;
import org.apache.maven.wagon.ResourceDoesNotExistException;
@@ -65,6 +49,21 @@ import org.mortbay.jetty.servlet.Context
import org.mortbay.jetty.servlet.DefaultServlet;
import org.mortbay.jetty.servlet.ServletHolder;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLDecoder;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.zip.GZIPOutputStream;
+
/**
* @version $Id: LightweightHttpWagonTest.java 680764 2008-07-29 16:45:51Z
brett $
*/
@@ -88,7 +87,7 @@ public abstract class HttpWagonTestCase
FileUtils.deleteDirectory( repositoryDirectory );
repositoryDirectory.mkdirs();
- server = new Server( 10007 );
+ server = new Server( getTestRepositoryPort() );
PutHandler putHandler = new PutHandler( repositoryDirectory );
server.addHandler( putHandler );
@@ -318,7 +317,7 @@ public abstract class HttpWagonTestCase
public void testGzipGet()
throws Exception
{
- Server server = new Server( 10008 );
+ Server server = new Server( getTestRepositoryPort() );
String localRepositoryPath =
FileTestUtils.getTestOutputDir().toString();
Context root = new Context( server, "/", Context.SESSIONS );
@@ -388,12 +387,12 @@ public abstract class HttpWagonTestCase
throws Exception, IOException, ConnectionException,
AuthenticationException, ResourceDoesNotExistException,
TransferFailedException, AuthorizationException
{
- Server proxyServer = new Server( 10007 );
+ Server proxyServer = new Server( getTestRepositoryPort() );
proxyServer.setHandler( handler );
proxyServer.start();
- proxyInfo.setPort( 10007 );
+ proxyInfo.setPort( getTestRepositoryPort() );
try
{
Modified:
maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -19,9 +19,6 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.FileTestUtils;
import org.apache.maven.wagon.StreamingWagonTestCase;
@@ -30,6 +27,9 @@ import org.apache.maven.wagon.authentica
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
+import java.io.File;
+import java.io.IOException;
+
/**
* @author <a href="[email protected]">Michal Maczka</a>
* @version $Id$
@@ -49,7 +49,13 @@ public class FileWagonTest
return "file://" + file.getPath();
}
-
+
+ @Override
+ protected int getTestRepositoryPort() {
+ // file transfer dont needs a port
+ return 0;
+ }
+
/**
* This test is introduced to allow for null file wagons.
* Which is used heavily in the maven component ITs.
Modified:
maven/wagon/trunk/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -19,10 +19,6 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.ftplet.Authority;
@@ -40,6 +36,10 @@ import org.apache.maven.wagon.repository
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="[email protected]">Michal Maczka</a>
* @version $Id$
@@ -54,6 +54,11 @@ public class FtpWagonTest
return "ftp";
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 10023;
+ }
+
protected void setupWagonTestingFixtures()
throws Exception
{
@@ -70,7 +75,7 @@ public class FtpWagonTest
ListenerFactory factory = new ListenerFactory();
// set the port of the listener
- factory.setPort(10023);
+ factory.setPort(getTestRepositoryPort());
// replace the default listener
serverFactory.addListener("default", factory.createListener());
@@ -118,7 +123,7 @@ public class FtpWagonTest
protected String getTestRepositoryUrl()
{
- return "ftp://localhost:10023";;
+ return "ftp://localhost:"; + getTestRepositoryPort();
}
public AuthenticationInfo getAuthInfo()
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -19,9 +19,6 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.io.File;
-import java.util.Properties;
-
import org.apache.maven.wagon.StreamingWagon;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.http.HttpWagonTestCase;
@@ -29,6 +26,9 @@ import org.apache.maven.wagon.proxy.Prox
import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
+import java.util.Properties;
+
/**
* @author <a href="[email protected]">Michal Maczka</a>
* @version $Id$
@@ -43,7 +43,12 @@ public class LightweightHttpWagonTest
protected String getTestRepositoryUrl()
{
- return getProtocol() + "://localhost:10007/";
+ return getProtocol() + "://localhost:" + getTestRepositoryPort() + "/";
+ }
+
+ @Override
+ protected int getTestRepositoryPort() {
+ return 10017;
}
protected void setHttpHeaders( StreamingWagon wagon, Properties properties
)
Modified:
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
Wed Jun 8 22:17:02 2011
@@ -20,7 +20,9 @@ package org.apache.maven.wagon.providers
*/
import org.apache.maven.wagon.tck.http.GetWagonTests;
+import org.apache.maven.wagon.tck.http.HttpWagonTests;
import org.apache.maven.wagon.tck.http.HttpsGetWagonTests;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -30,4 +32,10 @@ import org.junit.runners.Suite;
@RunWith( Suite.class )
@Suite.SuiteClasses( { GetWagonTests.class, HttpsGetWagonTests.class } )
public class TckTest {
+
+ @BeforeClass
+ public static void setup()
+ {
+ HttpWagonTests.setDefaultPort(9082);
+ }
}
Modified:
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -19,13 +19,13 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.util.Properties;
-
import org.apache.maven.wagon.StreamingWagon;
import org.apache.maven.wagon.http.HttpWagonTestCase;
import org.apache.maven.wagon.shared.http.HttpConfiguration;
import org.apache.maven.wagon.shared.http.HttpMethodConfiguration;
+import java.util.Properties;
+
/**
* @author <a href="[email protected]">Michal Maczka</a>
* @version $Id$
@@ -40,7 +40,12 @@ public class HttpWagonTest
protected String getTestRepositoryUrl()
{
- return getProtocol() + "://localhost:10007";
+ return getProtocol() + "://localhost:" + getTestRepositoryPort();
+ }
+
+ @Override
+ protected int getTestRepositoryPort() {
+ return 10009;
}
protected void setHttpHeaders( StreamingWagon wagon, Properties properties
)
Modified:
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/TckTest.java
Wed Jun 8 22:17:02 2011
@@ -20,7 +20,9 @@ package org.apache.maven.wagon.providers
*/
import org.apache.maven.wagon.tck.http.GetWagonTests;
+import org.apache.maven.wagon.tck.http.HttpWagonTests;
import org.apache.maven.wagon.tck.http.HttpsGetWagonTests;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -29,5 +31,12 @@ import org.junit.runners.Suite;
*/
@RunWith( Suite.class )
@Suite.SuiteClasses( { GetWagonTests.class, HttpsGetWagonTests.class } )
-public class TckTest {
+public class TckTest
+{
+ @BeforeClass
+ public static void setup()
+ {
+ HttpWagonTests.setDefaultPort(9083);
+ }
+
}
Modified:
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -19,10 +19,6 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.maven.scm.manager.plexus.DefaultScmManager;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.wagon.FileTestUtils;
@@ -36,6 +32,10 @@ import org.apache.maven.wagon.repository
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
/**
* Test for {@link ScmWagon}. You need a subclass for each SCM provider you
want to test.
*
@@ -90,6 +90,11 @@ public abstract class AbstractScmWagonTe
return null;
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 0; // not used
+ }
+
protected Wagon getWagon()
throws Exception
{
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -55,6 +55,12 @@ public class ScpExternalWagonTest
return "scpexe";
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 0; // not used
+ }
+
+
public String getTestRepositoryUrl()
{
return TestData.getTestRepositoryUrl();
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
Wed Jun 8 22:17:02 2011
@@ -53,6 +53,12 @@ public class ScpWagonWithSshPrivateKeySe
return "scpexe";
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 0; // not used
+ }
+
+
public String getTestRepositoryUrl()
{
return TestData.getTestRepositoryUrl();
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -19,14 +19,14 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.wagon.StreamingWagonTestCase;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.providers.ssh.TestData;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
+import java.io.File;
+
/**
* @author <a href="[email protected]">Michal Maczka</a>
* @version $Id$
@@ -39,6 +39,11 @@ public class ScpWagonTest
return "scp";
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 0; // not used
+ }
+
public String getTestRepositoryUrl()
{
return TestData.getTestRepositoryUrl();
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
Wed Jun 8 22:17:02 2011
@@ -42,6 +42,11 @@ public class ScpWagonWithSshPrivateKeySe
return "scp";
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 0; // not used
+ }
+
public String getTestRepositoryUrl()
{
return TestData.getTestRepositoryUrl();
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -19,14 +19,14 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.wagon.StreamingWagonTestCase;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.providers.ssh.TestData;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
+import java.io.File;
+
/**
* @author <a href="mailto:[email protected]";>Brett Porter</a>
* @version $Id$
@@ -39,6 +39,11 @@ public class SftpWagonTest
return "sftp";
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 0; // not used
+ }
+
public String getTestRepositoryUrl()
{
return TestData.getTestRepositoryUrl();
Modified:
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
(original)
+++
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
Wed Jun 8 22:17:02 2011
@@ -16,12 +16,6 @@ package org.apache.maven.wagon.providers
*/
import it.could.webdav.DAVServlet;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.StreamingWagon;
import org.apache.maven.wagon.Wagon;
@@ -32,6 +26,11 @@ import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+
/*
* WebDAV Wagon Test
*
@@ -45,7 +44,7 @@ public class WebDavWagonTest
protected String getTestRepositoryUrl()
throws IOException
{
- return getProtocol() + "://localhost:10007/newfolder/folder2";
+ return getProtocol() + "://localhost:" + getTestRepositoryPort() +
"/newfolder/folder2";
}
protected String getProtocol()
@@ -53,6 +52,11 @@ public class WebDavWagonTest
return "dav";
}
+ @Override
+ protected int getTestRepositoryPort() {
+ return 10011;
+ }
+
protected void createContext( Server server, File repositoryDirectory )
throws IOException
{
@@ -87,7 +91,8 @@ public class WebDavWagonTest
*/
public void testGetURLDavHttp()
{
- assertURL( "dav:http://localhost:10007/dav/";,
"http://localhost:10007/dav/"; );
+ assertURL( "dav:http://localhost:"; + getTestRepositoryPort() + "/dav/",
+ "http://localhost:"; + getTestRepositoryPort() + "/dav/" );
}
/**
@@ -95,7 +100,8 @@ public class WebDavWagonTest
*/
public void testGetURLDavHttps()
{
- assertURL( "dav:https://localhost:10007/dav/";,
"https://localhost:10007/dav/"; );
+ assertURL( "dav:https://localhost:"; + getTestRepositoryPort() +
"/dav/",
+ "https://localhost:"; + getTestRepositoryPort() + "/dav/" );
}
/**
@@ -103,7 +109,8 @@ public class WebDavWagonTest
*/
public void testGetURLDavUri()
{
- assertURL( "dav://localhost:10007/dav/", "http://localhost:10007/dav/";
);
+ assertURL( "dav://localhost:" + getTestRepositoryPort() + "/dav/",
+ "http://localhost:"; + getTestRepositoryPort() + "/dav/" );
}
/**
@@ -111,7 +118,8 @@ public class WebDavWagonTest
*/
public void testGetURLDavUriWithSsl()
{
- assertURL( "davs://localhost:10007/dav/",
"https://localhost:10007/dav/"; );
+ assertURL( "davs://localhost:" + getTestRepositoryPort() + "/dav/",
+ "https://localhost:"; + getTestRepositoryPort() + "/dav/" );
}
/**
@@ -119,7 +127,8 @@ public class WebDavWagonTest
*/
public void testGetURLDavPlusHttp()
{
- assertURL( "dav+https://localhost:10007/dav/";,
"https://localhost:10007/dav/"; );
+ assertURL( "dav+https://localhost:"; + getTestRepositoryPort() +
"/dav/",
+ "https://localhost:"; + getTestRepositoryPort() + "/dav/" );
}
/**
@@ -127,7 +136,8 @@ public class WebDavWagonTest
*/
public void testGetURLDavPlusHttps()
{
- assertURL( "dav+https://localhost:10007/dav/";,
"https://localhost:10007/dav/"; );
+ assertURL( "dav+https://localhost:"; + getTestRepositoryPort() +
"/dav/",
+ "https://localhost:"; + getTestRepositoryPort() + "/dav/" );
}
public void testMkdirs() throws Exception
Modified:
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
(original)
+++
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
Wed Jun 8 22:17:02 2011
@@ -48,6 +48,8 @@ public abstract class HttpWagonTests
private ServerFixture serverFixture;
+ private static int defaultPort = 9080;
+
private static PlexusContainer container;
private Wagon wagon;
@@ -282,7 +284,12 @@ public abstract class HttpWagonTests
protected int getDefaultPort()
{
- return 9080;
+ return defaultPort;
+ }
+
+ public static void setDefaultPort( int defaultPort )
+ {
+ HttpWagonTests.defaultPort = defaultPort;
}
protected int getPortPropertyValue()
Modified:
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpsGetWagonTests.java
URL:
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpsGetWagonTests.java?rev=1133584&r1=1133583&r2=1133584&view=diff
==============================================================================
---
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpsGetWagonTests.java
(original)
+++
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpsGetWagonTests.java
Wed Jun 8 22:17:02 2011
@@ -32,7 +32,7 @@ public class HttpsGetWagonTests
@Override
protected int getDefaultPort()
{
- return 9443;
+ return super.getDefaultPort() + 443;
}
}
