fix unit tests for archiva-rest-services module

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

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
index 25b098057172049c9be0185aa2a8c6fc45087244..13d5cfb9a9c43c80d22204820acf4f0fbd1410ba 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
@@ -57,7 +57,7 @@ import java.util.Date;
 /**
  * @author Olivier Lamy
  */
-@RunWith ( ArchivaBlockJUnit4ClassRunner.class )
+@RunWith(ArchivaBlockJUnit4ClassRunner.class)
 public abstract class AbstractArchivaRestTest
     extends AbstractRestServicesTest
 {
@@ -225,9 +225,10 @@ public abstract class AbstractArchivaRestTest
 
     protected RedbackRuntimeConfigurationService getArchivaRuntimeConfigurationService()
     {
-        RedbackRuntimeConfigurationService service = JAXRSClientFactory.create(
-            getBaseUrl() + "/" + getRestServicesPath() + "/archivaServices/",
-            RedbackRuntimeConfigurationService.class, Collections.singletonList( new JacksonJaxbJsonProvider() ) );
+        RedbackRuntimeConfigurationService service =
+            JAXRSClientFactory.create( getBaseUrl() + "/" + getRestServicesPath() + "/archivaServices/",
+                                       RedbackRuntimeConfigurationService.class,
+                                       Collections.singletonList( new JacksonJaxbJsonProvider() ) );
 
         WebClient.client( service ).accept( MediaType.APPLICATION_JSON_TYPE );
         WebClient.client( service ).type( MediaType.APPLICATION_JSON_TYPE );
@@ -431,6 +432,12 @@ public abstract class AbstractArchivaRestTest
             FileUtils.deleteDirectory( badContent );
         }
 
+        File file = new File( repoPath );
+        if ( !file.isAbsolute() )
+        {
+            repoPath = getBasedir() + "/" + repoPath;
+        }
+
         managedRepository.setLocation( new File( repoPath ).getPath() );
         managedRepository.setIndexDirectory(
             System.getProperty( "java.io.tmpdir" ) + "/target/.index-" + Long.toString( new Date().getTime() ) );

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
index 241d6900d1f4c176b557368f4731a531811d1f02..64af13394666874e42382c1acb7936cffe0d9b5f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
@@ -255,7 +255,7 @@ public class SearchServiceTest
             assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
         }
 
-        createAndIndexRepo( testRepoId, "src/test/repo-with-osgi" );
+        createAndIndexRepo( testRepoId, "/src/test/repo-with-osgi" );
 
         SearchService searchService = getSearchService( authorizationHeader );