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/03 00:23:43 UTC

svn commit: r1308601 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java

Author: olamy
Date: Mon Apr  2 22:23:42 2012
New Revision: 1308601

URL: http://svn.apache.org/viewvc?rev=1308601&view=rev
Log:
fix mock call

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=1308601&r1=1308600&r2=1308601&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Mon Apr  2 22:23:42 2012
@@ -102,7 +102,7 @@ public class EditManagedRepositoryAction
         repositoryTaskSchedulerControl = MockClassControl.createControl( RepositoryArchivaTaskScheduler.class );
         repositoryTaskScheduler = (RepositoryArchivaTaskScheduler) repositoryTaskSchedulerControl.getMock();
 
-        location = new File( "target/test/location" );
+        location = new File( System.getProperty( "basedir", "target/test/location" ) );
 
         metadataRepository = mock( MetadataRepository.class );
         RepositorySession repositorySession = mock( RepositorySession.class );
@@ -308,6 +308,9 @@ public class EditManagedRepositoryAction
 
         roleManagerControl.replay();
 
+        registry.getString( "appserver.base" );
+        registryControl.setReturnValue( "target/test", 1, 3 );
+
         registry.getString( "appserver.base", "${appserver.base}" );
         registryControl.setReturnValue( "target/test", 1, 3 );
         registry.getString( "appserver.home", "${appserver.home}" );
@@ -326,6 +329,7 @@ public class EditManagedRepositoryAction
 
         Configuration configuration = createConfigurationForEditing( createRepository() );
         archivaConfiguration.getConfiguration();
+
         archivaConfigurationControl.setReturnValue( configuration );
         archivaConfigurationControl.setReturnValue( configuration );
         archivaConfigurationControl.setReturnValue( configuration );