svn commit: r1163922 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java

[olamy]

Author: olamy
Date: Thu Sep  1 07:04:39 2011
New Revision: 1163922

URL: http://svn.apache.org/viewvc?rev=1163922&view=rev
Log:
 fix unit test when executing all : an other unit tests set a mock in the 
singleton component

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/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/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=1163922&r1=1163921&r2=1163922&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
 Thu Sep  1 07:04:39 2011
@@ -21,6 +21,7 @@ package org.apache.maven.archiva.web.act
 
 import com.opensymphony.xwork2.Action;
 import 
org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
+import org.apache.archiva.audit.AuditListener;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.RepositorySession;
 import 
org.apache.archiva.metadata.repository.memory.TestRepositorySessionFactory;
@@ -43,7 +44,6 @@ import org.easymock.classextension.MockC
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -117,7 +117,12 @@ public class EditManagedRepositoryAction
         ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() 
).setRepositoryTaskScheduler(
             repositoryTaskScheduler );
         ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() 
).setRepositorySessionFactory( factory );
+
+        ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() 
).setAuditListeners(
+            new ArrayList<AuditListener>( 0 ) );
+
         action.setManagedRepositoryAdmin( getManagedRepositoryAdmin() );
+
     }
 
     public void testSecureActionBundle()
@@ -178,17 +183,15 @@ public class EditManagedRepositoryAction
         roleManager.createTemplatedRole( 
ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID );
         roleManagerControl.setVoidCallable();
 
-
         roleManager.templatedRoleExists( 
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, stageRepoId );
         roleManagerControl.setReturnValue( false );
         roleManager.createTemplatedRole( 
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, stageRepoId );
-        roleManagerControl.setVoidCallable( );
+        roleManagerControl.setVoidCallable();
 
         roleManager.templatedRoleExists( 
ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, stageRepoId );
         roleManagerControl.setReturnValue( false );
         roleManager.createTemplatedRole( 
ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, stageRepoId );
-        roleManagerControl.setVoidCallable( );
-
+        roleManagerControl.setVoidCallable();
 
         roleManagerControl.replay();