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 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
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);
}

2
source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java
View File

@@ -64,7 +64,7 @@ public class SerializerTestHelper implements RequestReader
+ "\"facetFields\": {\"facets\": [{\"field\": \"cm:creator\",\"prefix\": \"myquery2\",\"sort\": \"COUNT\",\"missing\": \"false\"}, {\"field\": \"modifier\",\"label\": \"mylabel\",\"method\": \"FC\",\"mincount\": \"5\"}, {\"field\": \"owner\",\"label\": \"ownerLabel\"}]},"
+ "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}],"
+ "\"pivots\": [{\"key\": \"mylabel\"}],"
+ "\"facetRange\": {\"field\": \"content.size\",\"facet.range.start\": \"0\",\"facet.range.end\": \"300\",\"facet.range.gap\": \"100\"},"
+ "\"range\": {\"field\": \"content.size\",\"start\": \"0\",\"end\": \"300\",\"gap\": \"100\"},"
+ "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]"
+ ",\"intervals\": [{\"field\": \"cm:creator\",\"label\": \"creator\","
+ "\"sets\": [{\"label\": \"last\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]"