From fee29dcb933571668da024c2e162766c740afcd4 Mon Sep 17 00:00:00 2001 From: barreiro Date: Mon, 18 Mar 2024 18:17:47 +0000 Subject: [PATCH] Remove general use of Elasticsearch dev service --- .../src/main/resources/application.properties | 1 + .../tools/horreum/svc/DatasourceTest.java | 4 ++-- .../horreum/test/ElasticsearchTestProfile.java | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 horreum-backend/src/test/java/io/hyperfoil/tools/horreum/test/ElasticsearchTestProfile.java diff --git a/horreum-backend/src/main/resources/application.properties b/horreum-backend/src/main/resources/application.properties index 71c520208..881deee9c 100644 --- a/horreum-backend/src/main/resources/application.properties +++ b/horreum-backend/src/main/resources/application.properties @@ -204,6 +204,7 @@ horreum.dev-services.enabled=true quarkus.datasource.devservices.enabled=false quarkus.datasource.migration.devservices.enabled=false quarkus.keycloak.devservices.enabled=false +quarkus.elasticsearch.devservices.enabled=false ## Add a dummy administrator in dev mode with name "user" and password "secret" with Basic HTTP authentication %dev.quarkus.http.auth.basic=true diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/DatasourceTest.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/DatasourceTest.java index 45537a86a..1d020e968 100644 --- a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/DatasourceTest.java +++ b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/DatasourceTest.java @@ -12,7 +12,7 @@ import io.hyperfoil.tools.horreum.bus.MessageBusChannels; import io.hyperfoil.tools.horreum.entity.backend.DatastoreConfigDAO; import io.hyperfoil.tools.horreum.entity.data.DatasetDAO; -import io.hyperfoil.tools.horreum.test.HorreumTestProfile; +import io.hyperfoil.tools.horreum.test.ElasticsearchTestProfile; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import jakarta.inject.Inject; @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @QuarkusTest -@TestProfile(HorreumTestProfile.class) +@TestProfile(ElasticsearchTestProfile.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class DatasourceTest extends BaseServiceTest{ diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/test/ElasticsearchTestProfile.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/test/ElasticsearchTestProfile.java new file mode 100644 index 000000000..ef5262f42 --- /dev/null +++ b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/test/ElasticsearchTestProfile.java @@ -0,0 +1,14 @@ +package io.hyperfoil.tools.horreum.test; + +import java.util.HashMap; +import java.util.Map; + +public class ElasticsearchTestProfile extends HorreumTestProfile { + + @Override public Map getConfigOverrides() { + Map configOverrides = new HashMap<>(super.getConfigOverrides()); + configOverrides.put("quarkus.elasticsearch.devservices.enabled", "true"); + return configOverrides; + } + +}