Author: skygo
Date: Tue Aug 7 22:06:47 2012
New Revision: 1370562
URL: http://svn.apache.org/viewvc?rev=1370562&view=rev
Log:
attempt to stabilie core consummer tests
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.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=1370562&r1=1370561&r2=1370562&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
Tue Aug 7 22:06:47 2012
@@ -43,6 +43,7 @@ import org.apache.archiva.test.utils.Arc
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.slf4j.LoggerFactory;
/**
*/
@@ -142,13 +143,26 @@ public abstract class AbstractRepository
}
}
+ private static String fixPath( String path )
+ {
+ if ( path.contains( " " ) )
+ {
+
LoggerFactory.getLogger(AbstractRepositoryPurgeTest.class.getName()).error(
+ "You are building and testing with a path: \n "
+ + path + " containing space. Consider relocating.");
+ return path.replaceAll(" ", "%20");
+ }
+ return path;
+ }
+
public ManagedRepository getRepoConfiguration( String repoId, String
repoName )
{
config = new ManagedRepository();
config.setId( repoId );
config.setName( repoName );
config.setDaysOlder( TEST_DAYS_OLDER );
- config.setLocation( new File( "target/test-" + getName() + "/" +
repoId ).getAbsolutePath() );
+ String path = AbstractRepositoryPurgeTest.fixPath( new File(
"target/test-" + getName() + "/" + repoId ).getAbsolutePath() );
+ config.setLocation( path );
config.setReleases( true );
config.setSnapshots( true );
config.setDeleteReleasedSnapshots( true );
@@ -188,7 +202,7 @@ public abstract class AbstractRepository
throws Exception
{
removeMavenIndexes();
- File testDir = getTestRepoRoot();
+ File testDir = getTestRepoRoot();//
AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot() );
FileUtils.deleteDirectory( testDir );
FileUtils.copyDirectory( new File( "target/test-classes/" +
TEST_REPO_ID ), testDir );