Skip to content

Commit

Permalink
Ask ftp/http server for its assigned port instead of trying to assign…
Browse files Browse the repository at this point in the history 
… an available port
  • Loading branch information
@rfscholte
rfscholte committed Aug 22, 2019
1 parent 184cdad commit d300b11
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 114 deletions.
17 changes: 9 additions & 8 deletions wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
View file
Expand Up @@ -42,10 +42,10 @@ public void testStreamingWagon()
{
if ( supportsGetIfNewer() )
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

streamRoundTripTesting();

tearDownWagonTestingFixtures();
Expand All @@ -55,10 +55,10 @@ public void testStreamingWagon()
public void testFailedGetToStream()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

message( "Getting test artifact from test repository " + testRepository );

StreamingWagon wagon = (StreamingWagon) getWagon();
Expand Down Expand Up @@ -103,8 +103,9 @@ public void testWagonGetIfNewerToStreamIsNewer()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();

int expectedSize = putFile();
// CHECKSTYLE_OFF: MagicNumber
getIfNewerToStream( getExpectedLastModifiedOnGet( testRepository, new Resource( resource ) ) + 30000, false,
Expand All @@ -118,8 +119,8 @@ public void testWagonGetIfNewerToStreamIsOlder()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();
int expectedSize = putFile();
getIfNewerToStream( new SimpleDateFormat( "yyyy-MM-dd" ).parse( "2006-01-01" ).getTime(), true,
expectedSize );
Expand All @@ -131,8 +132,8 @@ public void testWagonGetIfNewerToStreamIsSame()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();
int expectedSize = putFile();
getIfNewerToStream( getExpectedLastModifiedOnGet( testRepository, new Resource( resource ) ), false,
expectedSize );
Expand Down Expand Up @@ -172,8 +173,8 @@ public void testFailedGetIfNewerToStream()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();
message( "Getting test artifact from test repository " + testRepository );
StreamingWagon wagon = (StreamingWagon) getWagon();
wagon.addTransferListener( checksumObserver );
Expand Down
66 changes: 24 additions & 42 deletions wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
View file
Expand Up @@ -42,7 +42,6 @@

import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -136,23 +135,6 @@ protected abstract String getTestRepositoryUrl()
*/
protected abstract String getProtocol();

public static ServerSocket newServerSocket( int... ports )
{
for ( int port : ports )
{
try
{
return new ServerSocket( port );
}
catch ( IOException ex )
{
continue;
}
}

throw new RuntimeException( "no port available" );
}

// ----------------------------------------------------------------------
// 1. Create a local file repository which mimic a users local file
// Repository.
Expand Down Expand Up @@ -270,10 +252,10 @@ protected void message( String message )
public void testWagon()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

fileRoundTripTesting();

tearDownWagonTestingFixtures();
Expand All @@ -284,8 +266,8 @@ public void testWagonGetIfNewerIsNewer()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();
int expectedSize = putFile();
// CHECKSTYLE_OFF: MagicNumber
getIfNewer( getExpectedLastModifiedOnGet( testRepository, new Resource( resource ) ) + 30000, false,
Expand Down Expand Up @@ -315,8 +297,8 @@ public void testWagonGetIfNewerIsSame()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();
int expectedSize = putFile();
getIfNewer( getExpectedLastModifiedOnGet( testRepository, new Resource( resource ) ), false, expectedSize );
}
Expand All @@ -327,8 +309,8 @@ public void testWagonGetIfNewerIsOlder()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();
int expectedSize = putFile();
getIfNewer( new SimpleDateFormat( "yyyy-MM-dd" ).parse( "2006-01-01" ).getTime(), true, expectedSize );
}
Expand Down Expand Up @@ -431,10 +413,10 @@ private void replaceMockForSkippedGetIfNewer( Wagon wagon, int expectedSize )
public void testWagonPutDirectory()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

Wagon wagon = getWagon();

if ( wagon.supportsDirectoryCopy() )
Expand Down Expand Up @@ -479,10 +461,10 @@ public void testWagonPutDirectory()
public void testWagonPutDirectoryDeepDestination()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

Wagon wagon = getWagon();

if ( wagon.supportsDirectoryCopy() )
Expand Down Expand Up @@ -533,10 +515,10 @@ public void testWagonPutDirectoryWhenDirectoryAlreadyExists()

final String[] resources = { "a/test-resource-2.txt", "a/b/test-resource-3.txt", "c/test-resource-4.txt" };

setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

Wagon wagon = getWagon();

if ( wagon.supportsDirectoryCopy() )
Expand Down Expand Up @@ -585,10 +567,10 @@ public void testWagonPutDirectoryForDot()

final String[] resources = { "a/test-resource-2.txt", "a/b/test-resource-3.txt", "c/test-resource-4.txt" };

setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

Wagon wagon = getWagon();

if ( wagon.supportsDirectoryCopy() )
Expand Down Expand Up @@ -688,10 +670,10 @@ private void writeTestFile( String child )
public void testFailedGet()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

message( "Getting test artifact from test repository " + testRepository );

Wagon wagon = getWagon();
Expand Down Expand Up @@ -729,8 +711,8 @@ public void testFailedGetIfNewer()
{
if ( supportsGetIfNewer() )
{
setupRepositories();
setupWagonTestingFixtures();
setupRepositories();
message( "Getting test artifact from test repository " + testRepository );
Wagon wagon = getWagon();
wagon.addTransferListener( checksumObserver );
Expand Down Expand Up @@ -767,10 +749,10 @@ public void testFailedGetIfNewer()
public void testWagonGetFileList()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

String dirName = "file-list";

String filenames[] =
Expand Down Expand Up @@ -821,10 +803,10 @@ public void testWagonGetFileList()
public void testWagonGetFileListWhenDirectoryDoesNotExist()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

String dirName = "file-list-unexisting";

Wagon wagon = getWagon();
Expand Down Expand Up @@ -857,10 +839,10 @@ public void testWagonGetFileListWhenDirectoryDoesNotExist()
public void testWagonResourceExists()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

Wagon wagon = getWagon();

putFile();
Expand All @@ -883,10 +865,10 @@ public void testWagonResourceExists()
public void testWagonResourceNotExists()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

Wagon wagon = getWagon();

wagon.connect( testRepository, getAuthInfo() );
Expand Down
2 changes: 0 additions & 2 deletions wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
View file
Expand Up @@ -123,8 +123,6 @@ protected void setupWagonTestingFixtures()
server.setHandler( handlers );

server.start();

testRepository.setUrl( getTestRepositoryUrl() );
}

protected final int getTestRepositoryPort()
Expand Down
34 changes: 10 additions & 24 deletions ...-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
View file
Expand Up @@ -20,8 +20,6 @@
*/

import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -30,6 +28,7 @@
import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.ftplet.Authority;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
import org.apache.ftpserver.usermanager.impl.BaseUser;
Expand All @@ -49,30 +48,15 @@
public class FtpWagonTest
extends StreamingWagonTestCase
{
static private FtpServer server;
private FtpServer server;

// private static final int testRepositoryPort = 10023 + new Random().nextInt( 16 );

private static int testRepositoryPort;
private int testRepositoryPort;

protected String getProtocol()
{
return "ftp";
}

static
{
// claim number, release it again so it can be reclaimed by ftp server
try (ServerSocket socket = newServerSocket( 10023, 10024, 10025, 10026 ))
{
testRepositoryPort = socket.getLocalPort();
}
catch ( IOException e )
{
e.printStackTrace();
}
}

protected int getTestRepositoryPort() {
return testRepositoryPort;
}
Expand All @@ -86,17 +70,18 @@ protected void setupWagonTestingFixtures()
ftpHomeDir.mkdirs();
}

if (server == null)
if ( server == null )
{
FtpServerFactory serverFactory = new FtpServerFactory();

ListenerFactory factory = new ListenerFactory();

// set the port of the listener
factory.setPort(getTestRepositoryPort());
factory.setPort( 0 );

// replace the default listener
serverFactory.addListener("default", factory.createListener());
Listener defaultListener = factory.createListener();
serverFactory.addListener("default", defaultListener );

PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory();
UserManager um = userManagerFactory.createUserManager();
Expand All @@ -122,6 +107,7 @@ protected void setupWagonTestingFixtures()
// start the server
server.start();

testRepositoryPort = defaultListener.getPort();
}
}

Expand Down Expand Up @@ -207,10 +193,10 @@ public void testDefaultUserName()
public void testPutDirectoryCreation()
throws Exception
{
setupRepositories();

setupWagonTestingFixtures();

setupRepositories();

Wagon wagon = getWagon();

if ( wagon.supportsDirectoryCopy() )
Expand Down

0 comments on commit d300b11

Please sign in to comment.