From 32b72d5b67f1ef928485ba50d510f2e7220e4a83 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Thu, 12 Dec 2024 10:12:09 +0100 Subject: [PATCH] [ACS-9069] Missed some classes, restoring required method --- .../elasticsearch/parallel/PathUpdateTests.java | 5 +---- .../org/alfresco/tas/AlfrescoStackInitializer.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/tas-elasticsearch/src/test/java/org/alfresco/elasticsearch/parallel/PathUpdateTests.java b/tests/tas-elasticsearch/src/test/java/org/alfresco/elasticsearch/parallel/PathUpdateTests.java index 03ce2c6417..f7919d07c8 100644 --- a/tests/tas-elasticsearch/src/test/java/org/alfresco/elasticsearch/parallel/PathUpdateTests.java +++ b/tests/tas-elasticsearch/src/test/java/org/alfresco/elasticsearch/parallel/PathUpdateTests.java @@ -4,11 +4,8 @@ import static java.util.stream.Collectors.joining; import static org.alfresco.elasticsearch.SearchQueryService.req; -import static org.alfresco.tas.AlfrescoStackInitializer.reindex; import java.util.Arrays; -import java.util.Map; - import jakarta.json.Json; import jakarta.json.JsonObject; @@ -68,7 +65,7 @@ public void dataPreparation() // Before we start testing the live indexing we need to use the reindexing component to index the system nodes. Step.STEP("Index system nodes."); - reindex(Map.of("ALFRESCO_REINDEX_PATHINDEXINGENABLED", "true")); // Ensure path reindexing is enabled. + AlfrescoStackInitializer.reindexEverything(); Step.STEP("Create a test user and private site."); testUser = dataUser.createRandomTestUser(); diff --git a/tests/testcontainers-env/src/main/java/org/alfresco/tas/AlfrescoStackInitializer.java b/tests/testcontainers-env/src/main/java/org/alfresco/tas/AlfrescoStackInitializer.java index bd0d6cfaaf..0c70990540 100644 --- a/tests/testcontainers-env/src/main/java/org/alfresco/tas/AlfrescoStackInitializer.java +++ b/tests/testcontainers-env/src/main/java/org/alfresco/tas/AlfrescoStackInitializer.java @@ -145,10 +145,18 @@ public void configureSecuritySettings(GenericContainer searchEngineContainer) } /** - * Run the alfresco-elasticsearch-reindexing container. - * - * @param envParam Any environment variables to override from the defaults. + * Run the alfresco-elasticsearch-reindexing container with path reindexing enabled. */ + public static void reindexEverything() + { + reindex(Map.of("ALFRESCO_REINDEX_PATHINDEXINGENABLED", "true")); // Ensure path reindexing is enabled. + } + + /** + * Run the alfresco-elasticsearch-reindexing container. + * + * @param envParam Any environment variables to override from the defaults. + */ public static void reindex(Map envParam) { // Run the reindexing container.