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/09 22:46:26 UTC
svn commit: r1229368 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories:
DeleteRepositoryGroupActionTest.java EditRemoteRepositoryActionTest.java
RepositoryGroupsActionTest.java
Author: olamy
Date: Mon Jan 9 21:46:25 2012
New Revision: 1229368
URL: http://svn.apache.org/viewvc?rev=1229368&view=rev
Log:
more fix junit due to ArrayList init mock call number changed
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.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/DeleteRepositoryGroupActionTest.java?rev=1229368&r1=1229367&r2=1229368&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java Mon Jan 9 21:46:25 2012
@@ -81,7 +81,7 @@ public class DeleteRepositoryGroupAction
Configuration configuration = createConfigurationForEditing( origRepoGroup );
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration );
+ archivaConfigurationControl.setReturnValue( configuration, 2 );
archivaConfigurationControl.replay();
action.setRepoGroupId( REPO_GROUP_ID );
@@ -100,7 +100,7 @@ public class DeleteRepositoryGroupAction
Configuration configuration = createConfigurationForEditing( createRepositoryGroup() );
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 5 );
+ archivaConfigurationControl.setReturnValue( configuration, 7 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();
@@ -125,7 +125,7 @@ public class DeleteRepositoryGroupAction
Configuration configuration = createConfigurationForEditing( origRepoGroup );
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 2 );
+ archivaConfigurationControl.setReturnValue( configuration, 4 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.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/EditRemoteRepositoryActionTest.java?rev=1229368&r1=1229367&r2=1229368&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java Mon Jan 9 21:46:25 2012
@@ -74,9 +74,7 @@ public class EditRemoteRepositoryActionT
{
Configuration configuration = createConfigurationForEditing( createRepository() );
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration );
- archivaConfigurationControl.setReturnValue( configuration );
- archivaConfigurationControl.setReturnValue( configuration );
+ archivaConfigurationControl.setReturnValue( configuration, 4, 6 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();
@@ -106,7 +104,7 @@ public class EditRemoteRepositoryActionT
Configuration configuration = createConfigurationForEditing( createRepository() );
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration );
+ archivaConfigurationControl.setReturnValue( configuration, 2 );
archivaConfigurationControl.replay();
action.setRepoid( REPO_ID );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.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/RepositoryGroupsActionTest.java?rev=1229368&r1=1229367&r2=1229368&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java Mon Jan 9 21:46:25 2012
@@ -76,7 +76,7 @@ public class RepositoryGroupsActionTest
throws SecureActionException, RepositoryAdminException
{
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( new Configuration(), 3 );
+ archivaConfigurationControl.setReturnValue( new Configuration(), 3, 5 );
archivaConfigurationControl.replay();
action.prepare();
@@ -90,7 +90,7 @@ public class RepositoryGroupsActionTest
{
Configuration configuration = new Configuration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 6 );
+ archivaConfigurationControl.setReturnValue( configuration, 6, 8 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();
@@ -113,7 +113,7 @@ public class RepositoryGroupsActionTest
{
Configuration configuration = new Configuration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 5 );
+ archivaConfigurationControl.setReturnValue( configuration, 5, 7 );
archivaConfiguration.save( configuration );
@@ -132,7 +132,7 @@ public class RepositoryGroupsActionTest
{
Configuration configuration = new Configuration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 8 );
+ archivaConfigurationControl.setReturnValue( configuration, 10, 12 );
archivaConfiguration.save( configuration );
@@ -165,7 +165,7 @@ public class RepositoryGroupsActionTest
Configuration configuration = createInitialConfiguration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 6 );
+ archivaConfigurationControl.setReturnValue( configuration, 6, 8 );
archivaConfigurationControl.replay();
action.setServletRequest( sc.newInvocation( "http://localhost/admin/repositoryGroups.action" ).getRequest() );
@@ -197,7 +197,7 @@ public class RepositoryGroupsActionTest
Configuration configuration = createInitialConfiguration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 17 );
+ archivaConfigurationControl.setReturnValue( configuration, 20, 24 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();
@@ -246,7 +246,7 @@ public class RepositoryGroupsActionTest
Configuration configuration = createInitialConfiguration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 13 );
+ archivaConfigurationControl.setReturnValue( configuration, 19, 22 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();
@@ -297,7 +297,7 @@ public class RepositoryGroupsActionTest
Configuration configuration = createInitialConfiguration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 6 );
+ archivaConfigurationControl.setReturnValue( configuration, 6, 10 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();
@@ -333,7 +333,7 @@ public class RepositoryGroupsActionTest
Configuration configuration = createInitialConfiguration();
archivaConfiguration.getConfiguration();
- archivaConfigurationControl.setReturnValue( configuration, 6 );
+ archivaConfigurationControl.setReturnValue( configuration, 6, 10 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();