Merged 5.2.N (5.2.2) to HEAD (5.2)

137038 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136673 msuzuki: SEARCH-340, adding facet range search


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:13:29 +00:00
parent 3185fba7bb
commit 5e9c375c7c
7 changed files with 121 additions and 17 deletions

View File

@@ -59,6 +59,7 @@ import org.alfresco.service.cmr.search.Interval;
import org.alfresco.service.cmr.search.IntervalParameters;
import org.alfresco.service.cmr.search.IntervalSet;
import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.RangeParameters;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
import org.alfresco.service.cmr.search.SearchService;
@@ -797,16 +798,31 @@ public class SearchMapperTests
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
assertEquals(searchParameters.getInterval(), intervalParameters);
}
@Test
public void facetRange()
{
SearchParameters searchParameters = new SearchParameters();
RangeParameters rangeParams = new RangeParameters(null, null, null, null);
try
{
searchMapper.fromFacetRange(searchParameters, rangeParams);
fail();
}
catch (IllegalArgumentException iae)
{
assertNotNull(iae);
}
rangeParams = new RangeParameters("content.size", "0", "100000", "1000");
searchMapper.fromFacetRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRange(), rangeParams);
}
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, null, null);
SearchQuery sq = new SearchQuery(query, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null);
return sq;
}
@Test
public void facetGroup()
{
}
}