From ce801db7737852de75561efd8dffd809bcb179a1 Mon Sep 17 00:00:00 2001 From: Keerat Date: Wed, 29 Apr 2020 15:44:12 +0100 Subject: [PATCH] SEARCH-2121 Adding test group to the @test annotation and not in the test rail --- .../searchServices/search/FacetRangeSearchTest.java | 12 ++++++------ .../searchServices/search/FacetedSearchTest.java | 4 ++-- .../search/PivotFacetedSearchTest.java | 4 ++-- .../functional/searchServices/search/SearchTest.java | 8 ++++---- .../searchServices/search/StatsSearchTest.java | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) 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 0639dc902..a44644c43 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 @@ -109,8 +109,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest .containsSummary(String.format(RestErrorModel.MANDATORY_PARAM, "gap")); } - @Test - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}, executionType = ExecutionType.REGRESSION, + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check basic facet range search api") @SuppressWarnings("unchecked") public void searchWithRange() @@ -159,8 +159,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest assertEquals(info.get("endInclusive"), "true"); } - @Test - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER }, executionType = ExecutionType.REGRESSION, + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check date facet intervals search api") @SuppressWarnings("unchecked") public void searchWithRangeHardend() @@ -257,8 +257,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest query.setRanges(ranges); } - @Test - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}, executionType = ExecutionType.REGRESSION, + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check basic facet range search api") @SuppressWarnings("unchecked") public void searchWithRangeAndIncludeUpperBound() diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java index 4c88a08af..650be58a9 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java @@ -102,8 +102,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file4.getContent(), true); } - @Test - @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER }, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api") + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api") public void searchWithQueryFaceting() throws Exception { SearchRequest query = new SearchRequest(); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java index fd266608f..21963b825 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/PivotFacetedSearchTest.java @@ -119,8 +119,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest assertPivotResponse(response, "creator", null); } - @Test - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}, + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks nested pivot using Search api") public void searchWithNestedPivoting() diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java index da43c03f3..f1f8935d5 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java @@ -101,8 +101,8 @@ public class SearchTest extends AbstractSearchServicesE2ETest response.getContext().assertThat().field("request").isNotEmpty(); } - @Test - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER }, executionType = ExecutionType.REGRESSION, + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Tests a search request containing a sort clause.") public void searchWithOneSortClause() { @@ -148,8 +148,8 @@ public class SearchTest extends AbstractSearchServicesE2ETest * The first clause has always the same value for all matches so the test makes sure the request is correctly * processed and the returned order is determined by the second clause. */ - @Test - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}, executionType = ExecutionType.REGRESSION, + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Tests a search request containing a sort clause.") public void searchWithTwoSortClauses() { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java index 1c8bfb600..7ba363b80 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java @@ -203,8 +203,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest assertTrue((Integer)metricCount.get("countValues") > count, "With the exclude filter there will be more documents than returned"); } - @Test - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}, + @Test(groups={TestGroup.CONFIG_DISABLE_CASCADE_TRACKER}) + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks errors with stats with Pivot using Search api") public void searchWithStatsAndMutlilevelPivot()