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

137048 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136744 msuzuki: Search-340, amend naming to match json param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:14:44 +00:00
parent cd217d1ffc
commit 7b6b639ee0
4 changed files with 11 additions and 12 deletions

View File

@@ -890,7 +890,7 @@ public class SearchMapperTests
RangeParameters rangeParams = new RangeParameters(null, null, null, null,false,null,null,null,null);
try
{
searchMapper.fromFacetRange(searchParameters, rangeParams);
searchMapper.fromRange(searchParameters, rangeParams);
fail();
}
catch (IllegalArgumentException iae)
@@ -898,11 +898,11 @@ public class SearchMapperTests
assertNotNull(iae);
}
rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,null,null,null,null);
searchMapper.fromFacetRange(searchParameters, rangeParams);
searchMapper.fromRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRange(), rangeParams);
rangeParams = new RangeParameters("content.size", "0", "100000", "1000",true,"before","lower",null,null);
searchMapper.fromFacetRange(searchParameters, rangeParams);
searchMapper.fromRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRange(), rangeParams);
}