From 9c1d5b5f4a08bcac222c0684603ef91fbf66302e Mon Sep 17 00:00:00 2001 From: danielhanrahan Date: Wed, 10 Dec 2025 18:25:24 +0000 Subject: [PATCH] Change tests to only use Liquibase for schema Because ddl-auto was set to 'create-drop' in the test config, Hibernate was overwriting Liquibase's schema. To correct this, ddl-auto is set to none, and liquibase is set to drop-first. DirtiesContext is also enabled for any tests using database to ensure tests do not get stale data. Issue-ID: POLICY-5333 Change-Id: Ie573c52556c5ba09d8c5f1a1e0d41c7a66c1a767 Signed-off-by: danielhanrahan --- .../acm/runtime/commissioning/rest/CommissioningControllerTest.java | 2 ++ .../clamp/acm/runtime/participant/ParticipantControllerTest.java | 2 ++ runtime-acm/src/test/resources/application-test.yaml | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java index 08d637d71..488c4b15b 100644 --- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java +++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/commissioning/rest/CommissioningControllerTest.java @@ -60,12 +60,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @ActiveProfiles({"test", "default"}) +@DirtiesContext class CommissioningControllerTest extends CommonRestController { private static final int NUMBER_COMPOSITIONS = 10; diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/participant/ParticipantControllerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/participant/ParticipantControllerTest.java index ed6097773..71973268e 100644 --- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/participant/ParticipantControllerTest.java +++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/participant/ParticipantControllerTest.java @@ -56,6 +56,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -67,6 +68,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @ActiveProfiles({ "test", "default" }) +@DirtiesContext class ParticipantControllerTest extends CommonRestController { private static final String PARTICIPANTS_ENDPOINT = "participants"; private static final int NUMBER_RECORDS = 10; diff --git a/runtime-acm/src/test/resources/application-test.yaml b/runtime-acm/src/test/resources/application-test.yaml index e3d4a48df..e06a3c942 100644 --- a/runtime-acm/src/test/resources/application-test.yaml +++ b/runtime-acm/src/test/resources/application-test.yaml @@ -7,5 +7,7 @@ spring: maximumPoolSize: 3 jpa: hibernate: - ddl-auto: create-drop + ddl-auto: none open-in-view: false + liquibase: + drop-first: true -- 2.16.6