From fcf48797346f65ea13936ecd3eaf4bce0d586856 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 13 Jun 2011 21:50:10 +0000 Subject: [PATCH] fix more test in webapp module git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135307 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/archiva/web/action/BrowseActionTest.java | 4 ++-- .../maven/archiva/web/action/DeleteArtifactActionTest.java | 2 +- .../maven/archiva/web/action/ShowArtifactActionTest.java | 4 ++-- .../admin/appearance/EditOrganizationInfoActionTest.java | 2 +- .../action/admin/appearance/OrganizationInfoActionTest.java | 2 +- .../admin/connectors/proxy/AddProxyConnectorActionTest.java | 2 +- .../connectors/proxy/DeleteProxyConnectorActionTest.java | 2 +- .../connectors/proxy/DisableProxyConnectorActionTest.java | 2 +- .../admin/connectors/proxy/EditProxyConnectorActionTest.java | 2 +- .../connectors/proxy/EnableProxyConnectorActionTest.java | 2 +- .../admin/connectors/proxy/SortProxyConnectorsActionTest.java | 2 +- .../admin/repositories/AddRemoteRepositoryActionTest.java | 2 +- .../admin/repositories/DeleteRemoteRepositoryActionTest.java | 2 +- .../admin/repositories/DeleteRepositoryGroupActionTest.java | 2 +- .../admin/repositories/EditRemoteRepositoryActionTest.java | 2 +- .../web/action/admin/repositories/RepositoriesActionTest.java | 2 +- .../action/admin/repositories/RepositoryGroupsActionTest.java | 2 +- .../action/admin/repositories/SortRepositoriesActionTest.java | 2 +- .../archiva/web/action/reports/GenerateReportActionTest.java | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) 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 4e0da510e..9bead4d79 100644 --- 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 e64593c49..7627b2aed 100644 --- 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 480b318ee..b37e21261 100644 --- 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 41223bda7..a772cb9b0 100644 --- 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 2682bc21e..bf1ae83c4 100644 --- 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 879e4a4d2..b1e1f3d0c 100644 --- 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 a08d31d98..04bac9f45 100644 --- 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 a71901893..32178a548 100644 --- 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 8bc988080..b8343c0e5 100644 --- 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 c0a3f0908..0f21df77a 100644 --- 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 dcfff827e..913fda171 100644 --- 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 ea795ad75..89078fb14 100644 --- 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 ea03dc1af..c2a136880 100644 --- 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 bc5c5a972..bcf3d58eb 100644 --- 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 dface6a7c..ad619d31f 100644 --- 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 54a4932a2..2a489e6e6 100644 --- 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 3e8f28b84..95a27c575 100644 --- 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 1024673c4..73677e118 100644 --- 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 6eb06565d..f89f90717 100644 --- 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();