[1988] Extract Elasticsearch initialization in an abstract test class

Bug: #1988
Signed-off-by: Gwendal Daniel <gwendal.daniel@obeosoft.com>

Author: gdaniel

CHANGELOG.adoc

@@ -20,6 +20,9 @@ The following methods have been added:
 +
 ** List<EObject> getAllReachableType(EObject eObject, EClass eClass)` in `UtilService`
 
+- https://github.com/eclipse-syson/syson/issues/1988[#1988] [syson] Extract Elasticsearch container initialization in a dedicated abstract test class.
+The property `SysONTestsProperties#ELASTICSEARCH` has been removed, tests that require Elasticsearch should extend `AbstractIntegrationTestsWithElasticsearch`.
+
 === Dependency update
 
 - [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.1.2]
@@ -56,6 +59,8 @@ Publishing a project that contains representations now produces libraries that a
 Also add a  _New Satisfy Requirement_ graphical edge tool between `Feature` graphical nodes and `RequirementUsage` graphical nodes.
 - https://github.com/eclipse-syson/syson/issues/1986[#1986] [services] Make `ServiceMethod#aql` and `ServiceMethod#aqlSelf` throw an exception if the provided parameters don't match the service method arity.
 As a result, the application won't start if a service call is constructed with an invalid number of arguments.
+- https://github.com/eclipse-syson/syson/issues/1988[#1988] [syson] Extract Elasticsearch container initialization in a dedicated abstract test class.
+Integration tests that require Elasticsearch now need to extend `AbstractIntegrationTestsWithElasticsearch`.
 
 === New features
 

…asticsearchDynamicPropertyRegistrar.java …actIntegrationTestWithElasticsearch.javabackend/application/syson-application/src/test/java/org/eclipse/syson/ElasticsearchDynamicPropertyRegistrar.java renamed to backend/application/syson-application/src/test/java/org/eclipse/syson/AbstractIntegrationTestWithElasticsearch.java backend/application/syson-application/src/test/java/org/eclipse/syson/ElasticsearchDynamicPropertyRegistrar.java renamed to backend/application/syson-application/src/test/java/org/eclipse/syson/AbstractIntegrationTestWithElasticsearch.java

@@ -12,27 +12,30 @@
  *******************************************************************************/
 package org.eclipse.syson;
 
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.DynamicPropertyRegistrar;
 import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
 /**
- * Test configuration to register Elasticsearch properties for tests that require Elasticsearch.
- * <p>
- * Use {@link SysONTestsProperties#ELASTICSEARCH_PROPERTY} in the test configuration to enable Elasticsearch.
- * </p>
+ * Superclass of all the integration tests used to setup the test environment with SysON's Elasticsearch integration.
  *
  * @author gdaniel
  */
