inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged searchapi (5.2.1) to 5.2.N (5.2.1)

Browse Source 
130145 gjames: SEARCH-123: Implementing scope for queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:39:26 +00:00
parent 80e1bd66c7
commit 7bb1ba047a
6 changed files with 137 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -29,6 +29,8 @@ import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNotNull;
import static junit.framework.TestCase.assertTrue;
import static junit.framework.TestCase.fail;
import static org.alfresco.service.cmr.repository.StoreRef.PROTOCOL_DELETED;
import static org.alfresco.service.cmr.repository.StoreRef.PROTOCOL_TEST;
import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_CMIS_ALFRESCO;
import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_FTS_ALFRESCO;
import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
@@ -39,6 +41,7 @@ import org.alfresco.rest.api.search.model.Default;
import org.alfresco.rest.api.search.model.FacetQuery;
import org.alfresco.rest.api.search.model.FilterQuery;
import org.alfresco.rest.api.search.model.Query;
import org.alfresco.rest.api.search.model.Scope;
import org.alfresco.rest.api.search.model.SearchQuery;
import org.alfresco.rest.api.search.model.SortDef;
import org.alfresco.rest.api.search.model.Spelling;
@@ -361,10 +364,43 @@ public class SearchMapperTests
assertTrue(searchParameters.isSpellCheck());
}
@Test
public void fromScope() throws Exception
{
SearchParameters searchParameters = new SearchParameters();
searchMapper.setDefaults(searchParameters);
//Doesn't error, has default store
searchMapper.fromScope(searchParameters, null);
assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,searchParameters.getStores().get(0));
searchMapper.fromScope(searchParameters, new Scope(null));
assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,searchParameters.getStores().get(0));
try
{
searchMapper.fromScope(searchParameters, new Scope(Arrays.asList("nonsense")));
fail();
}
catch (InvalidArgumentException iae)
{
//Must be a valid store ref
assertNotNull(iae);
}
searchMapper.fromScope(searchParameters, new Scope(Arrays.asList(
new StoreRef(PROTOCOL_TEST, "SpacesStore").toString(),
new StoreRef(PROTOCOL_DELETED, "SpacesStore").toString())));
assertEquals(2 ,searchParameters.getStores().size());
assertEquals("test://SpacesStore",searchParameters.getStores().get(0).toString());
assertEquals("deleted://SpacesStore",searchParameters.getStores().get(1).toString());
}
private SearchQuery minimalQuery()
{
Query query = new Query("cmis", "foo", "");
SearchQuery sq = new SearchQuery(query,null, null, null, null, null, null, null, null);
SearchQuery sq = new SearchQuery(query,null, null, null, null, null, null, null, null, null);
return sq;
}
}