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

[olamy]

Author: olamy
Date: Tue Sep 13 12:55:40 2011
New Revision: 1170158

URL: http://svn.apache.org/viewvc?rev=1170158&view=rev
Log:
fix unit test due to refactoring

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

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/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/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=1170158&r1=1170157&r2=1170158&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
 Tue Sep 13 12:55:40 2011
@@ -186,6 +186,11 @@ public class DeleteManagedRepositoryActi
         stageRepoConfiguration.addManagedRepository( createStagingRepository() 
);
         archivaConfigurationControl.setReturnValue( stageRepoConfiguration );
 
+
+        archivaConfiguration.getConfiguration();
+        archivaConfigurationControl.setReturnValue( configuration );
+
+
         archivaConfigurationControl.replay();
 
         action.setRepoid( REPO_ID );
@@ -201,7 +206,8 @@ public class DeleteManagedRepositoryActi
 
         repository = action.getRepository();
         assertRepositoryEquals( repository, createRepository() );
-        assertEquals( Collections.singletonList( originalRepository ), 
configuration.getManagedRepositories() );
+        assertEquals( Collections.singletonList( originalRepository ),
+                      
action.getManagedRepositoryAdmin().getManagedRepositories() );
     }
 
     public void testDeleteRepositoryKeepContent()
@@ -316,7 +322,8 @@ public class DeleteManagedRepositoryActi
 
         ManagedRepository repository = action.getRepository();
         assertRepositoryEquals( repository, createRepository() );
-        assertEquals( Collections.singletonList( originalRepository ), 
configuration.getManagedRepositories() );
+        assertEquals( Collections.singletonList( originalRepository ),
+                      
action.getManagedRepositoryAdmin().getManagedRepositories() );
 
         assertTrue( location.exists() );
 
@@ -327,6 +334,10 @@ public class DeleteManagedRepositoryActi
     private Configuration prepDeletionTest( ManagedRepository 
originalRepository, int expectCountGetConfig )
         throws RegistryException, IndeterminateConfigurationException, 
RepositoryAdminException
     {
+
+        //Configuration originalConfiguration =
+        //    ( (DefaultManagedRepositoryAdmin) getManagedRepositoryAdmin() 
).getArchivaConfiguration().getConfiguration();
+
         location.mkdirs();
 
         Configuration configuration = createConfigurationForEditing( 
originalRepository );
@@ -376,8 +387,10 @@ public class DeleteManagedRepositoryActi
     private Configuration createConfigurationForEditing( ManagedRepository 
repositoryConfiguration )
     {
         Configuration configuration = new Configuration();
-        configuration.addManagedRepository(
-            new BeanReplicator().replicateBean( repositoryConfiguration, 
ManagedRepositoryConfiguration.class ) );
+        ManagedRepositoryConfiguration managedRepositoryConfiguration =
+            new BeanReplicator().replicateBean( repositoryConfiguration, 
ManagedRepositoryConfiguration.class );
+        managedRepositoryConfiguration.setRefreshCronExpression( 
repositoryConfiguration.getCronExpression() );
+        configuration.addManagedRepository( managedRepositoryConfiguration );
         return configuration;
     }