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 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
136101 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      136071 gjames: SEARCH-334: Adding pivot to the request


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:01:06 +00:00
parent eb62c3f32c
commit 60a863c546
4 changed files with 159 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_FTS_ALFRESC
import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import org.alfresco.rest.api.search.context.SearchRequestContext;
import org.alfresco.rest.api.search.impl.SearchMapper;
import org.alfresco.rest.api.search.impl.StoreMapper;
import org.alfresco.rest.api.search.model.Default;
@@ -42,6 +43,7 @@ import org.alfresco.rest.api.search.model.FacetFields;
import org.alfresco.rest.api.search.model.FacetQuery;
import org.alfresco.rest.api.search.model.FilterQuery;
import org.alfresco.rest.api.search.model.Limits;
import org.alfresco.rest.api.search.model.Pivot;
import org.alfresco.rest.api.search.model.Query;
import org.alfresco.rest.api.search.model.Scope;
import org.alfresco.rest.api.search.model.SearchQuery;
@@ -87,13 +89,15 @@ public class SearchMapperTests
@Test(expected = IllegalArgumentException.class)
public void testMandatory() throws Exception
{
SearchParameters searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, SearchQuery.EMPTY);
SearchRequestContext searchRequest = SearchRequestContext.from(SearchQuery.EMPTY);
SearchParameters searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, SearchQuery.EMPTY, searchRequest);
}
@Test
public void toSearchParameters() throws Exception
{
SearchParameters searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, minimalQuery());
SearchRequestContext searchRequest = SearchRequestContext.from(minimalQuery());
SearchParameters searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, minimalQuery(), searchRequest);
assertNotNull(searchParameters);
//Test defaults
@@ -102,7 +106,7 @@ public class SearchMapperTests
assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy());
assertEquals(100, searchParameters.getLimit());
searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, helper.searchQueryFromJson());
searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, helper.searchQueryFromJson(), searchRequest);
assertNotNull(searchParameters);
}
@@ -580,6 +584,67 @@ public class SearchMapperTests
assertEquals(searchParameters.getHighlight(), highlightParameters);
}
@Test
public void fromPivot() throws Exception
{
SearchParameters searchParameters = new SearchParameters();
searchMapper.fromPivot(searchParameters,null, null, null);
List<FacetField> facets = new ArrayList<>(1);
facets.add(new FacetField("myfield",null,null,null,null,null,null,null,null,null,null));
FacetFields ff = new FacetFields(facets);
searchMapper.fromFacetFields(searchParameters,ff);
searchMapper.fromPivot(searchParameters,ff, null, null);
assertEquals(1 ,searchParameters.getFieldFacets().size());
assertEquals(0 ,searchParameters.getPivots().size());
//Handle unknown pivot.
searchParameters = new SearchParameters();
try
{
searchMapper.fromPivot(searchParameters,ff, Arrays.asList(new Pivot(null)), null);
fail();
}
catch (IllegalArgumentException iae)
{
//"bob" doesn't refer to a field facet
assertNotNull(iae);
}
try
{
searchMapper.fromPivot(searchParameters,ff, Arrays.asList(new Pivot("")), null);
fail();
}
catch (IllegalArgumentException iae)
{
//"bob" doesn't refer to a field facet
assertNotNull(iae);
}
try
{
searchMapper.fromPivot(searchParameters,ff, Arrays.asList(new Pivot("bob")), null);
fail();
}
catch (InvalidArgumentException iae)
{
//"bob" doesn't refer to a field facet
assertNotNull(iae);
}
searchParameters = new SearchParameters();
SearchRequestContext searchRequestContext = SearchRequestContext.from(minimalQuery());
searchMapper.fromPivot(searchParameters,ff, Arrays.asList(new Pivot("myfield")), searchRequestContext);
searchMapper.fromFacetFields(searchParameters,ff);
//Moved from a field facet to a pivot
assertEquals(0 ,searchParameters.getFieldFacets().size());
assertEquals(1 ,searchParameters.getPivots().size());
assertEquals("myfield" ,searchParameters.getPivots().get(0));
}
@Test
public void fromInterval() throws Exception
{
@@ -652,7 +717,7 @@ public class SearchMapperTests
private SearchQuery minimalQuery()
{
Query query = new Query("cmis", "foo", "");
SearchQuery sq = new SearchQuery(query, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
SearchQuery sq = new SearchQuery(query, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
return sq;
}
@Test