From 48d70627d24c04741c7937e210f4ef1092e0e907 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:23:38 +0000 Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2) 137129 msuzuki: Search-340, fix default values of range inclusion and data-model update git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../api/search/RangeResultMapperTests.java | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 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 b034c7549a..bb51fb3fae 100644 --- a/source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java @@ -49,78 +49,90 @@ public class RangeResultMapperTests @Test public void testBuildGenericBucketFromRange() throws Exception { - + //=============== Default + GenericBucket response = queryWithoutInclude("head"); + assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("false", response.getBucketInfo().get("endInclusive")); + response = queryWithoutInclude("body"); + assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("false", response.getBucketInfo().get("endInclusive")); + response = queryWithoutInclude("tail"); + assertEquals("test:[\"0\" TO \"10\"]", response.getFilterQuery()); + assertEquals("true", response.getBucketInfo().get("startInclusive")); + assertEquals("true", response.getBucketInfo().get("endInclusive")); //=============== start bucket - GenericBucket response = queryWithInclude("head", null); - assertEquals("test:[0 TO 10>", response.getFilterQuery()); + response = queryWithInclude("head", null); + assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery()); assertEquals("true", response.getBucketInfo().get("startInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("head","outer"); - assertEquals("test:<0 TO 10>", response.getFilterQuery()); + assertEquals("test:<\"0\" TO \"10\">", response.getFilterQuery()); assertEquals("false", response.getBucketInfo().get("startInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("head","lower"); - assertEquals("test:[0 TO 10>", response.getFilterQuery()); + assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery()); assertEquals("true", response.getBucketInfo().get("startInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("head","upper","lower"); - assertEquals("test:[0 TO 10]", response.getFilterQuery()); + assertEquals("test:[\"0\" TO \"10\"]", response.getFilterQuery()); assertEquals("true", response.getBucketInfo().get("startInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("head","edge","upper"); - assertEquals("test:[0 TO 10]", response.getFilterQuery()); + assertEquals("test:[\"0\" TO \"10\"]", response.getFilterQuery()); assertEquals("true", response.getBucketInfo().get("startInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("head","upper"); - assertEquals("test:<0 TO 10]", response.getFilterQuery()); + 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("body","lower"); - assertEquals("test:[0 TO 10>", response.getFilterQuery()); + assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery()); assertEquals("true", response.getBucketInfo().get("startInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("body","upper"); - assertEquals("test:<0 TO 10]", response.getFilterQuery()); + assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery()); assertEquals("false", response.getBucketInfo().get("startInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive")); //=============== End bucket response = queryWithInclude("tail","lower"); - assertEquals("test:[0 TO 10>", response.getFilterQuery()); + assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery()); assertEquals("true", response.getBucketInfo().get("startInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("tail","edge"); - assertEquals("test:<0 TO 10]", response.getFilterQuery()); + assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery()); assertEquals("false", response.getBucketInfo().get("startInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive")); response = queryWithInclude("tail","upper"); - assertEquals("test:<0 TO 10]", response.getFilterQuery()); + assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery()); assertEquals("false", response.getBucketInfo().get("startInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive")); //Before response = queryWithInclude("head","before"); - assertEquals("test:<0 TO 10>", response.getFilterQuery()); + assertEquals("test:<\"0\" TO \"10\">", response.getFilterQuery()); assertEquals("false", response.getBucketInfo().get("startInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive")); response = queryWithIncludeAndOther("head","outer","before"); - assertEquals("test:<0 TO 10]", response.getFilterQuery()); + assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery()); assertEquals("false", response.getBucketInfo().get("startInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive")); //After response = queryWithIncludeAndOther("head","outer","after"); - assertEquals("test:<0 TO 10]", response.getFilterQuery()); + assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery()); assertEquals("false", response.getBucketInfo().get("startInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive")); } @@ -166,4 +178,10 @@ public class RangeResultMapperTests ranges.add(new RangeParameters("test", "0", "10", "1", true, other, include, null, null)); return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges); } + private GenericBucket queryWithoutInclude(String bucketPosition) + { + List ranges = new ArrayList(); + ranges.add(new RangeParameters("test", "0", "10", "1", true, null, null, null, null)); + return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges); + } }