From 2759c9258bcaf746124fafed53e48a6b5c400e67 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Mon, 25 Mar 2024 22:50:30 +0100
Subject: [PATCH] test: refactore: `@SpringBootTest` configures the port
 automatically

---
 .../chat/backend/AbstractConfigurationIT.java | 46 ++++---------------
 .../AbstractConfigurationWithShardingIT.java  |  5 +-
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationIT.java b/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationIT.java
index 451690b2..1c383b77 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationIT.java
@@ -10,7 +10,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
@@ -37,8 +36,6 @@ public abstract class AbstractConfigurationIT
   String NONEXISTENT_CHATROOM = "7f59ec77-832e-4a17-8d22-55ef46242c17";
 
 
-  @LocalServerPort
-  int port;
   @Autowired
   WebTestClient webTestClient;
   @Autowired
@@ -65,9 +62,7 @@ public abstract class AbstractConfigurationIT
         {
           webTestClient
               .get()
-              .uri(
-                  "http://localhost:{port}/actuator/health",
-                  port)
+              .uri("/actuator/health")
               .exchange()
               .expectStatus().isOk()
               .expectBody().jsonPath("$.status").isEqualTo("UP");
@@ -86,9 +81,7 @@ public abstract class AbstractConfigurationIT
           AtomicBoolean existingChatRoomFound = new AtomicBoolean(false);
           webTestClient
               .get()
-              .uri(
-                  "http://localhost:{port}/list",
-                  port)
+              .uri("/list")
               .accept(MediaType.APPLICATION_JSON)
               .exchange()
               .expectStatus().isOk()
@@ -120,10 +113,7 @@ public abstract class AbstractConfigurationIT
         {
           webTestClient
               .get()
-              .uri(
-                  "http://localhost:{port}/{chatRoomId}",
-                  port,
-                  EXISTING_CHATROOM)
+              .uri("/{chatRoomId}", EXISTING_CHATROOM)
               .accept(MediaType.APPLICATION_JSON)
               .exchange()
               .expectStatus().isOk()
@@ -142,10 +132,7 @@ public abstract class AbstractConfigurationIT
         {
           webTestClient
               .get()
-              .uri(
-                  "http://localhost:{port}/{chatRoomId}/ute/1",
-                  port,
-                  EXISTING_CHATROOM)
+              .uri("/{chatRoomId}/ute/1", EXISTING_CHATROOM)
               .accept(MediaType.APPLICATION_JSON)
               .exchange()
               .expectStatus().isOk()
@@ -164,10 +151,7 @@ public abstract class AbstractConfigurationIT
         {
           webTestClient
               .get()
-              .uri(
-                  "http://localhost:{port}/{chatRoomId}/peter/1",
-                  port,
-                  EXISTING_CHATROOM)
+              .uri("/{chatRoomId}/peter/1", EXISTING_CHATROOM)
               .accept(MediaType.APPLICATION_JSON)
               .exchange()
               .expectStatus().isOk()
@@ -186,10 +170,7 @@ public abstract class AbstractConfigurationIT
         {
           webTestClient
               .put()
-              .uri(
-                  "http://localhost:{port}/{chatRoomId}/otto/66",
-                  port,
-                  NONEXISTENT_CHATROOM)
+              .uri("/{chatRoomId}/otto/66", NONEXISTENT_CHATROOM)
               .contentType(MediaType.TEXT_PLAIN)
               .accept(MediaType.APPLICATION_JSON)
               .bodyValue("The devil rules route 66")
@@ -213,7 +194,7 @@ public abstract class AbstractConfigurationIT
       // that is owned by the instance
       chatRoomInfo = webTestClient
           .post()
-          .uri("http://localhost:{port}/create", port)
+          .uri("/create")
           .contentType(MediaType.TEXT_PLAIN)
           .bodyValue("bar")
           .accept(MediaType.APPLICATION_JSON)
@@ -234,10 +215,7 @@ public abstract class AbstractConfigurationIT
         {
           webTestClient
               .put()
-              .uri(
-                  "http://localhost:{port}/{chatRoomId}/nerd/7",
-                  port,
-                  chatRoomId)
+              .uri("/{chatRoomId}/nerd/7", chatRoomId)
               .contentType(MediaType.TEXT_PLAIN)
               .accept(MediaType.APPLICATION_JSON)
               .bodyValue("Hello world!")
@@ -257,8 +235,7 @@ public abstract class AbstractConfigurationIT
     MessageTo sentMessage = webTestClient
         .put()
         .uri(
-            "http://localhost:{port}/{chatRoomId}/nerd/{messageId}",
-            port,
+            "/{chatRoomId}/nerd/{messageId}",
             EXISTING_CHATROOM,
             RandomGenerator.getDefault().nextInt())
         .contentType(MediaType.TEXT_PLAIN)
@@ -274,10 +251,7 @@ public abstract class AbstractConfigurationIT
 
     Flux<MessageTo> result = webTestClient
         .get()
-        .uri(
-            "http://localhost:{port}/{chatRoomId}/listen",
-            port,
-            EXISTING_CHATROOM)
+        .uri("/{chatRoomId}/listen", EXISTING_CHATROOM)
         .accept(MediaType.TEXT_EVENT_STREAM)
         .exchange()
         .expectStatus().isOk()
diff --git a/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationWithShardingIT.java b/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationWithShardingIT.java
index f8e475ce..bc3f4981 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationWithShardingIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/AbstractConfigurationWithShardingIT.java
@@ -25,10 +25,7 @@ public abstract class AbstractConfigurationWithShardingIT extends AbstractConfig
         .untilAsserted(() ->
           webTestClient
               .put()
-              .uri(
-                  "http://localhost:{port}/{chatRoomId}/otto/66",
-                  port,
-                  otherChatRoomId)
+              .uri("/{chatRoomId}/otto/66", otherChatRoomId)
               .contentType(MediaType.TEXT_PLAIN)
               .accept(MediaType.APPLICATION_JSON)
               .bodyValue("The devil rules route 66")
-- 
2.39.5