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

137058 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136805 msuzuki: Search-340, changed range to a collection as it may handle many range facets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:15:56 +00:00
parent 02a518aeea
commit 4ddc581743
8 changed files with 87 additions and 91 deletions

View File

@@ -889,7 +889,8 @@ public class SearchMapperTests
public void facetRange()
{
SearchParameters searchParameters = new SearchParameters();
RangeParameters rangeParams = new RangeParameters(null, null, null, null,false,null,null,null,null);
List<RangeParameters> rangeParams = new ArrayList<RangeParameters>();
rangeParams.add(new RangeParameters(null, null, null, null,false,null,null,null,null));
try
{
searchMapper.fromRange(searchParameters, rangeParams);
@@ -899,14 +900,21 @@ public class SearchMapperTests
{
assertNotNull(iae);
}
rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,null,null,null,null);
rangeParams.clear();
rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,null,null));
searchMapper.fromRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRanges(), rangeParams);
rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,"before","lower",null,null);
rangeParams.clear();
rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,"before","lower",null,null));
searchMapper.fromRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRanges(), rangeParams);
//Assert multiple ranges
rangeParams.add(new RangeParameters("created", "2015-09-29T10:45:15.729Z", "2016-09-29T10:45:15.729Z", "+100DAY", true, "before", "lower", null, null));
searchMapper.fromRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRanges(), rangeParams);
assertEquals(2,searchParameters.getRanges().size());
}
private SearchQuery minimalQuery()