From 5df43bfd2787fc11783a09fa8b6a054f7a4ca247 Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Fri, 12 Jul 2019 14:03:26 +0100 Subject: [PATCH 1/2] SEARCH-1743 Added 62n Test Group and to the score tests --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 2 ++ .../searchServices/cmis/SolrSearchScoreQueryTests.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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..8ccd8d141 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -18,6 +18,8 @@ public @interface TestGroup public static final String CMIS = "cmis"; public static final String REST_API = "rest-api"; + + public static String QUERIES = "queries"; public static final String PREUPGRADE = "pre-upgrade"; public static final String POSTUPGRADE = "post-upgrade"; diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java index 444e4939b..fb204ee61 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java @@ -2,10 +2,11 @@ package org.alfresco.test.search.functional.searchServices.cmis; import java.math.BigDecimal; +import org.alfresco.search.TestGroup; import org.alfresco.utility.data.provider.XMLDataConfig; import org.alfresco.utility.data.provider.XMLTestData; import org.alfresco.utility.data.provider.XMLTestDataProvider; -import org.alfresco.utility.model.TestGroup; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -112,7 +113,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest * Verify that all SCORE results are between 0 and 1 * @throws Exception */ - @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES, TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryInRange() throws Exception { @@ -137,7 +138,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest * Verify that all SCORE results are between 0 and 1 * @throws Exception */ - @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES, TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryAliasInRange() throws Exception { From 23bd7fea65c8f141df6df8b34c932661f1371a7b Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Fri, 12 Jul 2019 15:02:57 +0100 Subject: [PATCH 2/2] SEARCH-1743 removed the queries group from tests and test group class --- .../src/main/java/org/alfresco/search/TestGroup.java | 2 -- .../searchServices/cmis/SolrSearchScoreQueryTests.java | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) 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 8ccd8d141..3d82775f7 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -18,8 +18,6 @@ public @interface TestGroup public static final String CMIS = "cmis"; public static final String REST_API = "rest-api"; - - public static String QUERIES = "queries"; public static final String PREUPGRADE = "pre-upgrade"; public static final String POSTUPGRADE = "post-upgrade"; diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java index fb204ee61..3d9224df7 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchScoreQueryTests.java @@ -62,7 +62,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest * Verify that results are ordered * @throws Exception */ - @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { TestGroup.ASS_14 }, dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryOrdered() throws Exception { @@ -88,7 +88,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest * Verify that results are inverse ordered * @throws Exception */ - @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { TestGroup.ASS_14 }, dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryOrderedDesc() throws Exception { @@ -113,7 +113,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest * Verify that all SCORE results are between 0 and 1 * @throws Exception */ - @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES, TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { TestGroup.ASS_14, TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryInRange() throws Exception { @@ -138,7 +138,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest * Verify that all SCORE results are between 0 and 1 * @throws Exception */ - @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES, TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { TestGroup.ASS_14, TestGroup.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryAliasInRange() throws Exception { @@ -164,7 +164,7 @@ public class SolrSearchScoreQueryTests extends AbstractCmisE2ETest * Currently only supported with double quotes * @throws Exception */ - @Test(groups = { TestGroup.ASS_14, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { TestGroup.ASS_14 }, dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryScoreAsAlias() throws Exception {