Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix junit due to ArrayList init mock call number changed 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1229366 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-01-09 21:46:07 +00:00
parent 37b752dd5d
commit 609db54fef
4 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
View File

@ -400,13 +400,8 @@ public class AddProxyConnectorActionTest
throws RegistryException, IndeterminateConfigurationException
{
Configuration config = createInitialConfiguration();
for ( int i = 0; i < requestConfigCount; i++ )
{
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( config );
}
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( config, requestConfigCount, requestConfigCount + 1 );
archivaConfiguration.save( config );
}

21
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java
View File

@ -20,7 +20,6 @@ package org.apache.archiva.web.action.admin.connectors.proxy;
*/
import com.opensymphony.xwork2.Action;
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.admin.repository.proxyconnector.DefaultProxyConnectorAdmin;
import org.apache.archiva.admin.repository.remote.DefaultRemoteRepositoryAdmin;
@ -31,12 +30,12 @@ import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.archiva.web.action.AbstractWebworkTestCase;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.easymock.MockControl;
/**
* ProxyConnectorsActionTest
* ProxyConnectorsActionTest
*
* @version $Id$
*/
@ -61,7 +60,7 @@ public class ProxyConnectorsActionTest
{
super.setUp();
action = (ProxyConnectorsAction) getActionProxy("/admin/proxyConnectors.action" ).getAction();
action = (ProxyConnectorsAction) getActionProxy( "/admin/proxyConnectors.action" ).getAction();
archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();
@ -69,13 +68,14 @@ public class ProxyConnectorsActionTest
archivaConfiguration );
( (DefaultRemoteRepositoryAdmin) action.getRemoteRepositoryAdmin() ).setArchivaConfiguration(
archivaConfiguration );
( (DefaultProxyConnectorAdmin) action.getProxyConnectorAdmin() ).setArchivaConfiguration( archivaConfiguration );
( (DefaultProxyConnectorAdmin) action.getProxyConnectorAdmin() ).setArchivaConfiguration(
archivaConfiguration );
}
public void testSecureActionBundle()
throws Exception
{
expectConfigurationRequests( 4 );
expectConfigurationRequests( 5 );
archivaConfigurationControl.replay();
action.prepare();
@ -95,7 +95,7 @@ public class ProxyConnectorsActionTest
String status = action.execute();
assertEquals( Action.SUCCESS, status );
assertNoErrors( action );
assertNotNull( action.getProxyConnectorMap() );
assertNotNull( action.getRepoMap() );
@ -108,11 +108,8 @@ public class ProxyConnectorsActionTest
{
Configuration config = createInitialConfiguration();
for ( int i = 0; i < requestConfigCount; i++ )
{
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( config );
}
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( config, requestConfigCount + 1 );
archivaConfiguration.save( config );
}

5
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
View File

@ -26,7 +26,6 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.web.action.AbstractActionTestCase;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
import org.easymock.MockControl;
import java.util.Collections;
@ -95,12 +94,12 @@ public class AddRemoteRepositoryActionTest
{
Configuration configuration = new Configuration();
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
archivaConfigurationControl.setReturnValue( configuration, 2 );
archivaConfiguration.save( configuration );
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
archivaConfigurationControl.setReturnValue( configuration, 1 );
archivaConfigurationControl.replay();

7
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
View File

@ -73,10 +73,7 @@ public class DeleteRemoteRepositoryActionTest
Configuration configuration = createConfigurationForEditing( originalRepository );
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
archivaConfigurationControl.setReturnValue( configuration, 3, 4 );
archivaConfigurationControl.replay();
@ -134,7 +131,7 @@ public class DeleteRemoteRepositoryActionTest
Configuration configuration = createConfigurationForEditing( originalRepository );
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration, 2 );
archivaConfigurationControl.setReturnValue( configuration, 4 );
archivaConfiguration.save( configuration );
archivaConfigurationControl.replay();