diff --git a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java index 3d82775f7..3a6757b48 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -26,7 +26,6 @@ public @interface TestGroup public static final String ASS_1 = "ASS_1.0.0"; // Alfresco Search Services 1.0. Does not work with Solr4 public static final String ASS_112 = "ASS_1.1.2"; // Alfresco Search Services 1.1.2 public static final String ASS_12 = "ASS_1.2.0"; // Alfresco Search Services 1.2 - public static final String PreASS_121 = "PreASS_1.2.1"; // Alfresco Search Services Prior to ASS 1.2.1 public static final String ASS_121 = "ASS_1.2.1"; // Alfresco Search Services 1.2.1 public static final String ASS_13 = "ASS_1.3.0"; // Alfresco Search Services 1.3 public static final String ASS_1302 = "ASS_1.3.0.2"; // Alfresco Search Services 1.3.0.2 (Fingerprint MNT) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java index 415a6e388..ce5f46110 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetRangeSearchTest.java @@ -122,227 +122,6 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest facetRangeModel.setGap("100"); } - - @SuppressWarnings("unchecked") - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }, executionType = ExecutionType.REGRESSION, - description = "Check basic facet range search api") - public void searchWithRangePreASS121()throws Exception - { - SearchRequest query = createQuery("* AND SITE:'" + testSite.getId() + "'"); - - RestRequestRangesModel facetRangeModel = new RestRequestRangesModel(); - facetRangeModel.setField("content.size"); - facetRangeModel.setStart("0"); - facetRangeModel.setEnd("200"); - facetRangeModel.setGap("20"); - List ranges = new ArrayList<>(); - ranges.add(facetRangeModel); - query.setRanges(ranges); - SearchResponse response = query(query); - response.assertThat().entriesListIsNotEmpty(); - response.getContext().assertThat().field("facets").isNotEmpty(); - RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); - - RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); - bucket.assertThat().field("label").is("[0 - 20)"); - bucket.assertThat().field("filterQuery").is("content.size:[\"0\" TO \"20\">"); - Map metric = (Map) bucket.getMetrics().get(0).getValue(); - assertEquals(Integer.valueOf(metric.get("count")).intValue(), 0, "Unexpected count for first bucket."); - Map info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"0"); - assertEquals(info.get("end"),"20"); - assertNull(info.get("count")); - assertEquals(info.get("startInclusive"),"true"); - assertEquals(info.get("endInclusive"),"false"); - - bucket = facetResponseModel.getBuckets().get(1); - bucket.assertThat().field("label").is("[20 - 40)"); - bucket.assertThat().field("filterQuery").is("content.size:[\"20\" TO \"40\">"); - metric = (Map) bucket.getMetrics().get(0).getValue(); - assertEquals(Integer.valueOf(metric.get("count")).intValue(), 2, "Unexpected count for second bucket."); - info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"20"); - assertEquals(info.get("end"),"40"); - assertEquals(info.get("startInclusive"),"true"); - assertEquals(info.get("endInclusive"),"false"); - } - - @SuppressWarnings("unchecked") - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }, executionType = ExecutionType.REGRESSION, - description = "Check date facet intervals search api") - public void searchWithRangeHardendPreASS121()throws Exception - { - SearchRequest query = createQuery("A*"); - - RestRequestRangesModel facetRangeModel = new RestRequestRangesModel(); - facetRangeModel.setField("content.size"); - facetRangeModel.setStart("0"); - facetRangeModel.setEnd("500"); - facetRangeModel.setGap("200"); - facetRangeModel.setHardend(true); - List ranges = new ArrayList(); - ranges.add(facetRangeModel); - query.setRanges(ranges); - SearchResponse response = query(query); - response.assertThat().entriesListIsNotEmpty(); - response.getContext().assertThat().field("facets").isNotEmpty(); - RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); - - RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); - bucket.assertThat().field("label").is("[0 - 200)"); - bucket.assertThat().field("filterQuery").is("content.size:[\"0\" TO \"200\">"); - Map metric = (Map) bucket.getMetrics().get(0).getValue(); - assertTrue(Integer.valueOf(metric.get("count")) >= 4); - Map info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"0"); - assertEquals(info.get("end"),"200"); - assertEquals(info.get("startInclusive"),"true"); - assertEquals(info.get("endInclusive"),"false"); - assertNull(info.get("count")); - - bucket = facetResponseModel.getBuckets().get(1); - bucket.assertThat().field("label").is("[200 - 400)"); - bucket.assertThat().field("filterQuery").is("content.size:[\"200\" TO \"400\">"); - info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"200"); - assertEquals(info.get("end"),"400"); - metric = (Map) bucket.getMetrics().get(0).getValue(); - assertTrue(Integer.valueOf(metric.get("count")) == 4); - assertNull(info.get("count")); - assertEquals(info.get("startInclusive"),"true"); - assertEquals(info.get("endInclusive"),"false"); - - bucket = facetResponseModel.getBuckets().get(2); - bucket.assertThat().field("label").is("[400 - 500]"); - bucket.assertThat().field("filterQuery").is("content.size:[\"400\" TO \"500\"]"); - metric = (Map) bucket.getMetrics().get(0).getValue(); - assertTrue(Integer.valueOf(metric.get("count")) >= 2); - info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"400"); - assertEquals(info.get("end"),"500"); - assertNull(info.get("count")); - assertEquals(info.get("startInclusive"),"true"); - assertEquals(info.get("endInclusive"),"true"); - } - @SuppressWarnings("unchecked") - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }, executionType = ExecutionType.REGRESSION, - description = "Check date facet intervals search api") - public void searchDateRangePreASS121()throws Exception - { - SearchRequest query = createQuery("name:A*"); - - RestRequestRangesModel facetRangeModel = new RestRequestRangesModel(); - facetRangeModel.setField("created"); - facetRangeModel.setStart("2015-09-29T10:45:15.729Z"); - facetRangeModel.setEnd("2016-09-29T10:45:15.729Z"); - facetRangeModel.setGap("+280DAY"); - List ranges = new ArrayList(); - ranges.add(facetRangeModel); - query.setRanges(ranges); - SearchResponse response = query(query); - response.assertThat().entriesListIsNotEmpty(); - response.getContext().assertThat().field("facets").isNotEmpty(); - RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); - - List buckets = facetResponseModel.getBuckets(); - assertThat(buckets.size(),is(2)); - - 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}"); - Map info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"2015-09-29T10:45:15.729Z"); - assertEquals(info.get("end"),"2016-07-05T10:45:15.729Z"); - assertNull(info.get("count"),"Expecting count to be null"); - assertEquals(info.get("startInclusive"),"true"); - assertEquals(info.get("endInclusive"),"false"); - } - - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }, executionType = ExecutionType.REGRESSION, - description = "Check date facet intervals search api") - public void searchDateAndSizeRangesPreASS121()throws Exception - { - SearchRequest query = createQuery("name:A*"); - List ranges = new ArrayList(); - RestRequestRangesModel facetRangeModel = new RestRequestRangesModel(); - facetRangeModel.setField("created"); - facetRangeModel.setStart("2015-09-29T10:45:15.729Z"); - facetRangeModel.setEnd("2016-09-29T10:45:15.729Z"); - facetRangeModel.setGap("+280DAY"); - ranges.add(facetRangeModel); - RestRequestRangesModel facetCountRangeModel = new RestRequestRangesModel(); - facetCountRangeModel.setField("content.size"); - facetCountRangeModel.setStart("0"); - facetCountRangeModel.setEnd("500"); - facetCountRangeModel.setGap("200"); - ranges.add(facetCountRangeModel); - query.setRanges(ranges); - } - - @SuppressWarnings("unchecked") - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.PreASS_121 }, executionType = ExecutionType.REGRESSION, - description = "Check basic facet range search api") - public void searchWithRangeAndIncludeUpperBoundPreASS121()throws Exception - { - SearchRequest query = createQuery("A*"); - - RestRequestRangesModel facetRangeModel = new RestRequestRangesModel(); - facetRangeModel.setField("content.size"); - facetRangeModel.setStart("0"); - facetRangeModel.setEnd("500"); - facetRangeModel.setGap("200"); - List include = new ArrayList(); - include.add("upper"); - facetRangeModel.setInclude(include); - List ranges = new ArrayList(); - ranges.add(facetRangeModel); - query.setRanges(ranges); - SearchResponse response = query(query); - response.assertThat().entriesListIsNotEmpty(); - response.getContext().assertThat().field("facets").isNotEmpty(); - RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); - - RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); - bucket.assertThat().field("label").is("(0 - 200]"); - bucket.assertThat().field("filterQuery").is("content.size:<\"0\" TO \"200\"]"); - Map metric = (Map) bucket.getMetrics().get(0).getValue(); - assertTrue(Integer.valueOf(metric.get("count")) >= 4); - Map info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"0"); - assertEquals(info.get("end"),"200"); - assertNull(info.get("count")); - assertEquals(info.get("startInclusive"),"false"); - assertEquals(info.get("endInclusive"),"true"); - - bucket = facetResponseModel.getBuckets().get(1); - bucket.assertThat().field("label").is("(200 - 400]"); - bucket.assertThat().field("filterQuery").is("content.size:<\"200\" TO \"400\"]"); - metric = (Map) bucket.getMetrics().get(0).getValue(); - Integer count = Integer.valueOf(metric.get("count")); - assertTrue(count == 4); - info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"200"); - assertEquals(info.get("end"),"400"); - assertEquals(info.get("startInclusive"),"false"); - assertEquals(info.get("endInclusive"),"true"); - - bucket = facetResponseModel.getBuckets().get(2); - bucket.assertThat().field("label").is("(400 - 600]"); - bucket.assertThat().field("filterQuery").is("content.size:<\"400\" TO \"600\"]"); - metric = (Map) bucket.getMetrics().get(0).getValue(); - assertTrue(Integer.valueOf(metric.get("count")) >= 5); - info = (Map) bucket.getBucketInfo(); - assertEquals(info.get("start"),"400"); - assertEquals(info.get("end"),"600"); - assertEquals(info.get("startInclusive"),"false"); - assertEquals(info.get("endInclusive"),"true"); - } @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION,