From 33f9ecf194a171a2843bae1e260c8d4ce5c682c2 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Fri, 17 Mar 2017 14:00:51 +0100 Subject: [PATCH] SEARCH-339: Updating the interval tests with new response --- .../rest/search/FacetIntervalSearchTest.java | 37 ++++++++++--------- .../rest/search/FacetedSearchTest.java | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java b/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java index 5b66fbcb2..f472bff18 100644 --- a/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/FacetIntervalSearchTest.java @@ -95,21 +95,22 @@ public class FacetIntervalSearchTest extends AbstractSearchTest SearchResponse response = query(query); response.assertThat().entriesListIsNotEmpty(); - response.getContext().assertThat().field("facetIntervals").isNotEmpty(); - RestResultBucketsModel resultBucketsModel = response.getContext().getFacetIntervals().get(0); + response.getContext().assertThat().field("facets").isNotEmpty(); + RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); - FacetFieldBucket bucket = resultBucketsModel.getBuckets().get(0); - Assert.assertEquals(resultBucketsModel.getBuckets().size(), 2); + RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); + Assert.assertEquals(facetResponseModel.getBuckets().size(), 2); bucket.assertThat().field("label").is("aUser"); - bucket.assertThat().field("count").isGreaterThan(1); bucket.assertThat().field("filterQuery").is("creator:[a,user]"); + bucket.getMetrics().get(0).assertThat().field("type").is("count"); + bucket.getMetrics().get(0).assertThat().field("value").contains("{count="); - bucket = resultBucketsModel.getBuckets().get(1); + bucket = facetResponseModel.getBuckets().get(1); bucket.assertThat().field("label").is("theRest"); - bucket.assertThat().field("count").isLessThan(1); bucket.assertThat().field("filterQuery").is("creator:(user,z]"); - + bucket.getMetrics().get(0).assertThat().field("type").is("count"); + bucket.getMetrics().get(0).assertThat().field("value").is("{count=0}"); } @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) @@ -137,23 +138,25 @@ public class FacetIntervalSearchTest extends AbstractSearchTest SearchResponse response = query(query); response.assertThat().entriesListIsNotEmpty(); - response.getContext().assertThat().field("facetIntervals").isNotEmpty(); - RestResultBucketsModel resultBucketsModel = response.getContext().getFacetIntervals().get(0); + response.getContext().assertThat().field("facets").isNotEmpty(); + RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); - resultBucketsModel.assertThat().field("label").is("modified"); - FacetFieldBucket bucket = resultBucketsModel.getBuckets().get(0); - Assert.assertEquals(resultBucketsModel.getBuckets().size(), 2); + facetResponseModel.assertThat().field("label").is("modified"); + RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); + Assert.assertEquals(facetResponseModel.getBuckets().size(), 2); bucket.assertThat().field("label").is("From2016"); - bucket.assertThat().field("count").isGreaterThan(1); bucket.assertThat().field("filterQuery").is("cm:modified:[2016,now]"); + bucket.getMetrics().get(0).assertThat().field("type").is("count"); + bucket.getMetrics().get(0).assertThat().field("value").contains("{count="); - bucket = resultBucketsModel.getBuckets().get(1); + + bucket = facetResponseModel.getBuckets().get(1); bucket.assertThat().field("label").is("Before2016"); - bucket.assertThat().field("count").isLessThan(1); bucket.assertThat().field("filterQuery").is("cm:modified:[*,2016)"); - + bucket.getMetrics().get(0).assertThat().field("type").is("count"); + bucket.getMetrics().get(0).assertThat().field("value").is("{count=0}"); } private SearchRequest carsQuery() diff --git a/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java b/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java index 2f6fd696c..6b8424d55 100644 --- a/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java +++ b/e2e-test/java/org/alfresco/rest/search/FacetedSearchTest.java @@ -121,7 +121,7 @@ public class FacetedSearchTest extends AbstractSearchTest .and().field("filterQuery").is("content.size:[102400 TO 1048576]"); //We don't expect to see the FacetFields if group is being used. Assert.assertNull(response.getContext().getFacetsFields()); - Assert.assertNull(response.getContext().getFacetIntervals()); + Assert.assertNull(response.getContext().getFacets()); } @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH , TestGroup.ASS_1}) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH ,TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION,