svn commit: r1197182 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src: main/java/org/apache/archiva/rest/services/DefaultSearchService.java test/java/org/apache/archiva/rest/services/SearchServiceTest.java

[olamy]

Author: olamy
Date: Thu Nov  3 15:19:44 2011
New Revision: 1197182

URL: http://svn.apache.org/viewvc?rev=1197182&view=rev
Log:
fix unit tests in archiva-rest-services

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java?rev=1197182&r1=1197181&r2=1197182&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
 Thu Nov  3 15:19:44 2011
@@ -128,6 +128,12 @@ public class DefaultSearchService
         SearchFields searchField = new BeanReplicator().replicateBean( 
searchRequest, SearchFields.class );
         SearchResultLimits limits = new SearchResultLimits( 0 );
 
+        // if no repos set we use ones available for the user
+        if ( searchField.getRepositories() == null || 
searchField.getRepositories().isEmpty() )
+        {
+            searchField.setRepositories( getObservableRepos() );
+        }
+
         try
         {
             SearchResults searchResults = repositorySearch.search( 
getPrincipal(), searchField, limits );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java?rev=1197182&r1=1197181&r2=1197182&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
 Thu Nov  3 15:19:44 2011
@@ -211,6 +211,7 @@ public class SearchServiceTest
 
         SearchRequest searchRequest = new SearchRequest();
         searchRequest.setBundleExportPackage( 
"org.apache.karaf.features.command.completers" );
+        searchRequest.setRepositories( Arrays.asList( testRepoId ) );
 
         List<Artifact> artifacts = searchService.searchArtifacts( 
searchRequest );