From e292065be0464e2eed807163f2a1c496eec9d7dc Mon Sep 17 00:00:00 2001
From: ds-lcapellino <lucas.capellino@doubleslash.de>
Date: Mon, 17 Jun 2024 13:57:35 +0200
Subject: [PATCH] feature: #639 adapt integration tests

---
 .../resources/application-integration-spring-boot.yml  |  2 --
 .../integration/IntegrationTestSpecification.java      |  8 +++++++-
 .../investigation/InvestigationPolicyExpirationIT.java | 10 ++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tx-backend/src/main/resources/application-integration-spring-boot.yml b/tx-backend/src/main/resources/application-integration-spring-boot.yml
index 01de3c8a48..0539cfd984 100644
--- a/tx-backend/src/main/resources/application-integration-spring-boot.yml
+++ b/tx-backend/src/main/resources/application-integration-spring-boot.yml
@@ -68,8 +68,6 @@ spring:
 
 jwt:
   resource-client: "Integration-Test"
-server:
-  port: 9998
 management:
   server:
     port: 8082
diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java
index 176e60bd98..5ba9019da4 100644
--- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java
+++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/IntegrationTestSpecification.java
@@ -19,6 +19,7 @@
 package org.eclipse.tractusx.traceability.integration;
 
 import groovy.json.JsonBuilder;
+import io.restassured.RestAssured;
 import org.awaitility.Awaitility;
 import org.eclipse.tractusx.traceability.integration.common.config.PostgreSQLConfig;
 import org.eclipse.tractusx.traceability.integration.common.config.RestAssuredConfig;
@@ -33,6 +34,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 
@@ -42,7 +44,7 @@
 
 import static org.awaitility.Awaitility.await;
 @ActiveProfiles("integration-spring-boot")
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 @ContextConfiguration(initializers = {PostgreSQLConfig.Initializer.class, RestitoConfig.Initializer.class}, classes = {RestAssuredConfig.class})
 public class IntegrationTestSpecification {
@@ -56,8 +58,12 @@ public class IntegrationTestSpecification {
     @Autowired
     DatabaseSupport databaseSupport;
 
+    @LocalServerPort
+    private Integer port;
+
     @BeforeEach
     void beforeEach() throws JoseException {
+        RestAssured.port = port;
         oAuth2ApiSupport.oauth2ApiReturnsTechnicalUserToken();
         oAuth2ApiSupport.oauth2ApiReturnsJwkCerts(oAuth2Support.jwk());
     }
diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/InvestigationPolicyExpirationIT.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/InvestigationPolicyExpirationIT.java
index 6a4e11c4c4..047bf30731 100644
--- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/InvestigationPolicyExpirationIT.java
+++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/notification/investigation/InvestigationPolicyExpirationIT.java
@@ -43,7 +43,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 
 import java.util.Collections;
 import java.util.List;
@@ -51,7 +52,6 @@
 import static io.restassured.RestAssured.given;
 import static org.eclipse.tractusx.traceability.common.security.JwtRole.SUPERVISOR;
 
-@TestPropertySource(properties = "traceability.validUntil=2020-07-04T16:01:05.309Z")
 public class InvestigationPolicyExpirationIT extends IntegrationTestSpecification {
     @Autowired
     NotificationReceiverService notificationReceiverService;
@@ -79,6 +79,12 @@ public class InvestigationPolicyExpirationIT extends IntegrationTestSpecificatio
 
     ObjectMapper objectMapper;
 
+
+    @DynamicPropertySource
+    static void dynamicProperties(DynamicPropertyRegistry registry) {
+        registry.add("traceability.validUntil", () -> "2020-07-04T16:01:05.309Z");
+    }
+
     @BeforeEach
     void setUp() {
         objectMapper = new ObjectMapper();