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

136090 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135624 gjames: SEARCH-339: Correct use of the interval field


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 10:59:45 +00:00
parent bc69676fd2
commit 5b308a6ea3
3 changed files with 4 additions and 4 deletions

View File

@@ -276,7 +276,7 @@ public class ResultMapperTests
assertEquals(2, searchContext.getFacetIntervals().size()); assertEquals(2, searchContext.getFacetIntervals().size());
assertEquals("creator",searchContext.getFacetIntervals().get(0).getLabel()); assertEquals("creator",searchContext.getFacetIntervals().get(0).getLabel());
assertEquals("last",searchContext.getFacetIntervals().get(0).getBuckets().get(0).getLabel()); assertEquals("last",searchContext.getFacetIntervals().get(0).getBuckets().get(0).getLabel());
assertEquals("creator:(a,b]",searchContext.getFacetIntervals().get(0).getBuckets().get(0).getFilterQuery()); assertEquals("cm:creator:(a,b]",searchContext.getFacetIntervals().get(0).getBuckets().get(0).getFilterQuery());
assertEquals(4,searchContext.getFacetIntervals().get(0).getBuckets().get(0).getCount()); assertEquals(4,searchContext.getFacetIntervals().get(0).getBuckets().get(0).getCount());
} }

View File

@@ -156,8 +156,8 @@ public class SearchQuerySerializerTests
assertEquals(1,ip.getIntervals().size()); assertEquals(1,ip.getIntervals().size());
Interval interval = ip.getIntervals().get(0); Interval interval = ip.getIntervals().get(0);
assertEquals("Creator", interval.getLabel()); assertEquals("creator", interval.getLabel());
assertEquals("creator", interval.getField()); assertEquals("cm:creator", interval.getField());
is = interval.getSets().get(0); is = interval.getSets().get(0);
assertEquals("last", is.getLabel()); assertEquals("last", is.getLabel());
assertEquals("a", is.getStart()); assertEquals("a", is.getStart());

View File

@@ -63,7 +63,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\"}]}," + "\"facetFields\": {\"facets\": [{\"field\": \"cm:creator\",\"prefix\": \"myquery2\",\"sort\": \"COUNT\",\"missing\": \"false\"}, {\"field\": \"modifier\",\"label\": \"mylabel\",\"method\": \"FC\",\"mincount\": \"5\"}]},"
+ "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}]," + "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}],"
+ "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]" + "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]"
+ ",\"intervals\": [{\"field\": \"creator\",\"label\": \"Creator\"," + ",\"intervals\": [{\"field\": \"cm:creator\",\"label\": \"creator\","
+ "\"sets\": [{\"label\": \"last\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]" + "\"sets\": [{\"label\": \"last\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]"
+ "}]}," + "}]},"
+ "\"spellcheck\": {\"query\": \"alfrezco\"}," + "\"spellcheck\": {\"query\": \"alfrezco\"},"