svn commit: r1370597 - in /archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository: AbstractRepositoryPurgeTest.java CleanupReleasedSnapshotsRepositoryPurgeTest.java

[skygo]

Author: skygo
Date: Wed Aug  8 00:00:07 2012
New Revision: 1370597

URL: http://svn.apache.org/viewvc?rev=1370597&view=rev
Log:
fix unit paths so you can run unit on path with space

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java?rev=1370597&r1=1370596&r2=1370597&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
 Wed Aug  8 00:00:07 2012
@@ -143,7 +143,7 @@ public abstract class AbstractRepository
         }
     }
 
-    private static String fixPath( String path ) 
+    protected static String fixPath( String path ) 
     {
         if ( path.contains( " " ) )
         {
@@ -202,15 +202,18 @@ public abstract class AbstractRepository
         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

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java?rev=1370597&r1=1370596&r2=1370597&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
 Wed Aug  8 00:00:07 2012
@@ -212,8 +212,8 @@ public class CleanupReleasedSnapshotsRep
         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" );