You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/03/20 17:51:36 UTC
svn commit: r756615 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
Author: brett
Date: Fri Mar 20 16:51:35 2009
New Revision: 756615
URL: http://svn.apache.org/viewvc?rev=756615&view=rev
Log:
remove more xwork user references
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java?rev=756615&r1=756614&r2=756615&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java Fri Mar 20 16:51:35 2009
@@ -35,7 +35,6 @@
import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.security.UserRepositories;
-import org.codehaus.plexus.redback.users.UserManager;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
@@ -61,8 +60,6 @@
private UserRepositories userRepos;
- private MockControl archivaXworkUserControl;
-
private MockControl searchControl;
private RepositorySearch search;
@@ -143,15 +140,12 @@
versions.add( "1.0" );
versions.add( "1.1" );
- archivaXworkUserControl.expectAndReturn( UserManager.GUEST_USERNAME, "user", 3 );
-
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos, 2 );
searchControl.expectAndReturn( search.search( "user", selectedRepos, "archiva", limits, null ), results );
daoControl.expectAndReturn( dao.query( new UniqueVersionConstraint( selectedRepos, hit.getGroupId(), hit.getArtifactId() ) ), versions );
- archivaXworkUserControl.replay();
userReposControl.replay();
searchControl.replay();
daoControl.replay();
@@ -162,7 +156,6 @@
assertEquals( 1, action.getTotalPages() );
assertEquals( 1, action.getResults().getTotalHits() );
- archivaXworkUserControl.verify();
userReposControl.verify();
searchControl.verify();
daoControl.verify();
@@ -203,15 +196,12 @@
versions.add( "1.0" );
versions.add( "1.1" );
- archivaXworkUserControl.expectAndReturn( UserManager.GUEST_USERNAME, "user", 3 );
-
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos, 2 );
searchControl.expectAndReturn( search.search( "user", selectedRepos, "archiva", limits, parsed ), results );
daoControl.expectAndReturn( dao.query( new UniqueVersionConstraint( selectedRepos, hit.getGroupId(), hit.getArtifactId() ) ), versions );
- archivaXworkUserControl.replay();
userReposControl.replay();
searchControl.replay();
daoControl.replay();
@@ -223,7 +213,6 @@
assertEquals( 1, action.getTotalPages() );
assertEquals( 1, action.getResults().getTotalHits() );
- archivaXworkUserControl.verify();
userReposControl.verify();
searchControl.verify();
daoControl.verify();
@@ -237,18 +226,14 @@
List<String> selectedRepos = new ArrayList<String>();
- archivaXworkUserControl.expectAndReturn( UserManager.GUEST_USERNAME, "user" );
-
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos );
- archivaXworkUserControl.replay();
userReposControl.replay();
String result = action.quickSearch();
assertEquals( GlobalResults.ACCESS_TO_NO_REPOS, result );
- archivaXworkUserControl.verify();
userReposControl.verify();
}
@@ -269,13 +254,10 @@
SearchResults results = new SearchResults();
- archivaXworkUserControl.expectAndReturn( UserManager.GUEST_USERNAME, "user", 2 );
-
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos );
searchControl.expectAndReturn( search.search( "user", selectedRepos, "archiva", limits, null ), results );
- archivaXworkUserControl.replay();
userReposControl.replay();
searchControl.replay();
@@ -283,7 +265,6 @@
assertEquals( Action.INPUT, result );
- archivaXworkUserControl.verify();
userReposControl.verify();
searchControl.verify();
}
@@ -324,11 +305,8 @@
SearchFields searchFields = new SearchFields( "org", null, null, null, null, selectedRepos );
- archivaXworkUserControl.expectAndReturn( UserManager.GUEST_USERNAME, "user" );
-
searchControl.expectAndReturn( search.search( "user", searchFields, limits ), results );
- archivaXworkUserControl.replay();
searchControl.replay();
String result = action.filteredSearch();
@@ -337,7 +315,6 @@
assertEquals( 1, action.getTotalPages() );
assertEquals( 1, action.getResults().getTotalHits() );
- archivaXworkUserControl.verify();
searchControl.verify();
}
@@ -374,13 +351,10 @@
SearchFields searchFields = new SearchFields( "org", null, null, null, null, selectedRepos );
- archivaXworkUserControl.expectAndReturn( UserManager.GUEST_USERNAME, "user", 2 );
-
userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos );
searchControl.expectAndReturn( search.search( "user", searchFields, limits ), results );
- archivaXworkUserControl.replay();
searchControl.replay();
userReposControl.replay();
@@ -390,7 +364,6 @@
assertEquals( 1, action.getTotalPages() );
assertEquals( 1, action.getResults().getTotalHits() );
- archivaXworkUserControl.verify();
searchControl.verify();
userReposControl.verify();
}
@@ -419,11 +392,8 @@
SearchFields searchFields = new SearchFields( "org", null, null, null, null, selectedRepos );
- archivaXworkUserControl.expectAndReturn( UserManager.GUEST_USERNAME, "user" );
-
searchControl.expectAndReturn( search.search( "user", searchFields, limits ), results );
- archivaXworkUserControl.replay();
searchControl.replay();
String result = action.filteredSearch();
@@ -432,7 +402,6 @@
assertFalse( action.getActionErrors().isEmpty() );
assertEquals( "No results found",( String ) action.getActionErrors().iterator().next() );
- archivaXworkUserControl.verify();
searchControl.verify();
}