-@Configuration
-@Conditional(OnElasticsearchEnabledTests.class)
-public class ElasticsearchDynamicPropertyRegistrar implements DynamicPropertyRegistrar {
+public class AbstractIntegrationTestWithElasticsearch extends AbstractIntegrationTests {
 
-    @Override
-    public void accept(DynamicPropertyRegistry registry) {
-        registry.add("spring.elasticsearch.uris", AbstractIntegrationTests.ELASTICSEARCH_CONTAINER::getHttpHostAddress);
+    public static final ElasticsearchContainer ELASTICSEARCH_CONTAINER;
+
+    static {
+        ELASTICSEARCH_CONTAINER = new ElasticsearchContainer("elasticsearch:9.2.1")
+                .withEnv("xpack.security.transport.ssl.enabled", "false")
+                .withEnv("xpack.security.http.ssl.enabled", "false")
+                .withReuse(true);
+        ELASTICSEARCH_CONTAINER.start();
+    }
+
+    @DynamicPropertySource
+    public static void registerProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.elasticsearch.uris", AbstractIntegrationTestWithElasticsearch.ELASTICSEARCH_CONTAINER::getHttpHostAddress);
         registry.add("spring.elasticsearch.username", () -> "elastic");
         registry.add("spring.elasticsearch.password", () -> ElasticsearchContainer.ELASTICSEARCH_DEFAULT_PASSWORD);
     }

backend/application/syson-application/src/test/java/org/eclipse/syson/AbstractIntegrationTests.java

@@ -18,28 +18,22 @@
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
 /**
  * Superclass of all the integration tests used to setup the test environment.
+ * <p>
+ * Note that this class doesn't initialize SysON's Elasticsearch integration, use {@link AbstractIntegrationTestWithElasticsearch} if your integration tests require Elasticsearch.
+ * </p>
  *
  * @author sbegaudeau
  */
 @SpringJUnitConfig(classes = { SiriusWebStarterConfiguration.class, JDBCConfiguration.class, IntegrationTestConfiguration.class })
 public abstract class AbstractIntegrationTests {
     public static final PostgreSQLContainer<?> POSTGRESQL_CONTAINER;
 
-    public static final ElasticsearchContainer ELASTICSEARCH_CONTAINER;
-
-
     static {
         POSTGRESQL_CONTAINER = new PostgreSQLContainer<>("postgres:latest").withReuse(true);
         POSTGRESQL_CONTAINER.start();
-        ELASTICSEARCH_CONTAINER = new ElasticsearchContainer("elasticsearch:9.2.1")
-                .withEnv("xpack.security.transport.ssl.enabled", "false")
-                .withEnv("xpack.security.http.ssl.enabled", "false")
-                .withReuse(true);
-        ELASTICSEARCH_CONTAINER.start();
     }
 
     @DynamicPropertySource

backend/application/syson-application/src/test/java/org/eclipse/syson/OnElasticsearchEnabledTests.java

@@ -24,9 +24,4 @@ public class SysONTestsProperties {
     public static final String NO_DEFAULT_LIBRARIES = "no-default-libraries";
 
     public static final String NO_DEFAULT_LIBRARIES_PROPERTY = SYSON_TEST_ENABLED + "=" + NO_DEFAULT_LIBRARIES;
-
-    public static final String ELASTICSEARCH = "elastic-search";
-
-    public static final String ELASTICSEARCH_PROPERTY = SYSON_TEST_ENABLED + "=" + ELASTICSEARCH;
-
 }

backend/application/syson-application/src/test/java/org/eclipse/syson/SysONTestsProperties.java

@@ -25,7 +25,7 @@
 import org.eclipse.sirius.components.core.api.IEditingContextSearchService;
 import org.eclipse.sirius.web.infrastructure.elasticsearch.services.api.IIndexUpdateService;
 import org.eclipse.sirius.web.tests.graphql.ProjectsOmniboxSearchQueryRunner;
-import org.eclipse.syson.AbstractIntegrationTests;
+import org.eclipse.syson.AbstractIntegrationTestWithElasticsearch;
 import org.eclipse.syson.SysONTestsProperties;
 import org.eclipse.syson.application.data.SimpleProjectElementsTestProjectData;
 import org.junit.jupiter.api.DisplayName;
@@ -45,8 +45,8 @@
  */
 @Transactional
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-        properties = { SysONTestsProperties.SYSON_TEST_ENABLED + "=" + SysONTestsProperties.NO_DEFAULT_LIBRARIES + ", " + SysONTestsProperties.ELASTICSEARCH })
-public class ProjectsOmniboxControllerIntegrationTests extends AbstractIntegrationTests  {
+        properties = { SysONTestsProperties.SYSON_TEST_ENABLED + "=" + SysONTestsProperties.NO_DEFAULT_LIBRARIES })
+public class ProjectsOmniboxControllerIntegrationTests extends AbstractIntegrationTestWithElasticsearch {
 
     @Autowired
     private ProjectsOmniboxSearchQueryRunner projectsOmniboxSearchQueryRunner;