fix more test in webapp module

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135307 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
index 4e0da510ece80c83ab053414d99b90aedba17433..9bead4d79473dd1c7969e802a6750929e14408b4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
@@ -47,7 +47,7 @@ public class BrowseActionTest
 
     public void testInstantiation()
     {
-        assertFalse( action == (BrowseAction) getActionProxy( "browse" ).getAction() );
+        assertFalse( action == (BrowseAction) getActionProxy( "browse.action" ).getAction() );
     }
 
     public void testBrowse()
@@ -391,7 +391,7 @@ public class BrowseActionTest
     {
         super.setUp();
         //action = (BrowseAction) lookup( Action.class, ACTION_HINT );
-        action = (BrowseAction) getActionProxy( "browse" ).getAction();
+        action = (BrowseAction) getActionProxy( "browse.action" ).getAction();
         metadataResolver = new TestMetadataResolver();
         RepositorySession repositorySession = mock( RepositorySession.class );
         when( repositorySession.getResolver() ).thenReturn( metadataResolver );

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java
index e64593c491fd2e69aa3e0d47636d16ca1e5b5a18..7627b2aedc36f5987bbc4662733c14f94a3636a3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.java
@@ -82,7 +82,7 @@ public class DeleteArtifactActionTest
         super.setUp();
 
         //action = (DeleteArtifactAction) lookup( Action.class.getName(), "deleteArtifactAction" );
-        action = (DeleteArtifactAction) getActionProxy( "/deleteArtifact" ).getAction();
+        action = (DeleteArtifactAction) getActionProxy( "/deleteArtifact.action" ).getAction();
         assertNotNull( action );
 
         configurationControl = MockControl.createControl( ArchivaConfiguration.class );

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
index 480b318ee22e1640e259eb9e8cf76c93461190c6..b37e21261f8bf44655d5707ba484932ba9f308d1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
@@ -73,7 +73,7 @@ public class ShowArtifactActionTest
 
     public void testInstantiation()
     {
-        assertFalse( action == getActionProxy( "/showArtifact" ).getAction() );
+        assertFalse( action == getActionProxy( "/showArtifact.action" ).getAction() );
     }
 
     public void testGetArtifactUniqueRelease()
@@ -631,7 +631,7 @@ public class ShowArtifactActionTest
         throws Exception
     {
         super.setUp();
-        action = (ShowArtifactAction) getActionProxy( "/showArtifact" ).getAction();
+        action = (ShowArtifactAction) getActionProxy( "/showArtifact.action" ).getAction();
 
         metadataResolver = new TestMetadataResolver();
         MetadataRepository repo = mock( MetadataRepository.class );

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
index 41223bda701bbe992035d40b1d3a4003a5a132f2..a772cb9b027226c113b3225fe4241d09ee23f59c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
@@ -209,6 +209,6 @@ public class EditOrganizationInfoActionTest
     protected AbstractAppearanceAction getAction()
     {
         //return (EditOrganisationInfoAction) lookup( Action.class.getName(), "editOrganisationInfo" );
-        return (EditOrganisationInfoAction) getActionProxy( "/admin/editOrganisationInfo" ).getAction();
+        return (EditOrganisationInfoAction) getActionProxy( "/admin/editOrganisationInfo.action" ).getAction();
     }
 }

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
index 2682bc21ebe8825e1ec31bd199d610d8e621b99a..bf1ae83c435553f7e6403c373f34d6fc99ffee64 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
@@ -51,6 +51,6 @@ public class OrganizationInfoActionTest
     {
         //return (OrganisationInfoAction) lookup( Action.class.getName(), "organisationInfo" );
 
-        return (OrganisationInfoAction) getActionProxy( "/admin/organisationInfo" ).getAction();
+        return (OrganisationInfoAction) getActionProxy( "/admin/organisationInfo.action" ).getAction();
     }
 }

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
index 879e4a4d2e540e18989fb1b23f31d72cb35251a8..b1e1f3d0cfc80cc1320ea32eec1216ccb303d98e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java
@@ -60,7 +60,7 @@ public class AddProxyConnectorActionTest
     {
         super.setUp();
 
-        action = (AddProxyConnectorAction) getActionProxy( "addProxyConnector" ).getAction();
+        action = (AddProxyConnectorAction) getActionProxy( "/admin/addProxyConnector.action" ).getAction();
         //action = (AddProxyConnectorAction) lookup( Action.class.getName(), "addProxyConnectorAction" );
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
index a08d31d9874a900b6dfec416c55ab508d9058944..04bac9f4506a8822105c7afb1c88b21c3794a176 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java
@@ -217,7 +217,7 @@ public class DeleteProxyConnectorActionTest
 
         //action = (DeleteProxyConnectorAction) lookup( Action.class.getName(), "deleteProxyConnectorAction" );
 
-        action = (DeleteProxyConnectorAction) getActionProxy( "/admin/deleteProxyConnector" ).getAction();
+        action = (DeleteProxyConnectorAction) getActionProxy( "/admin/deleteProxyConnector.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java
index a719018931df7c72e6db196f5ecce7cc38a96b32..32178a548686bd941421ff657512ca2c090e9b82 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java
@@ -213,7 +213,7 @@ public class DisableProxyConnectorActionTest
         super.setUp();
 
         //action = (DisableProxyConnectorAction) lookup( Action.class.getName(), "disableProxyConnectorAction" );
-        action = (DisableProxyConnectorAction) getActionProxy( "/admin/disableProxyConnector" ).getAction();
+        action = (DisableProxyConnectorAction) getActionProxy( "/admin/disableProxyConnector.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
index 8bc9880804ee909abfbe7d144c6b0af1e0412bb0..b8343c0e56854d0451ab3522116b139201ab1636 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java
@@ -433,7 +433,7 @@ public class EditProxyConnectorActionTest
         super.setUp();
 
         //action = (EditProxyConnectorAction) lookup( Action.class.getName(), "editProxyConnectorAction" );
-        action = (EditProxyConnectorAction) getActionProxy( "/admin/editProxyConnector" ).getAction();
+        action = (EditProxyConnectorAction) getActionProxy( "/admin/editProxyConnector.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java
index c0a3f09081a9d249bd59b8d39672e7fde033a1d8..0f21df77ad52992a4e27985e52a069a9aed512d9 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java
@@ -211,7 +211,7 @@ public class EnableProxyConnectorActionTest extends AbstractWebworkTestCase
 
         //action = (EnableProxyConnectorAction) lookup( Action.class.getName(), "enableProxyConnectorAction" );
 
-        action = (EnableProxyConnectorAction) getActionProxy( "/admin/enableProxyConnector" ).getAction();
+        action = (EnableProxyConnectorAction) getActionProxy( "/admin/enableProxyConnector.action" ).getAction();
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();
         action.setArchivaConfiguration( archivaConfiguration );

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
index dcfff827e31b30813a0b503f85a57cd7f8e06476..913fda1719bad00dfc05d88b4fea06035925eb09 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java
@@ -243,7 +243,7 @@ public class SortProxyConnectorsActionTest
         super.setUp();
 
         //action = (SortProxyConnectorsAction) lookup( Action.class.getName(), "sortProxyConnectorsAction" );
-        action = (SortProxyConnectorsAction) getActionProxy( "/admin/sortProxyConnectors" ).getAction();
+        action = (SortProxyConnectorsAction) getActionProxy( "/admin/sortProxyConnectors.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
index ea795ad75ff52aa00a6e2bda2c3951da9272b4f8..89078fb1490d753a9bc3091cdc8814683357f9f5 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
@@ -52,7 +52,7 @@ public class AddRemoteRepositoryActionTest
         super.setUp();
 
         //action = (AddRemoteRepositoryAction) lookup( Action.class.getName(), "addRemoteRepositoryAction" );
-        action = (AddRemoteRepositoryAction) getActionProxy( "/admin/addRemoteRepository" ).getAction();
+        action = (AddRemoteRepositoryAction) getActionProxy( "/admin/addRemoteRepository.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
index ea03dc1afeb6430384cc1bb0d3b64c56005b582e..c2a136880cee526bd4a72db431d3fd9618eae5d2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryActionTest.java
@@ -54,7 +54,7 @@ public class DeleteRemoteRepositoryActionTest
         super.setUp();
 
         //action = (DeleteRemoteRepositoryAction) lookup( Action.class.getName(), "deleteRemoteRepositoryAction" );
-        action = (DeleteRemoteRepositoryAction) getActionProxy( "/admin/deleteRemoteRepository" ).getAction();
+        action = (DeleteRemoteRepositoryAction) getActionProxy( "/admin/deleteRemoteRepository.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
index bc5c5a972525fc534531763f3ed5955a318114e4..bcf3d58ebfec573013a0809bef97aeee5ad67510 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java
@@ -50,7 +50,7 @@ public class DeleteRepositoryGroupActionTest
         super.setUp();
 
         //action = (DeleteRepositoryGroupAction) lookup ( Action.class.getName(), "deleteRepositoryGroupAction" );
-        action = (DeleteRepositoryGroupAction) getActionProxy( "/admin/deleteRepositoryGroup" ).getAction();
+        action = (DeleteRepositoryGroupAction) getActionProxy( "/admin/deleteRepositoryGroup.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
index dface6a7ce76a929b933b21fc644f33c14d50bf2..ad619d31f897d444043b164542f0ffcf56430e61 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java
@@ -155,7 +155,7 @@ public class EditRemoteRepositoryActionTest
 
         //action = (EditRemoteRepositoryAction) lookup( Action.class.getName(), "editRemoteRepositoryAction" );
 
-        action = (EditRemoteRepositoryAction) getActionProxy( "editRemoteRepository" ).getAction();
+        action = (EditRemoteRepositoryAction) getActionProxy( "editRemoteRepository.action" ).getAction();
 
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
index 54a4932a2ed399f9f1c9f0aba1c5f3c5bcdcf4fa..2a489e6e6db062529ee65c2bef59787dd168a253 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
@@ -50,7 +50,7 @@ public class RepositoriesActionTest
         super.setUp();
 
         //action = (RepositoriesAction) lookup( Action.class.getName(), "repositoriesAction" );
-        action = (RepositoriesAction) getActionProxy( "/admin/index"  ).getAction();
+        action = (RepositoriesAction) getActionProxy( "/admin/index.action"  ).getAction();
 
     }
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java
index 3e8f28b84756a41bdbcd0c0368d5300348fb15a0..95a27c575f500ff70b8feb4009edab5bb1cca354 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java
@@ -60,7 +60,7 @@ public class RepositoryGroupsActionTest
         super.setUp();
        
         //action = (RepositoryGroupsAction) lookup( Action.class.getName(), "repositoryGroupsAction" );
-        action = (RepositoryGroupsAction) getActionProxy( "/admin/repositoryGroups" );
+        action = (RepositoryGroupsAction) getActionProxy( "/admin/repositoryGroups.action" );
            
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java
index 1024673c4380c37aeabc296ab6be57ccc5cb8dbd..73677e1186089ab4eae0581293d471fa2e880793 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java
@@ -64,7 +64,7 @@ public class SortRepositoriesActionTest
            
         //action = (SortRepositoriesAction) lookup( Action.class.getName(), "sortRepositoriesAction" );
 
-        action = (SortRepositoriesAction) getActionProxy( "sortDownRepositoryFromGroup" ).getAction();
+        action = (SortRepositoriesAction) getActionProxy( "sortDownRepositoryFromGroup.action" ).getAction();
         archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
         archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();
         action.setArchivaConfiguration( archivaConfiguration );

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
index 6eb06565d62430f7eb830a434dea193417f498f4..f89f90717ab38d145a0e5376ded8222aec148efd 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
@@ -75,7 +75,7 @@ public class GenerateReportActionTest
 
         //action = (GenerateReportAction) lookup( Action.class, "generateReport" );
 
-        action = (GenerateReportAction) getActionProxy( "/admin/generateReport" ).getAction();
+        action = (GenerateReportAction) getActionProxy( "/admin/generateReport.action" ).getAction();
 
         repositoryStatisticsManagerControl = MockControl.createControl( RepositoryStatisticsManager.class );
         repositoryStatisticsManager = (RepositoryStatisticsManager) repositoryStatisticsManagerControl.getMock();