Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-28 21:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid writing test files in source tree

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1354264 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-06-26 22:11:31 +00:00
parent 4890829538
commit d7c9b6fc24
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -906,6 +906,7 @@
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name> <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<basedir>${basedir}</basedir> <basedir>${basedir}</basedir>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir> <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>

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

@ -25,14 +25,14 @@
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.RepositoryTask; import org.apache.archiva.scheduler.repository.RepositoryTask;
import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.web.validator.utils.ValidatorUtil; import org.apache.archiva.web.validator.utils.ValidatorUtil;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.easymock.MockControl; import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl; import org.easymock.classextension.MockClassControl;
@ -91,7 +91,7 @@ protected void setUp()
repositoryTaskSchedulerControl = MockClassControl.createControl( RepositoryArchivaTaskScheduler.class ); repositoryTaskSchedulerControl = MockClassControl.createControl( RepositoryArchivaTaskScheduler.class );
repositoryTaskScheduler = (RepositoryArchivaTaskScheduler) repositoryTaskSchedulerControl.getMock(); repositoryTaskScheduler = (RepositoryArchivaTaskScheduler) repositoryTaskSchedulerControl.getMock();
location = new File( "target/test/location" ); location = new File( System.getProperty( "basedir" ), "target/test/location" );
( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setArchivaConfiguration( archivaConfiguration ); ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setArchivaConfiguration( archivaConfiguration );
( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setRoleManager( roleManager ); ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setRoleManager( roleManager );
( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setRegistry( registry ); ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setRegistry( registry );

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

@ -27,11 +27,6 @@
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin; import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.audit.AuditEvent; import org.apache.archiva.audit.AuditEvent;
import org.apache.archiva.audit.AuditListener; import org.apache.archiva.audit.AuditListener;
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.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.IndeterminateConfigurationException; import org.apache.archiva.configuration.IndeterminateConfigurationException;
@ -39,13 +34,18 @@
import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.archiva.configuration.RepositoryGroupConfiguration; import org.apache.archiva.configuration.RepositoryGroupConfiguration;
import org.apache.archiva.web.action.AbstractActionTestCase; import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.web.action.AuditEventArgumentsMatcher; import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
import org.apache.archiva.redback.role.RoleManagerException;
import org.apache.archiva.redback.components.registry.RegistryException; import org.apache.archiva.redback.components.registry.RegistryException;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.role.RoleManagerException;
import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.web.action.AbstractActionTestCase;
import org.apache.archiva.web.action.AuditEventArgumentsMatcher;
import org.apache.archiva.webtest.memory.TestRepositorySessionFactory;
import org.easymock.MockControl; import org.easymock.MockControl;
import java.io.File; import java.io.File;
@ -103,7 +103,7 @@ protected void setUp()
roleManagerControl = MockControl.createControl( RoleManager.class ); roleManagerControl = MockControl.createControl( RoleManager.class );
roleManager = (RoleManager) roleManagerControl.getMock(); roleManager = (RoleManager) roleManagerControl.getMock();
//action.setRoleManager( roleManager ); //action.setRoleManager( roleManager );
location = new File( "target/test/location" ); location = new File( System.getProperty( "basedir" ), "target/test/location" );
repositoryStatisticsManagerControl = MockControl.createControl( RepositoryStatisticsManager.class ); repositoryStatisticsManagerControl = MockControl.createControl( RepositoryStatisticsManager.class );
repositoryStatisticsManager = (RepositoryStatisticsManager) repositoryStatisticsManagerControl.getMock(); repositoryStatisticsManager = (RepositoryStatisticsManager) repositoryStatisticsManagerControl.getMock();
@ -185,11 +185,9 @@ public void testDeleteRepositoryConfirmation()
stageRepoConfiguration.addManagedRepository( createStagingRepository() ); stageRepoConfiguration.addManagedRepository( createStagingRepository() );
archivaConfigurationControl.setReturnValue( stageRepoConfiguration ); archivaConfigurationControl.setReturnValue( stageRepoConfiguration );
archivaConfiguration.getConfiguration(); archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration ); archivaConfigurationControl.setReturnValue( configuration );
archivaConfigurationControl.replay(); archivaConfigurationControl.replay();
action.setRepoid( REPO_ID ); action.setRepoid( REPO_ID );

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

@ -31,15 +31,15 @@
import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager; import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.RepositoryTask; import org.apache.archiva.scheduler.repository.RepositoryTask;
import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.archiva.web.validator.utils.ValidatorUtil; import org.apache.archiva.web.validator.utils.ValidatorUtil;
import org.apache.archiva.webtest.memory.TestRepositorySessionFactory; import org.apache.archiva.webtest.memory.TestRepositorySessionFactory;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.easymock.MockControl; import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl; import org.easymock.classextension.MockClassControl;
@ -260,11 +260,14 @@ public void testEditRepository()
(RepositoryStatisticsManager) repositoryStatisticsManagerControl.getMock(); (RepositoryStatisticsManager) repositoryStatisticsManagerControl.getMock();
( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setRepositoryStatisticsManager( ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() ).setRepositoryStatisticsManager(
repositoryStatisticsManager ); repositoryStatisticsManager );
// no deletion repositoryStatisticsManager.deleteStatistics( metadataRepository , REPO_ID );
repositoryStatisticsManagerControl.setVoidCallable();
repositoryStatisticsManagerControl.replay(); repositoryStatisticsManagerControl.replay();
new File( "target/test/" + REPO_ID + "-stage" ).mkdirs(); new File( "target/test/" + REPO_ID + "-stage" ).mkdirs();
repository.setLocation( System.getProperty( "basedir" ) + "/target/test/" + REPO_ID );
action.setRepository( repository ); action.setRepository( repository );
action.setStageNeeded( true ); action.setStageNeeded( true );
String status = action.commit(); String status = action.commit();
@ -588,6 +591,8 @@ private ManagedRepository createRepository()
throws IOException throws IOException
{ {
ManagedRepository r = new ManagedRepository(); ManagedRepository r = new ManagedRepository();
r.setLocation( System.getProperty( "basedir" ) + "/target/repo-" + REPO_ID );
r.setIndexDirectory( System.getProperty( "basedir" ) + "/target/repo-" + REPO_ID + "-index" );
r.setId( REPO_ID ); r.setId( REPO_ID );
populateRepository( r ); populateRepository( r );
return r; return r;
@ -598,6 +603,7 @@ private ManagedRepositoryConfiguration createStagingRepository()
{ {
ManagedRepositoryConfiguration r = new ManagedRepositoryConfiguration(); ManagedRepositoryConfiguration r = new ManagedRepositoryConfiguration();
r.setId( REPO_ID + "-stage" ); r.setId( REPO_ID + "-stage" );
r.setLocation( System.getProperty( "basedir" ) + "/target/" + REPO_ID + "-stage" );
populateStagingRepository( r ); populateStagingRepository( r );
return r; return r;
} }