From 16753d4c97345ce542370e399f615355c880259c Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 6 Jul 2021 15:02:40 +0100 Subject: [PATCH 1/2] SEARCH-2909 The 501 error fix has now been backported to 7.0.N. Update to use 7.0.1-A6 which contains it. The fix will be present in 7.0.1 and 7.1.0, but it was not present in 7.0.0 or earlier. --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 1 + .../searchServices/search/SearchAFTSInFieldTest.java | 4 ++-- 2 files changed, 3 insertions(+), 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 b3ab9e21d..bf7d5d233 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -54,6 +54,7 @@ public class TestGroup public static final String ACS_611n = "ACS_611n"; // Alfresco Content Services 6.1.1 or above public static final String ACS_62n = "ACS_62n"; // Alfresco Content Services 6.2 or above public static final String ACS_63n = "ACS_63n"; // Alfresco Content Services 6.3 or above + public static final String ACS_701n = "ACS_701n"; // Alfresco Content Services 7.0.1 or above public static final String ACS_71n = "ACS_71n"; // Alfresco Content Services 7.1 or above public static final String AGS_302 = "AGS_302"; // Alfresco governance Services 3.0.2 or above diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java index 74af1aa9a..b1a73fe86 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchAFTSInFieldTest.java @@ -29,7 +29,7 @@ package org.alfresco.test.search.functional.searchServices.search; import static java.util.List.of; import static jersey.repackaged.com.google.common.collect.Sets.newHashSet; -import static org.alfresco.search.TestGroup.ACS_71n; +import static org.alfresco.search.TestGroup.ACS_701n; import static org.alfresco.search.TestGroup.CROSS_LOCALE_SUPPORT_DISABLED; import java.util.ArrayList; @@ -349,7 +349,7 @@ public class SearchAFTSInFieldTest extends AbstractE2EFunctionalTest } /** Check that a 501 error is returned when performing exact search on a tokenised field without cross-locale support. */ - @Test (priority = 12, groups = { CROSS_LOCALE_SUPPORT_DISABLED, ACS_71n }) + @Test (priority = 12, groups = { CROSS_LOCALE_SUPPORT_DISABLED, ACS_701n }) public void testExactMatchWithoutCrossLocale() { // Force the query to hit Solr rather than the DB. From addee3fca3bc4d19d6e958a432986c19797dcdeb Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 7 Jul 2021 11:05:44 +0100 Subject: [PATCH 2/2] SEARCH-2909 Update travis file to use a single exclude groups variable. Remove unused test group ACS_71n. --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 1 - 1 file changed, 1 deletion(-) 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 bf7d5d233..610f04359 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -55,7 +55,6 @@ public class TestGroup public static final String ACS_62n = "ACS_62n"; // Alfresco Content Services 6.2 or above public static final String ACS_63n = "ACS_63n"; // Alfresco Content Services 6.3 or above public static final String ACS_701n = "ACS_701n"; // Alfresco Content Services 7.0.1 or above - public static final String ACS_71n = "ACS_71n"; // Alfresco Content Services 7.1 or above public static final String AGS_302 = "AGS_302"; // Alfresco governance Services 3.0.2 or above }