From 5df43bfd2787fc11783a09fa8b6a054f7a4ca247 Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Fri, 12 Jul 2019 14:03:26 +0100 Subject: [PATCH 01/23] 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 02/23] 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 { From 12e3306a133d2016c707ba70190c8464e8ff6267 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Tue, 16 Jul 2019 12:30:22 +0000 Subject: [PATCH 03/23] [maven-release-plugin] prepare release 1.4.0-nexus --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9ea84341b..938b877b5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - HEAD + 1.4.0-nexus search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 2a30694a5..c37036bb5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-SNAPSHOT + 1.4.0-nexus servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index f3975e2f8..3470a8b4c 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d8ddf0ae7..d290bd283 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 8972f3c9c..f0d0a9577 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus pom Alfresco Solr Search parent From 633f6a39a2972c009284a8abf11ab3ba8a05f02d Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Tue, 16 Jul 2019 12:30:25 +0000 Subject: [PATCH 04/23] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 938b877b5..77317acc6 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-nexus + 1.1.0-SNAPSHOT pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - 1.4.0-nexus + HEAD search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index c37036bb5..65dc04235 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.1.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-nexus + 1.1.0-SNAPSHOT servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 3470a8b4c..cb8c04c81 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.1.0-SNAPSHOT diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d290bd283..81fc6cad4 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.1.0-SNAPSHOT ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index f0d0a9577..fd30e1662 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-nexus + 1.1.0-SNAPSHOT org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.1.0-SNAPSHOT pom Alfresco Solr Search parent From d49ed3eca334e890f2b25bda4f1315901e39df11 Mon Sep 17 00:00:00 2001 From: Angel Borroy Date: Tue, 16 Jul 2019 15:31:20 +0200 Subject: [PATCH 05/23] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit d162c8d4a540345cc20bb50aa7a7dacb775bee29. --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 77317acc6..938b877b5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.1.0-SNAPSHOT + 1.4.0-nexus pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - HEAD + 1.4.0-nexus search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 65dc04235..c37036bb5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.1.0-SNAPSHOT + 1.4.0-nexus ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.1.0-SNAPSHOT + 1.4.0-nexus servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index cb8c04c81..3470a8b4c 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.1.0-SNAPSHOT + 1.4.0-nexus diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 81fc6cad4..d290bd283 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.1.0-SNAPSHOT + 1.4.0-nexus ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index fd30e1662..f0d0a9577 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.1.0-SNAPSHOT + 1.4.0-nexus org.alfresco alfresco-search-parent - 1.1.0-SNAPSHOT + 1.4.0-nexus pom Alfresco Solr Search parent From eb7fa151913e0a5b4aad9dc03082c1e758815182 Mon Sep 17 00:00:00 2001 From: Angel Borroy Date: Tue, 16 Jul 2019 15:31:25 +0200 Subject: [PATCH 06/23] Revert "[maven-release-plugin] prepare release 1.4.0-nexus" This reverts commit f4b55f4dae9a29bffa929d87772528f09cb87563. --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 938b877b5..9ea84341b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - 1.4.0-nexus + HEAD search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index c37036bb5..2a30694a5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-nexus + 1.4.0-SNAPSHOT servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 3470a8b4c..f3975e2f8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d290bd283..d8ddf0ae7 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index f0d0a9577..8972f3c9c 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT pom Alfresco Solr Search parent From 40c4bddb26787a5d18de6b8538db760b57f84ff7 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Tue, 16 Jul 2019 14:22:11 +0000 Subject: [PATCH 07/23] [maven-release-plugin] prepare release 1.4.0-nexus-3 --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9ea84341b..11151b4f8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus-3 pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - HEAD + 1.4.0-nexus-3 search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 2a30694a5..8c07a3ca1 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus-3 ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-SNAPSHOT + 1.4.0-nexus-3 servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index f3975e2f8..75c51c6d7 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus-3 diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d8ddf0ae7..1779c5b9c 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus-3 ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 8972f3c9c..57998c337 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus-3 org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus-3 pom Alfresco Solr Search parent From 8de2ad836d941ce6d07ce8f582630453fd0e5491 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Tue, 16 Jul 2019 14:22:13 +0000 Subject: [PATCH 08/23] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 11151b4f8..9ea84341b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-nexus-3 + 1.4.0-SNAPSHOT pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - 1.4.0-nexus-3 + HEAD search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 8c07a3ca1..2a30694a5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus-3 + 1.4.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-nexus-3 + 1.4.0-SNAPSHOT servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 75c51c6d7..f3975e2f8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus-3 + 1.4.0-SNAPSHOT diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 1779c5b9c..d8ddf0ae7 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus-3 + 1.4.0-SNAPSHOT ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 57998c337..8972f3c9c 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-nexus-3 + 1.4.0-SNAPSHOT org.alfresco alfresco-search-parent - 1.4.0-nexus-3 + 1.4.0-SNAPSHOT pom Alfresco Solr Search parent From 9767787367893c035c61d9b3860db16bcddd6622 Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Wed, 17 Jul 2019 14:49:02 +0100 Subject: [PATCH 09/23] SEARCH-1639 removing tests and test groups that are not used --- .../java/org/alfresco/search/TestGroup.java | 22 +--------------- .../cmis/SolrSearchByAspectTests.java | 3 +-- .../cmis/SolrSearchByIdTests.java | 3 +-- .../cmis/SolrSearchByPathTests.java | 3 +-- .../cmis/SolrSearchByPropertyTests.java | 2 +- .../cmis/SolrSearchInFolderTests.java | 3 +-- .../cmis/SolrSearchInTreeTests.java | 3 +-- .../cmis/SolrSearchScoreQueryTests.java | 10 +++---- .../searchServices/sanity/SetupTest.java | 6 ++--- .../search/FacetFieldsSearchTest.java | 8 +++--- .../search/FacetIntervalSearchTest.java | 12 ++++----- .../search/FacetRangeSearchTest.java | 24 ++++++++--------- .../search/FacetedSearchTest.java | 17 ++++++------ .../search/FingerPrintTest.java | 8 +++--- .../search/PivotFacetedSearchTest.java | 20 +++++++------- .../search/SearchAPATHTest.java | 6 ++--- .../search/SearchHighLightTest.java | 4 +-- .../search/SearchSpellCheckTest.java | 8 +++--- .../searchServices/search/SearchTest.java | 26 +++++++++---------- .../search/SearchWithCustomModelTest.java | 10 +++---- .../searchServices/search/ShardInfoTest.java | 6 ++--- .../search/SpecialCharacterSearchTest.java | 2 +- .../search/StatsSearchTest.java | 20 +++++++------- .../search/rm/SearchServicesRME2ETest.java | 2 +- .../CascadingTrackerIntegrationTest.java | 4 +-- .../solr/SearchSolrAPITest.java | 10 +++---- e2e-test/src/test/resources/SearchSuite.xml | 15 ----------- 27 files changed, 108 insertions(+), 149 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 3a6757b48..d1213d2ba 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -9,36 +9,16 @@ import java.lang.annotation.Target; @Target({ ElementType.METHOD }) public @interface TestGroup { - public static final String SANITY = "sanity"; - public static final String REGRESSION = "regression"; - public static final String ENTERPRISE = "enterprise"; - - + // Used for TestRail test annotation public static final String SEARCH = "search"; - - public static final String CMIS = "cmis"; public static final String REST_API = "rest-api"; public static final String PREUPGRADE = "pre-upgrade"; public static final String POSTUPGRADE = "post-upgrade"; - // Search: Minimum Version Required - 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 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) - public static final String ASS_14 = "ASS_1.4.0"; // Alfresco Search Services 1.4 public static final String ASS_MASTER_SLAVE = "ASS_Master_Slave"; // Alfresco Search Services using master slave configurations public static final String ASS_MASTER ="ASS_Master"; // Alfresco search services using master/stand alone mode - public static final String INSIGHT_10 = "InsightEngine_1.0.0"; // Alfresco Insight Engine 1.0 - public static final String INSIGHT_11 = "InsightEngine_1.1.0"; // Alfresco Insight Engine 1.1 - public static final String INSIGHT_12 = "InsightEngine_1.2.0"; // Alfresco Insight Engine 1.2 - public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running - public static final String SOLR = "SOLR"; //To be used for tests for /solr/alfresco/* end-points - public static final String ACS_52n = "ACS_52n"; // Alfresco Content Services 5.2.n public static final String ACS_60n = "ACS_60n"; // Alfresco Content Services 6.0 or above public static final String ACS_61n = "ACS_61n"; // Alfresco Content Services 6.1 or above diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java index db21b1bc8..30b02e731 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByAspectTests.java @@ -128,8 +128,7 @@ public class SolrSearchByAspectTests extends AbstractCmisE2ETest Utility.waitToLoopTime(getSolrWaitTimeInSeconds()); } - @Test(groups = { TestGroup.CMIS }, - dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") @XMLDataConfig(file = "src/test/resources/testdata/search-by-aspect.xml") public void executeSearchByAspect(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java index 6da2e7f8a..d10c31fa2 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByIdTests.java @@ -86,8 +86,7 @@ public class SolrSearchByIdTests extends AbstractCmisE2ETest Utility.waitToLoopTime(getSolrWaitTimeInSeconds()); } - @Test(groups = { TestGroup.CMIS }, - dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") @XMLDataConfig(file = "src/test/resources/testdata/search-by-id.xml") public void executeSearchByAspect(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java index de74c6438..0663d59fb 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPathTests.java @@ -48,8 +48,7 @@ public class SolrSearchByPathTests extends AbstractCmisE2ETest Utility.waitToLoopTime(getSolrWaitTimeInSeconds()); } - @Test(groups = { TestGroup.CMIS }, - dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") + @Test(dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") @XMLDataConfig(file = "src/test/resources/testdata/search-by-path.xml") public void executeSearchByPathQueries(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java index f3544b4cf..70894ac57 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchByPropertyTests.java @@ -105,7 +105,7 @@ public class SolrSearchByPropertyTests extends AbstractCmisE2ETest Utility.waitToLoopTime(getSolrWaitTimeInSeconds()); } - @Test(groups = { TestGroup.CMIS }, dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") @XMLDataConfig(file = "src/test/resources/testdata/search-by-property.xml") public void executeSearchByProperty(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java index 52f7c332a..5aebcb0f7 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInFolderTests.java @@ -51,8 +51,7 @@ public class SolrSearchInFolderTests extends AbstractCmisE2ETest dataContent.deleteSite(testSite); } - @Test(groups = { TestGroup.CMIS }, - dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") @XMLDataConfig(file = "src/test/resources/testdata/search-in-folder.xml") public void executeCMISQuery(QueryModel query) throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java index 5ce7461c0..125b3335e 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/cmis/SolrSearchInTreeTests.java @@ -55,8 +55,7 @@ public class SolrSearchInTreeTests extends AbstractCmisE2ETest dataContent.deleteSite(testSite); } - @Test(groups = { TestGroup.CMIS }, - dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") + @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") @XMLDataConfig(file = "src/test/resources/testdata/search-in-tree.xml") public void executeCMISQuery(QueryModel query) throws Exception { 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 3d9224df7..36ad1eabe 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 }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(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 }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(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.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { 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.ACS_62n }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(groups = { 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 }, dependsOnMethods = "prepareDataForScoreSearch") + @Test(dependsOnMethods = "prepareDataForScoreSearch") public void scoreQueryScoreAsAlias() throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java index 70abfe3ae..b35d2db6d 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/sanity/SetupTest.java @@ -51,7 +51,7 @@ public class SetupTest extends AbstractE2EFunctionalTest } // Test CMIS API works - @Test(priority = 1, groups = { TestGroup.SANITY }) + @Test(priority = 1) public void testCMISFileCreation() throws Exception { // Create document in a folder in a collaboration site @@ -60,7 +60,7 @@ public class SetupTest extends AbstractE2EFunctionalTest } // Test Custom Model: Music can be used - @Test(priority = 2, groups = { TestGroup.SANITY }) + @Test(priority = 2) public void testModelMusicCanBeUsed() throws Exception { // Create document of custom type @@ -78,7 +78,7 @@ public class SetupTest extends AbstractE2EFunctionalTest } // Test Custom Model: Finance can be used - @Test(priority = 3, groups = { TestGroup.SANITY }) + @Test(priority = 3) public void testModelFinanceCanBeUsed() throws Exception { // Create document of custom type diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java index a8b843d63..aa053aa30 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java @@ -95,7 +95,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest waitForIndexing(htmlFile.getName(), true); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) + @Test public void testSearchFacetFieldsBucketExcludedWhenMinCount2() throws Exception { // Create Query with FacetFields: Site and Content MimeType @@ -131,7 +131,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) + @Test public void testSearchWithFacetFieldsMinCountChecks() throws Exception { SearchRequest query = new SearchRequest(); @@ -182,7 +182,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest bucket1.assertThat().field("display").is("Plain Text"); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) + @Test public void testSearchWithFacetFieldsNoFacetsWhenNoAccess() throws Exception { SearchRequest query = new SearchRequest(); @@ -206,7 +206,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest Assert.assertNull(response.getContext().getFacetsFields()); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) + @Test public void testSearchWithFacetFieldsOnlyFacetsWhereAccess() throws Exception { SearchRequest query = new SearchRequest(); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java index 0f6ab9a21..5639022ec 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetIntervalSearchTest.java @@ -50,8 +50,8 @@ public class FacetIntervalSearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file4.getContent(), true); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check facet intervals mandatory fields") public void checkingFacetsMandatoryErrorMessages()throws Exception { @@ -104,8 +104,8 @@ public class FacetIntervalSearchTest extends AbstractSearchServicesE2ETest .containsSummary("duplicate interval label [thesame=2]"); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Check basic facet intervals search api") public void searchWithBasicInterval()throws Exception { @@ -147,8 +147,8 @@ public class FacetIntervalSearchTest extends AbstractSearchServicesE2ETest bucket.getMetrics().get(0).assertThat().field("value").is("{count=0}"); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Check date facet intervals search api") public void searchWithDates() throws Exception { 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 7ebdc403c..4dfc0c2b9 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 @@ -78,8 +78,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file4.getContent(), true); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Check facet intervals mandatory fields") public void checkingFacetsMandatoryErrorMessages() { @@ -123,8 +123,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest facetRangeModel.setGap("100"); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Check basic facet range search api") @SuppressWarnings("unchecked") public void searchWithRange() @@ -178,8 +178,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest 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, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Check date facet intervals search api") @SuppressWarnings("unchecked") public void searchWithRangeHardend() @@ -238,8 +238,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest } /** This test relies on a document created in 2015 existing, probably part of the sample site. */ - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Check date facet intervals search api") @SuppressWarnings("unchecked") public void searchDateRange() @@ -274,8 +274,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest assertEquals(info.get("endInclusive"),"true"); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Check date facet intervals search api") public void searchDateAndSizeRanges() { @@ -296,8 +296,8 @@ public class FacetRangeSearchTest extends AbstractSearchServicesE2ETest query.setRanges(ranges); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_121 }, executionType = ExecutionType.REGRESSION, + @Test + @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 48e440962..ce389980d 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,9 +102,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file4.getContent(), true); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH, - TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api") + @Test + @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(); @@ -182,8 +181,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest * } * }} */ - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH , TestGroup.ASS_1}) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH ,TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api") public void searchQueryFacetingWithGroup() throws Exception { @@ -247,8 +246,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest * } * } */ - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH , TestGroup.ASS_1}) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH ,TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api") public void searchWithFactedFields() throws Exception { @@ -293,8 +292,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest * "facetFormat":"V2" * } */ - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH , TestGroup.ASS_1}) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH ,TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks facet queries for the Search api") public void searchWithFactedFieldsFacetFormatV2() throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java index 19472582b..77ebc165f 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FingerPrintTest.java @@ -75,7 +75,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest waitForIndexing("FINGERPRINT:" + file3.getNodeRefWithoutVersion(), true); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1302 }) + @Test @Bug(id = "MNT-20449") public void makeSureFingerprintQueryWorksAfterMetadataUpdate() throws Exception { @@ -106,7 +106,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest * to the files loaded as part of this test. * Note that for fingerprint to work it need a 5 word sequence. */ - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) + @Test public void search() { String uuid = file1.getNodeRefWithoutVersion(); @@ -133,7 +133,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest } } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) + @Test public void searchSimilar() { String uuid = file2.getNodeRefWithoutVersion(); @@ -163,7 +163,7 @@ public class FingerPrintTest extends AbstractE2EFunctionalTest } } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) + @Test public void searchSimilar67Percent() { String uuid = file2.getNodeRefWithoutVersion(); 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 76cb247f9..c99a89ae4 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 @@ -57,8 +57,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file4.getContent(), true); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks errors with pivot using Search api") public void searchWithPivotingErrors() @@ -90,8 +90,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest .containsSummary("Pivot parameter none_like_this does not reference"); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks with pivot using Search api") public void searchWithPivoting() @@ -119,8 +119,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest assertPivotResponse(response, "creator", null); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks nested pivot using Search api") public void searchWithNestedPivoting() @@ -176,8 +176,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest creatorResponse.assertThat().field("label").is("creator"); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks range pivots using Search api") public void searchWithRangePivoting() @@ -240,8 +240,8 @@ public class PivotFacetedSearchTest extends AbstractSearchServicesE2ETest Assert.assertTrue(bucket.getMetrics().get(0).getValue().toString().contains("{count=")); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks with pivot using Search api and a label as a key") public void searchWithPivotingUsingLabel() diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java index 07ba186e5..33592222e 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAPATHTest.java @@ -93,7 +93,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest *}} * */ - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_1}) + @Test public void searchLevel0() { SearchRequest searchQuery = searchRequestWithAPATHFacet("name:*", "0"); @@ -105,7 +105,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest buckets.forEach(bucket -> bucket.assertThat().field("label").contains("0/")); } - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_1}) + @Test public void searchLevel0andIncludeSubLevel1() { SearchRequest searchQuery = searchRequestWithAPATHFacet("name:*", "1/"); @@ -117,7 +117,7 @@ public class SearchAPATHTest extends AbstractSearchServicesE2ETest getFirstBucket(response).assertThat().field("label").contains("1/"); } - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_1}) + @Test public void searchLevel2() { String queryString = "name:cars"; diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java index 8da1e9148..87073f439 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java @@ -40,7 +40,7 @@ public class SearchHighLightTest extends AbstractSearchServicesE2ETest searchServicesDataPreparation(); } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API }) + @Test @Bug(id = "TAS-3220") public void searchWithHighLight() throws Exception { @@ -63,7 +63,7 @@ public class SearchHighLightTest extends AbstractSearchServicesE2ETest hl.assertThat().field("snippets").contains("The landrover discovery is not a sports ¿car?"); } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API }) + @Test public void searchNonIndexedData() throws Exception { RestRequestQueryModel queryReq = new RestRequestQueryModel(); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java index 7ca8b79a3..0f5678065 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java @@ -72,7 +72,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest * "entries": [...] * } */ - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=1) + @Test(groups={ TestGroup.ACS_60n}, priority=1) public void testSearchMissSpelled() throws Exception { waitForContentIndexing(file4.getContent(), true); @@ -127,7 +127,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest * "spellcheck": {"query": "alfrezco"} * } */ - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=2) + @Test(groups={TestGroup.ACS_60n}, priority=2) public void testSearchMissSpelledVersion2() { SearchRequest searchReq = new SearchRequest(); @@ -141,7 +141,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest assertResponse(query(searchReq)); } - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=3) + @Test(groups={ TestGroup.ACS_60n}, priority=3) public void testSearchWithSpellcheckerAndCorrectSpelling() { SearchRequest searchReq = new SearchRequest(); @@ -155,7 +155,7 @@ public class SearchSpellCheckTest extends AbstractSearchServicesE2ETest res.assertThat().entriesListIsNotEmpty(); } - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n}, priority=4) + @Test(groups={TestGroup.ACS_60n}, priority=4) public void testSpellCheckType() throws Exception { // Create a file with mis-spelt name, expect spellcheck type = didYouMean 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 1700d2287..2971c0155 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 @@ -63,7 +63,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file4.getContent(), true); } - @Test(groups={TestGroup.SEARCH, TestGroup.REST_API}) + @Test public void searchOnIndexedData() throws Exception { SearchResponse nodes = query("cm:content:" + unique_searchString); @@ -76,7 +76,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest Assert.assertEquals(entity.getName(),"pangram.txt"); } - @Test(groups={TestGroup.SEARCH,TestGroup.REST_API}) + @Test public void searchNonIndexedData() { SearchResponse nodes = query("yeti"); @@ -84,8 +84,8 @@ public class SearchTest extends AbstractSearchServicesE2ETest nodes.assertThat().entriesListIsEmpty(); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks its possible to include the original request in the response") public void searchWithRequest() { @@ -101,8 +101,8 @@ public class SearchTest extends AbstractSearchServicesE2ETest response.getContext().assertThat().field("request").isNotEmpty(); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @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(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, executionType = ExecutionType.REGRESSION, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Tests a search request containing a sort clause.") public void searchWithTwoSortClauses() { @@ -192,7 +192,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest .collect(Collectors.toList())); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n, TestGroup.ASS_14 }) + @Test @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n }, executionType = ExecutionType.REGRESSION, description = "Checks the \"include\" request parameter support the 'permissions' option") @@ -217,7 +217,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest restClient.onResponse().assertThat().body("list.entries[0].entry.permissions", nullValue()); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n, TestGroup.ASS_14 }) + @Test(groups = { TestGroup.ACS_61n }) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n }, executionType = ExecutionType.REGRESSION, description = "Checks the \"include\" request parameter support the 'isLocked' option") public void searchQuery_includeIsLocked_shouldReturnNodeWithLockInformation() throws Exception { @@ -251,7 +251,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest restClient.onResponse().assertThat().body("list.entries[0].entry.isLocked", nullValue()); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n, TestGroup.ASS_14 }) + @Test(groups = { TestGroup.ACS_61n }) @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n }, executionType = ExecutionType.REGRESSION, description = "Checks the \"include\" request parameter does not support the 'notValid' option") public void searchQuery_includeInvalid_shouldReturnBadResponse() @@ -270,7 +270,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest } // Test that when fields parameter is set, only restricted fields appear in the response - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) + @Test public void searchWithFields() { SearchRequest query = new SearchRequest(); @@ -293,7 +293,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest restClient.onResponse().assertThat().body("list.entries.entry[0].id", Matchers.nullValue()); } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API }) + @Test public void searchSpecialCharacters() throws Exception { // Create a file with Special Characters diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java index 72cc13614..7875f1680 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchWithCustomModelTest.java @@ -114,7 +114,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest } // Search-1359: Search AFTS Query with Range - @Test(priority = 1, groups = { TestGroup.ASS_14 }) + @Test(priority = 1) public void testRangeQueryTextField() { // Search Range Query @@ -138,7 +138,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest Assert.assertEquals(response.getPagination().getCount(), 2); } - @Test(priority = 2, groups = { TestGroup.ASS_14 }) + @Test(priority = 2) public void testRangeQueryTextFieldWhiteSpace() { SearchResponse response = queryAsUser(testUser, "finance:Emp:[* TO Daniel]"); @@ -159,7 +159,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest Assert.assertEquals(response.getPagination().getCount(), 2); } - @Test(priority = 3, groups = { TestGroup.ASS_14 }) + @Test(priority = 3) public void testRangeQueryTextFieldNonFacetable() { // Search Range Query @@ -186,7 +186,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest Assert.assertEquals(response.getPagination().getCount(), 2); } - @Test(priority = 4, groups = { TestGroup.ASS_14 }) + @Test(priority = 4) public void testRangeQueryTextFieldNotTockenised() { SearchResponse response = queryAsUser(testUser, "finance:Desc:[* TO David]"); @@ -207,7 +207,7 @@ public class SearchWithCustomModelTest extends AbstractE2EFunctionalTest Assert.assertEquals(response.getPagination().getCount(), 2); } - @Test(priority = 5, groups = { TestGroup.ASS_14 }) + @Test(priority = 5) public void testRangeQueryDoubleField() { // Search Range Query diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 6c1be26a4..74fbcf971 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -40,7 +40,7 @@ import org.springframework.http.HttpStatus; public class ShardInfoTest extends AbstractE2EFunctionalTest { /* The test that will be excluded when running master slave setup, excluding the ASS_MASTER test group. */ - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n, TestGroup.ASS_MASTER }) + @Test(groups = { TestGroup.ACS_60n, TestGroup.ASS_MASTER }) public void getShardInfoWithAdminAuthority() throws JsonProcessingException { RestShardInfoModelCollection info = restClient.authenticateUser(dataUser.getAdminUser()).withShardInfoAPI() @@ -83,7 +83,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest } /* The test that will be run when in master slave setup by including the ASS_MASTER_SLAVE test group. */ - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n, TestGroup.ASS_MASTER_SLAVE }) + @Test(groups = {TestGroup.ACS_60n, TestGroup.ASS_MASTER_SLAVE }) public void getShardInfoWithAdminAuthorityMasterSlaveConfig() throws JsonProcessingException { RestShardInfoModelCollection info = restClient.authenticateUser(dataUser.getAdminUser()).withShardInfoAPI() @@ -120,7 +120,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest } } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n }) + @Test(groups = { TestGroup.ACS_60n }) public void getShardInfoWithoutAdminAuthority() throws Exception { restClient.authenticateUser(dataUser.createRandomTestUser()).withShardInfoAPI().getInfo(); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java index 9153da8ca..226e39b3c 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SpecialCharacterSearchTest.java @@ -40,7 +40,7 @@ public class SpecialCharacterSearchTest extends AbstractE2EFunctionalTest * The goal is to check that the file is actually indexed in solr. * @throws Exception */ - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_52n, TestGroup.ACS_60n, TestGroup.ACS_61n }) + @Test(groups = { TestGroup.ACS_52n, TestGroup.ACS_60n, TestGroup.ACS_61n }) @Bug(id = "MNT-20507") public void testIndexDELChar() throws Exception { 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 90adddf9b..fc48b425f 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 @@ -64,8 +64,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest waitForContentIndexing(file2.getContent(), true); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks errors with stats using Search api") public void searchWithBasicStats() @@ -148,8 +148,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest assertTrue(percentiles.keySet().containsAll(Arrays.asList("1.0","75.0","99.0","99.9"))); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks errors with stats labels using Search api") public void searchWithStatsLabel() @@ -168,8 +168,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest assertStatsFacetedResponse(response, "DateChanged", 8); } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH }, executionType = ExecutionType.REGRESSION, description = "Checks errors with stats fitlers using Search api") public void searchWithStatsFilters() @@ -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(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks errors with stats with Pivot using Search api") public void searchWithStatsAndMutlilevelPivot() @@ -266,8 +266,8 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest } - @Test(groups = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }) - @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ASS_1 }, + @Test + @TestRail(section = {TestGroup.REST_API, TestGroup.SEARCH}, executionType = ExecutionType.REGRESSION, description = "Checks errors with stats with Pivot using Search api") public void searchWithStatsAndPivot() diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java index d246bbf72..559441ca0 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/rm/SearchServicesRME2ETest.java @@ -23,7 +23,7 @@ import org.testng.annotations.Test; public class SearchServicesRME2ETest extends AbstractRmE2ETest { - @Test(priority = 1, groups = { TestGroup.ASS_14 }) + @Test(priority = 1) public void testBasicSearch() throws Exception { FolderModel testFolder = dataContent.usingUser(testUser).usingSite(testSite).createFolder(); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java index 728ac5a1c..b6f546016 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java @@ -33,7 +33,7 @@ public class CascadingTrackerIntegrationTest extends AbstractE2EFunctionalTest @Autowired protected DataContent dataContent; - @Test(priority = 1, groups = { TestGroup.ASS_13 }) + @Test(priority = 1) public void testChildPathWhenParentRenamed() throws Exception { // Create Parent folder @@ -74,7 +74,7 @@ public class CascadingTrackerIntegrationTest extends AbstractE2EFunctionalTest Assert.assertEquals(descendantCountOfOriginalName, 0, "Old path still has descendants: " + parentQuery); } - @Test(priority = 2, groups = { TestGroup.ASS_13 }) + @Test(priority = 2) public void testGrandChildPathWhenGrandParentRenamed() throws Exception { // Create grand parent folder diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java index 2e54ee631..a52bab254 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/SearchSolrAPITest.java @@ -34,7 +34,7 @@ import org.testng.annotations.Test; */ public class SearchSolrAPITest extends AbstractE2EFunctionalTest { - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 1) + @Test(priority = 1) public void testGetSolrConfig() throws Exception { RestTextResponse response = restClient.authenticateUser(adminUserModel).withSolrAPI().getConfig(); @@ -54,7 +54,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest // restClient.onResponse().assertThat().body("config.requestHandler",Matchers.notNullValue()); } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 2) + @Test(priority = 2) public void testEditSolrConfig() throws Exception { String expectedError = "solrconfig editing is not enabled due to disable.configEdit"; @@ -86,7 +86,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest // response.assertThat().body("error.msg", Matchers.contains(expectedError)); } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 3) + @Test(priority = 3) public void testGetSolrConfigOverlay() throws Exception { restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigOverlay(); @@ -95,7 +95,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest restClient.onResponse().assertThat().content(Matchers.containsString("overlay")); } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 4) + @Test(priority = 4) public void testGetSolrConfigParams() throws Exception { restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigParams(); @@ -104,7 +104,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest restClient.onResponse().assertThat().content(Matchers.containsString("response")); } - @Test(groups = { TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ASS_112 }, priority = 5) + @Test(priority = 5) public void testGetSolrSelect() throws Exception { String queryParams = "{!xmlparser v=''}"; diff --git a/e2e-test/src/test/resources/SearchSuite.xml b/e2e-test/src/test/resources/SearchSuite.xml index 6eaebef9c..2d5e701e9 100644 --- a/e2e-test/src/test/resources/SearchSuite.xml +++ b/e2e-test/src/test/resources/SearchSuite.xml @@ -8,27 +8,12 @@ - - - - - - - - - - - - - - - From 7dc91669e577ce153236259f599653004c2fe862 Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Thu, 18 Jul 2019 08:29:19 +0100 Subject: [PATCH 10/23] SEARCH-1639 adding NOT_IE back --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 2 ++ 1 file changed, 2 insertions(+) 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 d1213d2ba..60a026e14 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -19,6 +19,8 @@ public @interface TestGroup public static final String ASS_MASTER_SLAVE = "ASS_Master_Slave"; // Alfresco Search Services using master slave configurations public static final String ASS_MASTER ="ASS_Master"; // Alfresco search services using master/stand alone mode + public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running + public static final String ACS_52n = "ACS_52n"; // Alfresco Content Services 5.2.n public static final String ACS_60n = "ACS_60n"; // Alfresco Content Services 6.0 or above public static final String ACS_61n = "ACS_61n"; // Alfresco Content Services 6.1 or above From 121a46605ca2f2d263abba63ce2d2d983616fe06 Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Thu, 18 Jul 2019 11:08:21 +0100 Subject: [PATCH 11/23] SEARCH-1639 removing unused test annotations and test group --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 2 -- 1 file changed, 2 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 60a026e14..d1213d2ba 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -19,8 +19,6 @@ public @interface TestGroup public static final String ASS_MASTER_SLAVE = "ASS_Master_Slave"; // Alfresco Search Services using master slave configurations public static final String ASS_MASTER ="ASS_Master"; // Alfresco search services using master/stand alone mode - public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running - public static final String ACS_52n = "ACS_52n"; // Alfresco Content Services 5.2.n public static final String ACS_60n = "ACS_60n"; // Alfresco Content Services 6.0 or above public static final String ACS_61n = "ACS_61n"; // Alfresco Content Services 6.1 or above From 323540e64ca6e213b700df101d546e325d5f5fda Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Thu, 18 Jul 2019 12:48:43 +0100 Subject: [PATCH 12/23] SEARCH-1639 removing unused test annotations and test group --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 2 ++ 1 file changed, 2 insertions(+) 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 d1213d2ba..60a026e14 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -19,6 +19,8 @@ public @interface TestGroup public static final String ASS_MASTER_SLAVE = "ASS_Master_Slave"; // Alfresco Search Services using master slave configurations public static final String ASS_MASTER ="ASS_Master"; // Alfresco search services using master/stand alone mode + public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running + public static final String ACS_52n = "ACS_52n"; // Alfresco Content Services 5.2.n public static final String ACS_60n = "ACS_60n"; // Alfresco Content Services 6.0 or above public static final String ACS_61n = "ACS_61n"; // Alfresco Content Services 6.1 or above From 7c4fac566d237dcd0bd41bc6ec95282448e23558 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Thu, 18 Jul 2019 14:33:41 +0000 Subject: [PATCH 13/23] [maven-release-plugin] prepare release 1.4.0-maven35 --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9ea84341b..bb977dbd9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-maven35 pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - HEAD + 1.4.0-maven35 search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 2a30694a5..ac2b30e67 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-maven35 ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-SNAPSHOT + 1.4.0-maven35 servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index f3975e2f8..8c4948d0e 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-maven35 diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d8ddf0ae7..3027c4f98 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-maven35 ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 8972f3c9c..d82e1e023 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-maven35 org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-maven35 pom Alfresco Solr Search parent From 45e04ea01efafadb3cb270ac53d6a669b533772b Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Thu, 18 Jul 2019 14:33:44 +0000 Subject: [PATCH 14/23] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index bb977dbd9..9ea84341b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-maven35 + 1.4.0-SNAPSHOT pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - 1.4.0-maven35 + HEAD search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index ac2b30e67..2a30694a5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-maven35 + 1.4.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-maven35 + 1.4.0-SNAPSHOT servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 8c4948d0e..f3975e2f8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-maven35 + 1.4.0-SNAPSHOT diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 3027c4f98..d8ddf0ae7 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-maven35 + 1.4.0-SNAPSHOT ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index d82e1e023..8972f3c9c 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-maven35 + 1.4.0-SNAPSHOT org.alfresco alfresco-search-parent - 1.4.0-maven35 + 1.4.0-SNAPSHOT pom Alfresco Solr Search parent From 589c9380ad2a44cb39bab803ccc6a9b7b3986013 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Fri, 19 Jul 2019 07:21:13 +0000 Subject: [PATCH 15/23] [maven-release-plugin] prepare release 1.4.0-201907190831 --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9ea84341b..2cb057600 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-201907190831 pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - HEAD + 1.4.0-201907190831 search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 2a30694a5..f416fe0a5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-201907190831 ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-SNAPSHOT + 1.4.0-201907190831 servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index f3975e2f8..ed800edcf 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-201907190831 diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d8ddf0ae7..9375ae5b5 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-201907190831 ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 8972f3c9c..3ab4fb067 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-201907190831 org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-201907190831 pom Alfresco Solr Search parent From ff6cb0fb6de766a457a92119bd8b9739f6488448 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Fri, 19 Jul 2019 07:21:16 +0000 Subject: [PATCH 16/23] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 2cb057600..9ea84341b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-201907190831 + 1.4.0-SNAPSHOT pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - 1.4.0-201907190831 + HEAD search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index f416fe0a5..2a30694a5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-201907190831 + 1.4.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-201907190831 + 1.4.0-SNAPSHOT servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index ed800edcf..f3975e2f8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-201907190831 + 1.4.0-SNAPSHOT diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 9375ae5b5..d8ddf0ae7 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-201907190831 + 1.4.0-SNAPSHOT ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 3ab4fb067..8972f3c9c 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-201907190831 + 1.4.0-SNAPSHOT org.alfresco alfresco-search-parent - 1.4.0-201907190831 + 1.4.0-SNAPSHOT pom Alfresco Solr Search parent From fae69bb9bb0c5db33421b1390f81d7d24aac1e8c Mon Sep 17 00:00:00 2001 From: Keerat Lalia Date: Fri, 19 Jul 2019 08:37:42 +0100 Subject: [PATCH 17/23] SEARCH-1639 adding a ACS annotation back into a search test --- .../search/functional/searchServices/search/SearchTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2971c0155..b3771d4a8 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 @@ -192,7 +192,7 @@ public class SearchTest extends AbstractSearchServicesE2ETest .collect(Collectors.toList())); } - @Test + @Test(groups = { TestGroup.ACS_61n }) @TestRail(section = { TestGroup.REST_API, TestGroup.SEARCH, TestGroup.ACS_61n }, executionType = ExecutionType.REGRESSION, description = "Checks the \"include\" request parameter support the 'permissions' option") From d44af464536e21b5ffc92691cc2a669db55aacd6 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Sat, 20 Jul 2019 08:07:25 +0000 Subject: [PATCH 18/23] [maven-release-plugin] prepare release 1.4.0-mvn --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9ea84341b..b5b8e2c88 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-mvn pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - HEAD + 1.4.0-mvn search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 2a30694a5..63a35de1d 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-mvn ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-SNAPSHOT + 1.4.0-mvn servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index f3975e2f8..a498ab74d 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-mvn diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d8ddf0ae7..1b963f80d 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-mvn ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 8972f3c9c..cfa7d4736 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-mvn org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-mvn pom Alfresco Solr Search parent From 10d52cdb8066f3f60af2d60ea94e190f59b82597 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Sat, 20 Jul 2019 08:07:28 +0000 Subject: [PATCH 19/23] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b5b8e2c88..9ea84341b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-mvn + 1.4.0-SNAPSHOT pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - 1.4.0-mvn + HEAD search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 63a35de1d..2a30694a5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-mvn + 1.4.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-mvn + 1.4.0-SNAPSHOT servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index a498ab74d..f3975e2f8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-mvn + 1.4.0-SNAPSHOT diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 1b963f80d..d8ddf0ae7 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-mvn + 1.4.0-SNAPSHOT ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index cfa7d4736..8972f3c9c 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-mvn + 1.4.0-SNAPSHOT org.alfresco alfresco-search-parent - 1.4.0-mvn + 1.4.0-SNAPSHOT pom Alfresco Solr Search parent From eb9207d12d47ced4963eaffc05f547ce7b69b8df Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Sun, 21 Jul 2019 17:05:24 +0000 Subject: [PATCH 20/23] [maven-release-plugin] prepare release 1.4.0-nexus --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9ea84341b..938b877b5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - HEAD + 1.4.0-nexus search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 2a30694a5..c37036bb5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-SNAPSHOT + 1.4.0-nexus servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index f3975e2f8..3470a8b4c 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d8ddf0ae7..d290bd283 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index 8972f3c9c..f0d0a9577 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus org.alfresco alfresco-search-parent - 1.4.0-SNAPSHOT + 1.4.0-nexus pom Alfresco Solr Search parent From b9eb97db8b1a0fc6b8c0205d6b692e39391a1760 Mon Sep 17 00:00:00 2001 From: bamboo_auth Date: Sun, 21 Jul 2019 17:05:28 +0000 Subject: [PATCH 21/23] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- search-services/alfresco-search/pom.xml | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- search-services/packaging/pom.xml | 2 +- search-services/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 938b877b5..9ea84341b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-search-and-insight-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT pom Alfresco Search And Insight Parent @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/search_discovery/insightengine.git scm:git:https://git.alfresco.com/search_discovery/insightengine.git https://git.alfresco.com/search_discovery/insightengine.git - 1.4.0-nexus + HEAD search-services diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index c37036bb5..2a30694a5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ org.alfresco alfresco-solrclient-lib - 1.4.0-nexus + 1.4.0-SNAPSHOT servlet-api diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 3470a8b4c..f3975e2f8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index d290bd283..d8ddf0ae7 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -13,7 +13,7 @@ org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT ../pom.xml diff --git a/search-services/pom.xml b/search-services/pom.xml index f0d0a9577..8972f3c9c 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -4,13 +4,13 @@ org.alfresco alfresco-search-and-insight-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT org.alfresco alfresco-search-parent - 1.4.0-nexus + 1.4.0-SNAPSHOT pom Alfresco Solr Search parent From 7a4c4d67bb94013e3ed94c162190051685988ff1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2019 00:17:07 +0000 Subject: [PATCH 22/23] Bump dependency.jackson.version in /search-services Bumps `dependency.jackson.version` from 2.9.9 to 2.10.0.pr1. Updates `jackson-core` from 2.9.9 to 2.10.0.pr1 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.9.9...jackson-core-2.10.0.pr1) Updates `jackson-annotations` from 2.9.9 to 2.10.0.pr1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- search-services/alfresco-solrclient-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index f3975e2f8..cd7623cbc 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -23,7 +23,7 @@ 8.43 - 2.9.9 + 2.10.0.pr1 From 26949db01955776d66b36e67bf5f399752bbd79a Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 22 Jul 2019 08:46:21 +0100 Subject: [PATCH 23/23] Update jackson version in license notice. --- .../packaging/src/main/resources/licenses/notice.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index d4c641c1e..8860b0e06 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -55,8 +55,8 @@ mybatis-spring-1.2.5.jar http://www.mybatis.org/ chemistry-opencmis-server-support-1.0.0.jar http://chemistry.apache.org/ chemistry-opencmis-server-bindings-1.0.0.jar http://chemistry.apache.org/ quartz-2.3.1.jar http://quartz-scheduler.org/ -jackson-core-2.9.9.jar https://github.com/FasterXML/jackson -jackson-annotations-2.9.9.jar https://github.com/FasterXML/jackson +jackson-core-2.10.0.pr1.jar https://github.com/FasterXML/jackson +jackson-annotations-2.10.0.pr1.jar https://github.com/FasterXML/jackson commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/ spring-aop-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/ spring-beans-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/