From 59797a443855c3f6a93cf7cad98db549d91587e1 Mon Sep 17 00:00:00 2001 From: mbhave Date: Wed, 1 Apr 2020 13:01:53 +0100 Subject: [PATCH] Removed unused TestGroups --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 6 ++---- .../searchServices/search/ExplicitRoutingTest.java | 2 +- .../search/tracker/CascadingIntegrationTest.java | 2 +- 3 files changed, 4 insertions(+), 6 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 49a0bb8c2..8da8c14e8 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -31,8 +31,8 @@ public class TestGroup public static final String CONFIG_MASTER ="CONFIG_Master"; // Alfresco search services using master/stand alone mode public static final String CONFIG_SHARDING ="CONFIG_Sharding"; // Alfresco search services using sharded environment - public static final String CONFIG_SHARDING_EXPLICIT ="CONFIG_SHARDING_EXPLICIT"; // Alfresco search services using sharded environment and explicit routing - public static final String CONFIG_SHARDING_DB_ID_RANGE = "CONFIG_SHARDING_DB_ID_RANGE"; // Alfresco Search Services using Sharding with DB_ID_RANGE + public static final String CONFIG_SHARDING_EXPLICIT ="CONFIG_Sharding_EXPLICIT"; // Alfresco search services using sharded environment and explicit routing + public static final String CONFIG_SHARDING_DB_ID_RANGE = "CONFIG_Sharding_DB_ID_RANGE"; // Alfresco Search Services using Sharding with DB_ID_RANGE public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running @@ -44,6 +44,4 @@ public class TestGroup public static final String ACS_63n = "ACS_63n"; // Alfresco Content Services 6.3 or above public static final String AGS_302 = "AGS_302"; // Alfresco governance Services 3.0.2 or above - - public static final String NOT_BAMBOO = "Not_Bamboo"; // The does not run on bamboo } diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ExplicitRoutingTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ExplicitRoutingTest.java index 798170325..576bfacfb 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ExplicitRoutingTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ExplicitRoutingTest.java @@ -20,7 +20,7 @@ public class ExplicitRoutingTest extends AbstractE2EFunctionalTest { * Checks indexing still works after sharding model used for explicit routing has been disabled * @throws Exception */ - @Test(priority = 1, groups = {TestGroup.NOT_BAMBOO, TestGroup.CONFIG_SHARDING_EXPLICIT, TestGroup.ACS_62n}) + @Test(priority = 1, groups = {TestGroup.CONFIG_SHARDING, TestGroup.CONFIG_SHARDING_EXPLICIT, TestGroup.ACS_62n}) public void testIndexingStillWorkingAfterShardModelIsDeactivated() throws Exception { diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java index 3c2149f85..75b601800 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java @@ -187,7 +187,7 @@ public class CascadingIntegrationTest extends AbstractE2EFunctionalTest * Check that, after parent renaming, both the children are searchable in the new path * (computed accordingly with the new parent folder name) */ - @Test(priority = 3, groups = {TestGroup.NOT_BAMBOO, TestGroup.CONFIG_SHARDING_EXPLICIT }) + @Test(priority = 3, groups = {TestGroup.CONFIG_SHARDING, TestGroup.CONFIG_SHARDING_EXPLICIT }) public void testChildrenPathOnParentRenamedWithChildrenInDifferentShards() throws Exception {