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 2013/02/07 11:57:53 UTC
svn commit: r1443401 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services:
AbstractArchivaRestTest.java SearchServiceTest.java
Author: olamy
Date: Thu Feb 7 10:57:52 2013
New Revision: 1443401
URL: http://svn.apache.org/viewvc?rev=1443401&view=rev
Log:
fix unit tests for archiva-rest-services module
Modified:
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/SearchServiceTest.java
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=1443401&r1=1443400&r2=1443401&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 Thu Feb 7 10:57:52 2013
@@ -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 AbstractArchivaRes
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 AbstractArchivaRes
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() ) );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.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/SearchServiceTest.java?rev=1443401&r1=1443400&r2=1443401&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java Thu Feb 7 10:57:52 2013
@@ -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 );