You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/02/05 10:22:22 UTC

svn commit: r741054 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/SearchActionTest.java

Author: oching
Date: Thu Feb  5 09:22:22 2009
New Revision: 741054

URL: http://svn.apache.org/viewvc?rev=741054&view=rev
Log:
[MRM-1046]
o added more tests

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=741054&r1=741053&r2=741054&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 Thu Feb  5 09:22:22 2009
@@ -182,13 +182,60 @@
     public void testSearchUserHasNoAccessToAnyRepository()
         throws Exception
     {
-    
+        action.setQ( "archiva" );
+        action.setCurrentPage( 0 );
+        
+        List<String> selectedRepos = new ArrayList<String>();
+        
+        archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "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();        
     }
     
     public void testNoSearchHits()
         throws Exception
     {
-    
+        action.setQ( "archiva" );
+        action.setCurrentPage( 0 );
+        action.setSearchResultsOnly( false );
+        action.setCompleteQueryString( "" );
+        
+        List<String> selectedRepos = new ArrayList<String>();
+        selectedRepos.add( "internal" );
+        selectedRepos.add( "snapshots" );
+        
+        SearchResultLimits limits = new SearchResultLimits( action.getCurrentPage() );
+        limits.setPageSize( 30 );
+                
+        SearchResults results = new SearchResults();
+        
+        archivaXworkUserControl.expectAndReturn( archivaXworkUser.getActivePrincipal( new HashMap() ), "user", 2 );
+                
+        userReposControl.expectAndReturn( userRepos.getObservableRepositoryIds( "user" ), selectedRepos );
+        
+        searchControl.expectAndReturn( search.search( "user", selectedRepos, "archiva", limits, null ), results );
+        
+        archivaXworkUserControl.replay();
+        userReposControl.replay();
+        searchControl.replay();
+        
+        String result = action.quickSearch();
+        
+        assertEquals( Action.INPUT, result );        
+        
+        archivaXworkUserControl.verify();
+        userReposControl.verify();
+        searchControl.verify();
     }
     
     // test pagination or just totalPages?