svn commit: r1135589 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action: admin/connectors/proxy/SortProxyConnectorsActionTest.java reports/GenerateReportActionTest.java

[olamy]

Author: olamy
Date: Tue Jun 14 14:15:52 2011
New Revision: 1135589

URL: http://svn.apache.org/viewvc?rev=1135589&view=rev
Log:
fix SortProxyConnectorsActionTest

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.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/connectors/proxy/SortProxyConnectorsActionTest.java?rev=1135589&r1=1135588&r2=1135589&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
 Tue Jun 14 14:15:52 2011
@@ -243,7 +243,7 @@ public class SortProxyConnectorsActionTe
         super.setUp();
 
         //action = (SortProxyConnectorsAction) lookup( Action.class.getName(), 
"sortProxyConnectorsAction" );
-        action = (SortProxyConnectorsAction) getActionProxy( 
"/admin/sortProxyConnectors.action" ).getAction();
+        action = (SortProxyConnectorsAction) getActionProxy( 
"/admin/sortUpProxyConnector.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( 
ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) 
archivaConfigurationControl.getMock();

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java?rev=1135589&r1=1135588&r2=1135589&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
 Tue Jun 14 14:15:52 2011
@@ -32,6 +32,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.maven.archiva.security.UserRepositoriesStub;
 import org.apache.maven.archiva.web.action.AbstractActionTestCase;
 import org.easymock.MockControl;
+import org.junit.After;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -98,6 +99,16 @@ public class GenerateReportActionTest
         factory.setRepositorySession( repositorySession );
     }
 
+    @After
+    public void tearDown()
+        throws Exception
+    {
+        UserRepositoriesStub stub = applicationContext.getBean( 
"userRepositories", UserRepositoriesStub.class );
+        stub.setRepoIds( Lists.<String>newArrayList( "test-repo" ) );
+        super.tearDown();
+
+    }
+
     private void prepareAction( List<String> selectedRepositories, 
List<String> availableRepositories )
     {
         action.setSelectedRepositories( selectedRepositories );