This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
The following commit(s) were added to refs/heads/stabilize by this push:
new 4c1bfe9 Setup wagon before repositories
4c1bfe9 is described below
commit 4c1bfe96b010b31765e55f86d24607384ee9b867
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Thu Aug 22 09:03:03 2019 +0200
Setup wagon before repositories
---
.../apache/maven/wagon/StreamingWagonTestCase.java | 17 ++++----
.../java/org/apache/maven/wagon/WagonTestCase.java | 48 +++++++++++-----------
.../apache/maven/wagon/http/HttpWagonTestCase.java | 2 -
.../maven/wagon/providers/ftp/FtpWagonTest.java | 2 +-
4 files changed, 34 insertions(+), 35 deletions(-)
diff --git
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
index c2a4782..d06da32 100644
---
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
+++
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
@@ -42,10 +42,10 @@ public abstract class StreamingWagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
streamRoundTripTesting();
tearDownWagonTestingFixtures();
@@ -55,10 +55,10 @@ public abstract class StreamingWagonTestCase
public void testFailedGetToStream()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
message( "Getting test artifact from test repository " +
testRepository );
StreamingWagon wagon = (StreamingWagon) getWagon();
@@ -103,8 +103,9 @@ public abstract class StreamingWagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
+
int expectedSize = putFile();
// CHECKSTYLE_OFF: MagicNumber
getIfNewerToStream( getExpectedLastModifiedOnGet( testRepository,
new Resource( resource ) ) + 30000, false,
@@ -118,8 +119,8 @@ public abstract class StreamingWagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
int expectedSize = putFile();
getIfNewerToStream( new SimpleDateFormat( "yyyy-MM-dd" ).parse(
"2006-01-01" ).getTime(), true,
expectedSize );
@@ -131,8 +132,8 @@ public abstract class StreamingWagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
int expectedSize = putFile();
getIfNewerToStream( getExpectedLastModifiedOnGet( testRepository,
new Resource( resource ) ), false,
expectedSize );
@@ -172,8 +173,8 @@ public abstract class StreamingWagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
message( "Getting test artifact from test repository " +
testRepository );
StreamingWagon wagon = (StreamingWagon) getWagon();
wagon.addTransferListener( checksumObserver );
diff --git
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
index d505a4e..a1b9a45 100644
---
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
+++
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
@@ -252,10 +252,10 @@ public abstract class WagonTestCase
public void testWagon()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
fileRoundTripTesting();
tearDownWagonTestingFixtures();
@@ -266,8 +266,8 @@ public abstract class WagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
int expectedSize = putFile();
// CHECKSTYLE_OFF: MagicNumber
getIfNewer( getExpectedLastModifiedOnGet( testRepository, new
Resource( resource ) ) + 30000, false,
@@ -297,8 +297,8 @@ public abstract class WagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
int expectedSize = putFile();
getIfNewer( getExpectedLastModifiedOnGet( testRepository, new
Resource( resource ) ), false, expectedSize );
}
@@ -309,8 +309,8 @@ public abstract class WagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
int expectedSize = putFile();
getIfNewer( new SimpleDateFormat( "yyyy-MM-dd" ).parse(
"2006-01-01" ).getTime(), true, expectedSize );
}
@@ -413,10 +413,10 @@ public abstract class WagonTestCase
public void testWagonPutDirectory()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
Wagon wagon = getWagon();
if ( wagon.supportsDirectoryCopy() )
@@ -461,10 +461,10 @@ public abstract class WagonTestCase
public void testWagonPutDirectoryDeepDestination()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
Wagon wagon = getWagon();
if ( wagon.supportsDirectoryCopy() )
@@ -515,10 +515,10 @@ public abstract class WagonTestCase
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() )
@@ -567,10 +567,10 @@ public abstract class WagonTestCase
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() )
@@ -670,10 +670,10 @@ public abstract class WagonTestCase
public void testFailedGet()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
message( "Getting test artifact from test repository " +
testRepository );
Wagon wagon = getWagon();
@@ -711,8 +711,8 @@ public abstract class WagonTestCase
{
if ( supportsGetIfNewer() )
{
- setupRepositories();
setupWagonTestingFixtures();
+ setupRepositories();
message( "Getting test artifact from test repository " +
testRepository );
Wagon wagon = getWagon();
wagon.addTransferListener( checksumObserver );
@@ -749,10 +749,10 @@ public abstract class WagonTestCase
public void testWagonGetFileList()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
String dirName = "file-list";
String filenames[] =
@@ -803,10 +803,10 @@ public abstract class WagonTestCase
public void testWagonGetFileListWhenDirectoryDoesNotExist()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
String dirName = "file-list-unexisting";
Wagon wagon = getWagon();
@@ -839,10 +839,10 @@ public abstract class WagonTestCase
public void testWagonResourceExists()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
Wagon wagon = getWagon();
putFile();
@@ -865,10 +865,10 @@ public abstract class WagonTestCase
public void testWagonResourceNotExists()
throws Exception
{
- setupRepositories();
-
setupWagonTestingFixtures();
+ setupRepositories();
+
Wagon wagon = getWagon();
wagon.connect( testRepository, getAuthInfo() );
diff --git
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
index 16a777c..463431a 100644
---
a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
+++
b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
@@ -123,8 +123,6 @@ public abstract class HttpWagonTestCase
server.setHandler( handlers );
server.start();
-
- testRepository.setUrl( getTestRepositoryUrl() );
}
protected final int getTestRepositoryPort()
diff --git
a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
index ce6884a..6f20f99 100644
---
a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
+++
b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
@@ -77,7 +77,7 @@ public class FtpWagonTest
ListenerFactory factory = new ListenerFactory();
// set the port of the listener
- factory.setPort(getTestRepositoryPort());
+ factory.setPort( 0 );
// replace the default listener
Listener defaultListener = factory.createListener();
