summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-06-13 22:23:33 +0000
committerOlivier Lamy <olamy@apache.org>2011-06-13 22:23:33 +0000
commit4db8075bc60e3b284a346740140df9c69df6ce61 (patch)
tree796c1b0281a4ab985a020c0ed02754fbd5c14cf0 /archiva-modules
parent44629e35f6631c37f7f8b8356f5045388397f121 (diff)
downloadarchiva-4db8075bc60e3b284a346740140df9c69df6ce61.tar.gz
archiva-4db8075bc60e3b284a346740140df9c69df6ce61.zip
fix more unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1135326 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java2
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml5
2 files changed, 6 insertions, 1 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 9bead4d79..3008a68f1 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
@@ -391,7 +391,7 @@ public class BrowseActionTest
{
super.setUp();
//action = (BrowseAction) lookup( Action.class, ACTION_HINT );
- action = (BrowseAction) getActionProxy( "browse.action" ).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/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
index f4d83a652..e828f4c92 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
@@ -33,4 +33,9 @@
<context:component-scan base-package="org.apache.archiva.metadata.repository.memory"/>
<alias name="repositorySessionFactory#test" alias="repositorySessionFactory"/>
+
+ <bean name="userRepositories#test" class="org.apache.maven.archiva.security.UserRepositoriesStub"/>
+
+ <alias name="userRepositories#test" alias="userRepositories"/>
+
</beans> \ No newline at end of file