Author: olamy
Date: Tue Jun 26 22:11:31 2012
New Revision: 1354264
URL: http://svn.apache.org/viewvc?rev=1354264&view=rev
Log:
avoid writing test files in source tree
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
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/DeleteManagedRepositoryActionTest.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/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1354264&r1=1354263&r2=1354264&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Tue Jun 26
22:11:31 2012
@@ -906,6 +906,7 @@
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<basedir>${basedir}</basedir>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+ <buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables>
</configuration>
</plugin>
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=1354264&r1=1354263&r2=1354264&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
Tue Jun 26 22:11:31 2012
@@ -25,14 +25,14 @@ import org.apache.archiva.admin.reposito
import
org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
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.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.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.classextension.MockClassControl;
@@ -91,7 +91,7 @@ public class AddManagedRepositoryActionT
repositoryTaskSchedulerControl = MockClassControl.createControl(
RepositoryArchivaTaskScheduler.class );
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()
).setRoleManager( roleManager );
( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin()
).setRegistry( registry );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.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/DeleteManagedRepositoryActionTest.java?rev=1354264&r1=1354263&r2=1354264&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
Tue Jun 26 22:11:31 2012
@@ -27,11 +27,6 @@ import org.apache.archiva.admin.model.ma
import
org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.audit.AuditEvent;
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.Configuration;
import org.apache.archiva.configuration.IndeterminateConfigurationException;
@@ -39,13 +34,18 @@ import org.apache.archiva.configuration.
import org.apache.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.archiva.configuration.RepositoryGroupConfiguration;
-import org.apache.archiva.web.action.AbstractActionTestCase;
-import org.apache.archiva.web.action.AuditEventArgumentsMatcher;
-import org.apache.archiva.redback.role.RoleManager;
-import org.apache.archiva.redback.role.RoleManagerException;
+import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import
org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
import org.apache.archiva.redback.components.registry.RegistryException;
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.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 java.io.File;
@@ -103,7 +103,7 @@ public class DeleteManagedRepositoryActi
roleManagerControl = MockControl.createControl( RoleManager.class );
roleManager = (RoleManager) roleManagerControl.getMock();
//action.setRoleManager( roleManager );
- location = new File( "target/test/location" );
+ location = new File( System.getProperty( "basedir" ),
"target/test/location" );
repositoryStatisticsManagerControl = MockControl.createControl(
RepositoryStatisticsManager.class );
repositoryStatisticsManager = (RepositoryStatisticsManager)
repositoryStatisticsManagerControl.getMock();
@@ -185,11 +185,9 @@ public class DeleteManagedRepositoryActi
stageRepoConfiguration.addManagedRepository( createStagingRepository()
);
archivaConfigurationControl.setReturnValue( stageRepoConfiguration );
-
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
-
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/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=1354264&r1=1354263&r2=1354264&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
Tue Jun 26 22:11:31 2012
@@ -31,15 +31,15 @@ import org.apache.archiva.configuration.
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.RepositorySession;
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.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.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.classextension.MockClassControl;
@@ -260,11 +260,14 @@ public class EditManagedRepositoryAction
(RepositoryStatisticsManager)
repositoryStatisticsManagerControl.getMock();
( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin()
).setRepositoryStatisticsManager(
repositoryStatisticsManager );
- // no deletion
+ repositoryStatisticsManager.deleteStatistics( metadataRepository ,
REPO_ID );
+ repositoryStatisticsManagerControl.setVoidCallable();
repositoryStatisticsManagerControl.replay();
new File( "target/test/" + REPO_ID + "-stage" ).mkdirs();
+ repository.setLocation( System.getProperty( "basedir" ) +
"/target/test/" + REPO_ID );
+
action.setRepository( repository );
action.setStageNeeded( true );
String status = action.commit();
@@ -588,6 +591,8 @@ public class EditManagedRepositoryAction
throws IOException
{
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 );
populateRepository( r );
return r;
@@ -598,6 +603,7 @@ public class EditManagedRepositoryAction
{
ManagedRepositoryConfiguration r = new
ManagedRepositoryConfiguration();
r.setId( REPO_ID + "-stage" );
+ r.setLocation( System.getProperty( "basedir" ) + "/target/" + REPO_ID
+ "-stage" );
populateStagingRepository( r );
return r;
}
