fix unit paths so you can run unit on path with space

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370597 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index 896fc0246bf8d291d115e46151c31d501ed53f21..b010377c5cd74b2ee02536f208a6d94adaad1e51 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -143,7 +143,7 @@ public abstract class AbstractRepositoryPurgeTest
         }
     }
 
-    private static String fixPath( String path ) 
+    protected static String fixPath( String path ) 
     {
         if ( path.contains( " " ) )
         {
@@ -202,15 +202,18 @@ public abstract class AbstractRepositoryPurgeTest
         throws Exception
     {
         removeMavenIndexes();
-        File testDir = getTestRepoRoot();// AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot() );
+        File testDir = new File( AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot().getAbsolutePath() ) ) ;// AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot() );
         FileUtils.deleteDirectory( testDir );
-        FileUtils.copyDirectory( new File( "target/test-classes/" + TEST_REPO_ID ), testDir );
+        File sourceDir = new File ( new File( "target/test-classes/" + TEST_REPO_ID).getAbsolutePath() );
+        FileUtils.copyDirectory( sourceDir, testDir );
 
-        File releasesTestDir = new File( "target/test-" + getName() + "/" + RELEASES_TEST_REPO_ID );
+        File releasesTestDir = new File( AbstractRepositoryPurgeTest.fixPath( new File( "target/test-" + getName() + "/" + RELEASES_TEST_REPO_ID ).getAbsolutePath() ) );
+        
         FileUtils.deleteDirectory( releasesTestDir );
-        FileUtils.copyDirectory( new File( "target/test-classes/" + RELEASES_TEST_REPO_ID ), releasesTestDir );
+        File sourceReleasesDir = new File ( new File( "target/test-classes/" + RELEASES_TEST_REPO_ID).getAbsolutePath() );
+        FileUtils.copyDirectory( sourceReleasesDir, releasesTestDir );
 
-        return testDir.getAbsolutePath();
+        return AbstractRepositoryPurgeTest.fixPath( testDir.getAbsolutePath() );
     }
 
     @Override

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
index 2ccdec47c897d3c3f9ccb6cc78ff645e584145a4..aec5ff608e8996a6a9152afff1845364fe4635ff 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
@@ -212,8 +212,8 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
         assertDeleted( projectRoot + "/1.0-SNAPSHOT/released-artifact-in-diff-repo-1.0-SNAPSHOT.pom.sha1" );
 
         String releasesProjectRoot =
-            new File( "target/test-" + getName() + "/releases-test-repo-one" ).getAbsolutePath()
-                + "/org/apache/archiva/released-artifact-in-diff-repo";
+            AbstractRepositoryPurgeTest.fixPath( new File( "target/test-" + getName() + "/releases-test-repo-one" ).getAbsolutePath()
+                + "/org/apache/archiva/released-artifact-in-diff-repo" );
 
         // check if the released version was not removed
         assertExists( releasesProjectRoot + "/1.0" );