svn commit: r1170160 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src: main/java/org/apache/maven/archiva/web/action/admin/repositories/ test/java/org/apache/maven/archiva/web/action/admin/repositories/

[olamy]

Author: olamy
Date: Tue Sep 13 12:56:02 2011
New Revision: 1170160

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

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

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java?rev=1170160&r1=1170159&r2=1170160&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java
 Tue Sep 13 12:56:02 2011
@@ -108,4 +108,14 @@ public class DeleteRepositoryGroupAction
     {
         this.repoGroupId = repoGroupId;
     }
+
+    public RepositoryGroupAdmin getRepositoryGroupAdmin()
+    {
+        return repositoryGroupAdmin;
+    }
+
+    public void setRepositoryGroupAdmin( RepositoryGroupAdmin 
repositoryGroupAdmin )
+    {
+        this.repositoryGroupAdmin = repositoryGroupAdmin;
+    }
 }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.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/DeleteRepositoryGroupActionTest.java?rev=1170160&r1=1170159&r2=1170160&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
 Tue Sep 13 12:56:02 2011
@@ -22,6 +22,7 @@ package org.apache.maven.archiva.web.act
 import com.opensymphony.xwork2.Action;
 import org.apache.archiva.admin.model.RepositoryAdminException;
 import org.apache.archiva.admin.model.group.RepositoryGroup;
+import org.apache.archiva.admin.repository.group.DefaultRepositoryGroupAdmin;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
@@ -51,12 +52,14 @@ public class DeleteRepositoryGroupAction
     {
         super.setUp();
 
-        //action = (DeleteRepositoryGroupAction) lookup ( 
Action.class.getName(), "deleteRepositoryGroupAction" );
         action = (DeleteRepositoryGroupAction) getActionProxy( 
"/admin/deleteRepositoryGroup.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( 
ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) 
archivaConfigurationControl.getMock();
         action.setArchivaConfiguration( archivaConfiguration );
+
+        ( (DefaultRepositoryGroupAdmin) action.getRepositoryGroupAdmin() 
).setArchivaConfiguration(
+            archivaConfiguration );
     }
 
     public void testSecureActionBundle()
@@ -98,7 +101,7 @@ public class DeleteRepositoryGroupAction
         Configuration configuration = createConfigurationForEditing( 
createRepositoryGroup() );
 
         archivaConfiguration.getConfiguration();
-        archivaConfigurationControl.setReturnValue( configuration, 3 );
+        archivaConfigurationControl.setReturnValue( configuration, 5 );
         archivaConfiguration.save( configuration );
         archivaConfigurationControl.replay();
 
@@ -108,7 +111,8 @@ public class DeleteRepositoryGroupAction
         assertEquals( REPO_GROUP_ID, action.getRepoGroupId() );
         RepositoryGroup repoGroup = action.getRepositoryGroup();
         assertNotNull( repoGroup );
-        assertEquals( Collections.singletonList( repoGroup ), 
configuration.getRepositoryGroups() );
+        assertEquals( Collections.singletonList( repoGroup ),
+                      action.getRepositoryGroupAdmin().getRepositoriesGroups() 
);
 
         String status = action.delete();
         assertEquals( Action.SUCCESS, status );
@@ -136,7 +140,8 @@ public class DeleteRepositoryGroupAction
 
         String status = action.execute();
         assertEquals( Action.SUCCESS, status );
-        assertEquals( Collections.singletonList( repoGroup ), 
configuration.getRepositoryGroups() );
+        assertEquals( Collections.singletonList( repoGroup ),
+                      action.getRepositoryGroupAdmin().getRepositoriesGroups() 
);
     }
 
     private Configuration createConfigurationForEditing( 
RepositoryGroupConfiguration repoGroup )