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/01/16 12:36:17 UTC
svn commit: r1231943 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories:
AddManagedRepositoryActionTest.java EditManagedRepositoryActionTest.java
Author: olamy
Date: Mon Jan 16 11:36:16 2012
New Revision: 1231943
URL: http://svn.apache.org/viewvc?rev=1231943&view=rev
Log:
fix mock call number in webapp unit tests
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
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/AddManagedRepositoryActionTest.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/AddManagedRepositoryActionTest.java?rev=1231943&r1=1231942&r2=1231943&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java Mon Jan 16 11:36:16 2012
@@ -171,14 +171,9 @@ public class AddManagedRepositoryActionT
roleManagerControl.replay();
registry.getString( "appserver.base", "${appserver.base}" );
- registryControl.setReturnValue( "target/test" );
+ registryControl.setReturnValue( "target/test", 1, 3 );
registry.getString( "appserver.home", "${appserver.home}" );
- registryControl.setReturnValue( "target/test" );
-
- registry.getString( "appserver.base", "${appserver.base}" );
- registryControl.setReturnValue( "target/test" );
- registry.getString( "appserver.home", "${appserver.home}" );
- registryControl.setReturnValue( "target/test" );
+ registryControl.setReturnValue( "target/test", 1, 3 );
registryControl.replay();
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=1231943&r1=1231942&r2=1231943&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 Jan 16 11:36:16 2012
@@ -25,18 +25,18 @@ import org.apache.archiva.admin.model.be
import org.apache.archiva.admin.repository.RepositoryCommonValidator;
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.audit.AuditListener;
+import org.apache.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.Configuration;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.security.common.ArchivaRoleConstants;
-import org.apache.archiva.webtest.memory.TestRepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.RepositoryTask;
+import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.web.validator.utils.ValidatorUtil;
+import org.apache.archiva.webtest.memory.TestRepositorySessionFactory;
import org.apache.commons.io.FileUtils;
-import org.apache.archiva.configuration.ArchivaConfiguration;
-import org.apache.archiva.configuration.Configuration;
-import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -205,14 +205,9 @@ public class EditManagedRepositoryAction
roleManagerControl.replay();
registry.getString( "appserver.base", "${appserver.base}" );
- registryControl.setReturnValue( "target/test" );
- registry.getString( "appserver.home", "${appserver.home}" );
- registryControl.setReturnValue( "target/test" );
-
- registry.getString( "appserver.base", "${appserver.base}" );
- registryControl.setReturnValue( "target/test" );
+ registryControl.setReturnValue( "target/test", 1, 3 );
registry.getString( "appserver.home", "${appserver.home}" );
- registryControl.setReturnValue( "target/test" );
+ registryControl.setReturnValue( "target/test", 1, 3 );
registryControl.replay();
@@ -314,14 +309,9 @@ public class EditManagedRepositoryAction
roleManagerControl.replay();
registry.getString( "appserver.base", "${appserver.base}" );
- registryControl.setReturnValue( "target/test" );
- registry.getString( "appserver.home", "${appserver.home}" );
- registryControl.setReturnValue( "target/test" );
-
- registry.getString( "appserver.base", "${appserver.base}" );
- registryControl.setReturnValue( "target/test" );
+ registryControl.setReturnValue( "target/test", 1, 3 );
registry.getString( "appserver.home", "${appserver.home}" );
- registryControl.setReturnValue( "target/test" );
+ registryControl.setReturnValue( "target/test", 1, 3 );
registryControl.replay();