Browse Source

fix junit as now non absolute path is replace with appserver.base as parent

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308562 13f79535-47bb-0310-9956-ffa450edef68
tags/archiva-1.4-M3
Olivier Lamy 12 years ago
parent
commit
741723f05a

+ 1
- 0
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml View File

@@ -352,6 +352,7 @@
<test.useTomcat>${test.useTomcat}</test.useTomcat>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<basedir>${basedir}</basedir>
</systemPropertyVariables>
</configuration>
</plugin>

+ 5
- 0
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java View File

@@ -407,4 +407,9 @@ public abstract class AbstractArchivaRestTest
}

}

public String getBasedir()
{
return System.getProperty( "basedir" );
}
}

+ 7
- 6
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java View File

@@ -27,6 +27,7 @@ import org.apache.archiva.rest.api.services.BrowseService;
import org.fest.assertions.MapAssert;
import org.junit.Test;

import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -64,7 +65,7 @@ public class BrowseServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}

createAndIndexRepo( testRepoId, "src/test/repo-with-osgi" );
createAndIndexRepo( testRepoId, new File( getBasedir(), "src/test/repo-with-osgi" ).getAbsolutePath() );

BrowseService browseService = getBrowseService( authorizationHeader, false );

@@ -96,7 +97,7 @@ public class BrowseServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}

createAndIndexRepo( testRepoId, "src/test/repo-with-osgi" );
createAndIndexRepo( testRepoId, new File( getBasedir(), "src/test/repo-with-osgi" ).getAbsolutePath() );

BrowseService browseService = getBrowseService( authorizationHeader, false );

@@ -133,7 +134,7 @@ public class BrowseServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}

createAndIndexRepo( testRepoId, "src/test/repo-with-osgi", false );
createAndIndexRepo( testRepoId, new File( getBasedir(), "src/test/repo-with-osgi" ).getAbsolutePath(), false );

BrowseService browseService = getBrowseService( authorizationHeader, false );

@@ -159,7 +160,7 @@ public class BrowseServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}

createAndIndexRepo( testRepoId, "src/test/repo-with-osgi", false );
createAndIndexRepo( testRepoId, new File( getBasedir(), "src/test/repo-with-osgi" ).getAbsolutePath(), false );

BrowseService browseService = getBrowseService( authorizationHeader, false );

@@ -185,7 +186,7 @@ public class BrowseServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}

createAndIndexRepo( testRepoId, "src/test/repo-with-osgi", false );
createAndIndexRepo( testRepoId, new File( getBasedir(), "src/test/repo-with-osgi" ).getAbsolutePath(), false );

BrowseService browseService = getBrowseService( authorizationHeader, false );

@@ -209,7 +210,7 @@ public class BrowseServiceTest
assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
}

createAndIndexRepo( testRepoId, "src/test/repo-with-osgi", false );
createAndIndexRepo( testRepoId, new File( getBasedir(), "src/test/repo-with-osgi" ).getAbsolutePath(), false );

BrowseService browseService = getBrowseService( authorizationHeader, true );


Loading…
Cancel
Save