From 286dfd8928961b37db4da5f147358b6fcb455a47 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 25 Sep 2025 11:36:54 +0100 Subject: [PATCH] Adding @DirtiesContext on spring tests to fix conflicts Issue-ID: POLICY-5457 Change-Id: I05b83fefc10afa12358aa268e25c65a26942e013 Signed-off-by: adheli.tavares --- .../org/onap/policy/clamp/acm/participant/sim/rest/AcSimRestTest.java | 2 ++ .../policy/clamp/acm/participant/sim/rest/ActuatorControllerTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/AcSimRestTest.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/AcSimRestTest.java index 6d02edd92..91ea18d9d 100644 --- a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/AcSimRestTest.java +++ b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/AcSimRestTest.java @@ -48,6 +48,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.context.annotation.Import; import org.springframework.http.MediaType; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.web.servlet.MockMvc; @@ -59,6 +60,7 @@ import org.springframework.web.context.WebApplicationContext; @WebMvcTest(value = SimulatorController.class) @Import({MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class}) @EnableConfigurationProperties(value = ParticipantSimParameters.class) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) class AcSimRestTest { private static final Coder CODER = new StandardCoder(); diff --git a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/ActuatorControllerTest.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/ActuatorControllerTest.java index a3bf68230..681a62fba 100644 --- a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/ActuatorControllerTest.java +++ b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/acm/participant/sim/rest/ActuatorControllerTest.java @@ -31,6 +31,7 @@ import org.springframework.boot.test.autoconfigure.actuate.observability.AutoCon import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.web.reactive.function.client.ExchangeFilterFunctions; @@ -39,6 +40,7 @@ import org.springframework.web.reactive.function.client.ExchangeFilterFunctions; @AutoConfigureWebTestClient @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @ActiveProfiles("test") +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) class ActuatorControllerTest { @Autowired -- 2.16.6