You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/02/03 15:51:48 UTC
[maven-wagon] 01/01: [WAGON-555] Use java.nio.file.Path for URI
contruction of file:// URI in tests
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch WAGON-555
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit f4312851e624a3367a741f34376e72a0ecf84d53
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Feb 3 16:51:33 2019 +0100
[WAGON-555] Use java.nio.file.Path for URI contruction of file:// URI in tests
---
.../src/main/java/org/apache/maven/wagon/WagonTestCase.java | 5 +++--
.../org/apache/maven/wagon/providers/file/FileWagonTest.java | 4 ++--
.../maven/wagon/providers/scm/AbstractScmGitWagonTest.java | 2 +-
.../maven/wagon/providers/scm/AbstractScmSvnWagonTest.java | 12 +-----------
4 files changed, 7 insertions(+), 16 deletions(-)
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 6193db3..9d26555 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
@@ -170,9 +170,10 @@ public abstract class WagonTestCase
// Create a test local repository.
// ----------------------------------------------------------------------
- localRepositoryPath = FileTestUtils.createDir( "local-repository" ).getPath();
+ File file = FileTestUtils.createDir( "local-repository" );
+ localRepositoryPath = file.getPath();
- localRepository = createFileRepository( "file://" + localRepositoryPath );
+ localRepository = createFileRepository( file.toPath().toUri().toASCIIString() );
message( "Local repository: " + localRepository );
diff --git a/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java b/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
index 41da7d4..a26ef98 100644
--- a/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
+++ b/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
@@ -47,7 +47,7 @@ public class FileWagonTest
{
File file = FileTestUtils.createUniqueDir( getName() + ".file-repository." );
- return "file://" + file.getPath();
+ return file.toPath().toUri().toASCIIString();
}
@Override
@@ -81,7 +81,7 @@ public class FileWagonTest
public void testResourceExists()
throws Exception
{
- String url = "file://" + getBasedir();
+ String url = new File( getBasedir() ).toPath().toUri().toASCIIString();
Wagon wagon = new FileWagon();
Repository repository = new Repository( "someID", url );
diff --git a/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmGitWagonTest.java b/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmGitWagonTest.java
index 707273c..93f0dfd 100644
--- a/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmGitWagonTest.java
+++ b/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmGitWagonTest.java
@@ -46,7 +46,7 @@ public abstract class AbstractScmGitWagonTest
FileUtils.copyDirectoryStructure( origRepo, testRepo );
- repository = "scm:git:" + testRepo.toPath().toUri();
+ repository = "scm:git:" + testRepo.getAbsoluteFile().toPath().toUri().toASCIIString();
}
protected String getScmId()
diff --git a/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmSvnWagonTest.java b/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmSvnWagonTest.java
index 2b4c7bd..b17f09d 100644
--- a/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmSvnWagonTest.java
+++ b/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmSvnWagonTest.java
@@ -49,17 +49,7 @@ public abstract class AbstractScmSvnWagonTest
FileUtils.copyDirectoryStructure( origRepo, testRepo );
- repository = testRepo.getAbsolutePath();
-
- // TODO: this is a hack for windows
- // Note: why not use File.toURL() ?
- if ( repository.contains( ":" ) )
- {
- repository = "/" + repository;
- }
- repository = repository.replace( '\\', '/' );
-
- repository = "scm:svn:file://" + repository;
+ repository = "scm:svn:" + testRepo.getAbsoluteFile().toPath().toUri().toASCIIString();
}
protected String getScmId()