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 
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
This commit is contained in:
Andrei Rebegea
2017-06-15 11:23:38 +00:00
parent f2d7101698
commit 48d70627d2
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java
View File

@@ -49,78 +49,90 @@ public class RangeResultMapperTests
@Test @Test
public void testBuildGenericBucketFromRange() throws Exception 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 //=============== start bucket
GenericBucket response = queryWithInclude("head", null); response = queryWithInclude("head", null);
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("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("head","outer"); 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("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("head","lower"); 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("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("head","upper","lower"); 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("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("head","edge","upper"); 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("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("head","upper"); 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("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive"));
//=============== Non start end bucket //=============== Non start end bucket
response = queryWithInclude("body","lower"); 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("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("body","upper"); 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("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive"));
//=============== End bucket //=============== End bucket
response = queryWithInclude("tail","lower"); 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("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("tail","edge"); 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("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("tail","upper"); 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("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive"));
//Before //Before
response = queryWithInclude("head","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("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive")); assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithIncludeAndOther("head","outer","before"); 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("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); assertEquals("true", response.getBucketInfo().get("endInclusive"));
//After //After
response = queryWithIncludeAndOther("head","outer","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("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive")); 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)); ranges.add(new RangeParameters("test", "0", "10", "1", true, other, include, null, null));
return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges); return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges);
} }
private GenericBucket queryWithoutInclude(String bucketPosition)
{
List<RangeParameters> ranges = new ArrayList<RangeParameters>();
ranges.add(new RangeParameters("test", "0", "10", "1", true, null, null, null, null));
return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges);
}
} }