From b6d6a70302fca4bfe3453bb52019cd8b47fc51cd Mon Sep 17 00:00:00 2001 From: Gethin James Date: Thu, 1 Jun 2017 11:22:53 +0000 Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1) 137008 msuzuki: Search-340, adding more unit tests to support range git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../api/search/RangeResultMapperTests.java | 21 ++++++++++++++++++- .../rest/api/search/ResultMapperTests.java | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java b/source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java index 2abeb4f339..e6a76fdd0e 100644 --- a/source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java @@ -58,33 +58,52 @@ public class RangeResultMapperTests //=============== start bucket GenericBucket response = queryWithInclude(null, "head"); assertEquals("test:[0 TO 10>", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("outer", "head"); assertEquals("test:[0 TO 10]", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("lower", "head"); assertEquals("test:[0 TO 10<", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("edge", "head"); assertEquals("test:[0 TO 10<", response.getFilterQuery()); response = queryWithInclude("upper", "head"); assertEquals("test:]0 TO 10>", response.getFilterQuery()); + assertEquals("false", response.getBucketInfo().get("startInclusive")); + assertEquals("true", response.getBucketInfo().get("endInclusive")); //=============== Non start end bucket response = queryWithInclude("lower", "body"); assertEquals("test:[0 TO 10<", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("false", response.getBucketInfo().get("endInclusive")); + response = queryWithInclude("upper", "body"); assertEquals("test:]0 TO 10>", response.getFilterQuery()); + assertEquals("false", response.getBucketInfo().get("startInclusive")); + assertEquals("true", response.getBucketInfo().get("endInclusive")); //=============== End bucket response = queryWithInclude("lower", "tail"); assertEquals("test:[0 TO 10>", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("edge", "tail"); assertEquals("test:]0 TO 10]", response.getFilterQuery()); - + assertEquals("false", response.getBucketInfo().get("startInclusive")); + assertEquals("true", response.getBucketInfo().get("endInclusive")); + response = queryWithInclude("upper", "tail"); assertEquals("test:]0 TO 10]", response.getFilterQuery()); + assertEquals("false", response.getBucketInfo().get("startInclusive")); + assertEquals("true", response.getBucketInfo().get("endInclusive")); } private GenericBucket queryWithInclude(String param, String bucketPosition) diff --git a/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java b/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java index 31206442db..2dfbbe7e07 100644 --- a/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java @@ -533,7 +533,7 @@ public class ResultMapperTests assertEquals(4, rangeFacets.get(0).getBuckets().size()); assertEquals(3, rangeFacets.get(1).getBuckets().size()); assertEquals("content.size",rangeFacets.get(1).getLabel()); - assertEquals("[0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel()); + assertEquals("(0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel()); Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray(); assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count")); assertEquals("content.size:]0 TO 100>", rangeFacets.get(1).getBuckets().get(0).getFilterQuery()); @@ -541,7 +541,7 @@ public class ResultMapperTests Map facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo(); assertEquals("0",facetInfo.get("start")); assertEquals("100",facetInfo.get("end")); - assertEquals("true",facetInfo.get("startInclusive")); + assertEquals("false",facetInfo.get("startInclusive")); assertEquals("true",facetInfo.get("endInclusive")); }