You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/02 23:02:29 UTC
svn commit: r1308562 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services:
./ src/test/java/org/apache/archiva/rest/services/
Author: olamy
Date: Mon Apr 2 21:02:29 2012
New Revision: 1308562
URL: http://svn.apache.org/viewvc?rev=1308562&view=rev
Log:
fix junit as now non absolute path is replace with appserver.base as parent
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1308562&r1=1308561&r2=1308562&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Mon Apr 2 21:02:29 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java?rev=1308562&r1=1308561&r2=1308562&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java Mon Apr 2 21:02:29 2012
@@ -407,4 +407,9 @@ public abstract class AbstractArchivaRes
}
}
+
+ public String getBasedir()
+ {
+ return System.getProperty( "basedir" );
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java?rev=1308562&r1=1308561&r2=1308562&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java Mon Apr 2 21:02:29 2012
@@ -27,6 +27,7 @@ import org.apache.archiva.rest.api.servi
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 );