You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/26 17:58:50 UTC
svn commit: r1293871 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src:
main/java/org/apache/archiva/rest/services/
test/java/org/apache/archiva/rest/services/
Author: olamy
Date: Sun Feb 26 16:58:50 2012
New Revision: 1293871
URL: http://svn.apache.org/viewvc?rev=1293871&view=rev
Log:
add unit test for search with guest user.
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/AbstractArchivaRestTest.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=1293871&r1=1293870&r2=1293871&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 Sun Feb 26 16:58:50 2012
@@ -73,7 +73,6 @@ public class DefaultSearchService
}
SearchResultLimits limits = new SearchResultLimits( 0 );
- List<String> observableRepoIds = getObservableRepos();
try
{
SearchResults searchResults =
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.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/AbstractArchivaRestTest.java?rev=1293871&r1=1293870&r2=1293871&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java Sun Feb 26 16:58:50 2012
@@ -329,6 +329,9 @@ public abstract class AbstractArchivaRes
getRoleManagementService( authorizationHeader ).assignTemplatedRole(
ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, testRepoId, "admin" );
+ getRoleManagementService( authorizationHeader ).assignTemplatedRole(
+ ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, testRepoId, "guest" );
+
getRepositoriesService( authorizationHeader ).scanRepositoryNow( testRepoId, true );
}
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=1293871&r1=1293870&r2=1293871&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 Sun Feb 26 16:58:50 2012
@@ -18,18 +18,13 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.rest.api.model.Artifact;
import org.apache.archiva.rest.api.model.SearchRequest;
-import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
import org.apache.archiva.rest.api.services.SearchService;
-import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.junit.Test;
-import java.io.File;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Date;
import java.util.List;
/**
@@ -70,6 +65,40 @@ public class SearchServiceTest
deleteTestRepo( testRepoId );
}
+ /**
+ * same search but with Guest user
+ * @throws Exception
+ */
+ @Test
+ public void quickSearchOnArtifactIdGuest()
+ throws Exception
+ {
+
+ String testRepoId = "test-repo";
+ // force guest user creation if not exists
+ if ( getUserService( authorizationHeader ).getGuestUser() == null )
+ {
+ assertNotNull( getUserService( authorizationHeader ).createGuestUser() );
+ }
+
+ createAndIndexRepo( testRepoId, "src/test/repo-with-osgi" );
+
+ SearchService searchService = getSearchService( null );
+
+ // START SNIPPET: quick-search
+ List<Artifact> artifacts = searchService.quickSearch( "commons-logging" );
+ // return all artifacts with groupId OR artifactId OR version OR packaging OR className
+ // NOTE : only artifacts with classifier empty are returned
+ // END SNIPPET: quick-search
+
+ assertNotNull( artifacts );
+ assertTrue( " not 6 results for commons-logging search but " + artifacts.size() + ":" + artifacts,
+ artifacts.size() == 6 );
+ log.info( "artifacts for commons-logging size {} search {}", artifacts.size(), artifacts );
+
+ deleteTestRepo( testRepoId );
+ }
+
@Test
public void searchArtifactVersions()
throws Exception