From 22e1cae35b1c34fe98ab16ce9509dbb21c098f93 Mon Sep 17 00:00:00 2001 From: Alessandro Benedetti Date: Wed, 2 Jan 2019 11:11:57 +0000 Subject: [PATCH 1/2] [SEARCH-1346]Fix tas tests in accordance with mincount forced to be >0 --- .../rest/search/FacetRangeSearchTest.java | 19 +++++++------------ .../rest/search/PivotFacetedSearchTest.java | 2 -- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java b/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java index 1add86965..5a3d38299 100644 --- a/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java @@ -31,6 +31,9 @@ import org.springframework.http.HttpStatus; import org.testng.Assert; import org.testng.annotations.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + /** * Faceted Range Search Query for numeric range * { @@ -239,8 +242,11 @@ public class FacetRangeSearchTest extends AbstractSearchTest response.assertThat().entriesListIsNotEmpty(); response.getContext().assertThat().field("facets").isNotEmpty(); RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); + + List buckets = facetResponseModel.getBuckets(); + assertThat(buckets.size(),is(1)); - RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); + RestGenericBucketModel bucket = buckets.get(0); bucket.assertThat().field("label").is("[2015-09-29T10:45:15.729Z - 2016-07-05T10:45:15.729Z)"); bucket.assertThat().field("filterQuery").is("created:[\"2015-09-29T10:45:15.729Z\" TO \"2016-07-05T10:45:15.729Z\">"); bucket.getMetrics().get(0).assertThat().field("value").is("{count=1}"); @@ -250,17 +256,6 @@ public class FacetRangeSearchTest extends AbstractSearchTest Assert.assertNull(info.get("count"),"1"); Assert.assertEquals(info.get("startInclusive"),"true"); Assert.assertEquals(info.get("endInclusive"),"false"); - - bucket = facetResponseModel.getBuckets().get(1); - bucket.assertThat().field("label").is("[2016-07-05T10:45:15.729Z - 2017-04-11T10:45:15.729Z]"); - bucket.assertThat().field("filterQuery").is("created:[\"2016-07-05T10:45:15.729Z\" TO \"2017-04-11T10:45:15.729Z\"]"); - bucket.getMetrics().get(0).assertThat().field("value").is("{count=0}"); - info = (Map) bucket.getBucketInfo(); - Assert.assertEquals(info.get("start"),"2016-07-05T10:45:15.729Z"); - Assert.assertEquals(info.get("end"),"2017-04-11T10:45:15.729Z"); - Assert.assertNull(info.get("count"),"0"); - Assert.assertEquals(info.get("startInclusive"),"true"); - Assert.assertEquals(info.get("endInclusive"),"true"); } @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) diff --git a/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java b/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java index c21b9e2c7..1d85e5f5b 100644 --- a/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java @@ -204,8 +204,6 @@ public class PivotFacetedSearchTest extends AbstractSearchTest RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); RestGenericFacetResponseModel rangeResponse = bucket.getFacets().get(0); rangeResponse.assertThat().field("type").is("range"); - assertTrue(rangeResponse.getBuckets().size()>0); - } private void assertPivotResponse(SearchResponse response, String field, String alabel) throws Exception From f979e17a68d927128dd2d65d91ec2c20b355ae46 Mon Sep 17 00:00:00 2001 From: Alessandro Benedetti Date: Thu, 3 Jan 2019 12:29:43 +0000 Subject: [PATCH 2/2] [SEARCH-1346]Fix tas tests in accordance with mincount forced to be >0 --- .../org/alfresco/rest/search/FacetRangeSearchTest.java | 6 +++--- .../org/alfresco/rest/search/PivotFacetedSearchTest.java | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java b/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java index 5a3d38299..94778377a 100644 --- a/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java @@ -247,12 +247,12 @@ public class FacetRangeSearchTest extends AbstractSearchTest assertThat(buckets.size(),is(1)); RestGenericBucketModel bucket = buckets.get(0); - bucket.assertThat().field("label").is("[2015-09-29T10:45:15.729Z - 2016-07-05T10:45:15.729Z)"); - bucket.assertThat().field("filterQuery").is("created:[\"2015-09-29T10:45:15.729Z\" TO \"2016-07-05T10:45:15.729Z\">"); + bucket.assertThat().field("label").is("[2015-09-29T10:45:15.729Z - 2017-04-11T10:45:15.729Z)"); + bucket.assertThat().field("filterQuery").is("created:[\"2015-09-29T10:45:15.729Z\" TO \"2017-04-11T10:45:15.729Z\">"); bucket.getMetrics().get(0).assertThat().field("value").is("{count=1}"); Map info = (Map) bucket.getBucketInfo(); Assert.assertEquals(info.get("start"),"2015-09-29T10:45:15.729Z"); - Assert.assertEquals(info.get("end"),"2016-07-05T10:45:15.729Z"); + Assert.assertEquals(info.get("end"),"2017-04-11T10:45:15.729Z"); Assert.assertNull(info.get("count"),"1"); Assert.assertEquals(info.get("startInclusive"),"true"); Assert.assertEquals(info.get("endInclusive"),"false"); diff --git a/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java b/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java index 1d85e5f5b..070a7b9ed 100644 --- a/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/PivotFacetedSearchTest.java @@ -18,8 +18,8 @@ */ package org.alfresco.rest.search; -import static org.junit.Assert.assertTrue; - +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -167,6 +167,9 @@ public class PivotFacetedSearchTest extends AbstractSearchTest public void searchWithRangePivoting() throws Exception { SearchRequest query = carsQuery(); + + String endDate = LocalDateTime.now() + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")); //the car document is created at runtime, so to include it in range facets end date must be now Pagination pagination = new Pagination(); pagination.setMaxItems(2); @@ -181,7 +184,7 @@ public class PivotFacetedSearchTest extends AbstractSearchTest RestRequestRangesModel facetRangeModel = new RestRequestRangesModel(); facetRangeModel.setField("created"); facetRangeModel.setStart("2015-09-29T10:45:15.729Z"); - facetRangeModel.setEnd("2016-09-29T10:45:15.729Z"); + facetRangeModel.setEnd(endDate); facetRangeModel.setGap("+280DAY"); facetRangeModel.setLabel("aRange"); List ranges = new ArrayList();