From 0993e160ae2dc49da36fd2d57808c372a41f4ed1 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Thu, 1 Jun 2017 11:12:14 +0000 Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1) 136895 msuzuki: Search-340, adding more unit test to support inclusive and exclusive range git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/api/search/ResultMapperTests.java | 26 +++++++++++++++++++ .../rest/api/search/SerializerTestHelper.java | 1 - 2 files changed, 26 insertions(+), 1 deletion(-) 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 da975c32c1..6535d98b2a 100644 --- a/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java @@ -516,6 +516,32 @@ public class ResultMapperTests assertEquals("300",facetInfo.get("end")); assertEquals("content.size:[200 TO 300>", rangeFacets.get(1).getBuckets().get(2).getFilterQuery()); } + @Test + public void testRangeExclusiec() throws Exception + { + ResultSet results = mockResultset(Collections.emptyList(),Collections.emptyList()); + String updatedJSON = helper.JSON.replace("lower", "upper"); + SearchQuery searchQuery = helper.extractFromJson(updatedJSON); + SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery); + SearchParameters searchParams = searchMapper.toSearchParameters(EMPTY_PARAMS, searchQuery, searchRequest); + SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0); + + //Numeric facet range + List rangeFacets = searchContext.getFacets().stream() + .filter(f -> f.getType().equals(FACET_TYPE.range)).collect(Collectors.toList()); + assertEquals(2, rangeFacets.size()); + 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()); + 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()); + assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count")); + Map facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo(); + assertEquals("0",facetInfo.get("start")); + assertEquals("100",facetInfo.get("end")); + } @Test /** diff --git a/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java b/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java index 4c09ac0288..13ceaf7153 100644 --- a/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java +++ b/source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java @@ -125,7 +125,6 @@ public class SerializerTestHelper implements RequestReader objectMapper.writeValue(generator, respons); } }); - System.out.println(out.toString()); return out.toString(); } }