Every HiveMQ IT now uses getHost() (#5106)

Yannick Weber · web-flow · commit 55a131545b75 · 2022-02-22T13:15:20.000+01:00
Ensures better portability across different Docker environments.
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithCustomConfigIT.java
@@ -27,6 +27,7 @@ void test() throws Exception {
             final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
                 .identifier("publisher")
                 .serverPort(hivemq.getMqttPort())
+                .serverHost(hivemq.getHost())
                 .buildBlocking();
 
             publisher.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionFromDirectoryIT.java
@@ -23,7 +23,7 @@ void test() throws Exception {
                     .withLogLevel(Level.DEBUG)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
@@ -37,7 +37,7 @@ void test_wrongDirectoryName() throws Exception {
                 .withLogLevel(Level.DEBUG)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionIT.java
@@ -27,15 +27,15 @@ void test() throws Exception {
                      .withExtension(hiveMQExtension)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.stop();
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.stop();
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithExtensionSubclassIT.java
@@ -29,7 +29,7 @@ void test() throws Exception {
                      .withLogLevel(Level.DEBUG)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 }
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInExtensionHomeIT.java
@@ -43,7 +43,7 @@ void test() throws Exception {
                          "/additionalFiles/my-file.txt")) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithFileInHomeIT.java
@@ -41,7 +41,7 @@ void test() throws Exception {
 
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithLicenseIT.java
@@ -41,7 +41,7 @@ void test() throws Exception {
 
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/ContainerWithoutPlatformExtensionsIT.java
@@ -49,6 +49,7 @@ public void removeAllPlatformExtensions() throws InterruptedException {
 
             final Mqtt5BlockingClient client = MqttClient.builder()
                 .serverPort(hivemq.getMqttPort())
+                .serverHost(hivemq.getHost())
                 .useMqttVersion5()
                 .buildBlocking();
 
@@ -82,6 +83,7 @@ public void removeKafkaExtension() throws InterruptedException {
 
             final Mqtt5BlockingClient client = MqttClient.builder()
                 .serverPort(hivemq.getMqttPort())
+                .serverHost(hivemq.getHost())
                 .useMqttVersion5()
                 .buildBlocking();
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInCopiedDirectoryIT.java
@@ -51,7 +51,7 @@ void test() throws Exception {
                      .withFileInHomeFolder(createDirectory(), "directory")) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/CreateFileInExtensionDirectoryIT.java
@@ -39,7 +39,7 @@ void test() throws Exception {
                      .withExtension(hiveMQExtension)) {
 
             hivemq.start();
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionFromDirectoryIT.java
@@ -26,11 +26,11 @@ void test() throws Exception {
             hivemq.start();
 
 
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension("Modifier Extension", "modifier-extension");
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension("Modifier Extension", "modifier-extension");
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/DisableEnableExtensionIT.java
@@ -33,13 +33,13 @@ void test() throws Exception {
 
             hivemq.start();
 
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension(hiveMQExtension);
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
             hivemq.disableExtension(hiveMQExtension);
-            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort()));
+            assertThrows(ExecutionException.class, () -> TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost()));
             hivemq.enableExtension(hiveMQExtension);
-            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());
+            TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());
         }
     }
 
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoExtensionTestsIT.java
@@ -47,6 +47,7 @@ public void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client.builder()
             .serverPort(hivemqWithClasspathExtension.getMqttPort())
+            .serverHost(hivemqWithClasspathExtension.getHost())
             .buildBlocking();
 
         client.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoFilesIT.java
@@ -52,6 +52,7 @@ public void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client.builder()
             .serverPort(hivemq.getMqttPort())
+            .serverHost(hivemq.getHost())
             .buildBlocking();
 
         client.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/docs/DemoHiveMQContainerIT.java
@@ -51,6 +51,7 @@ public void test() throws Exception {
         // mqtt5client {
         final Mqtt5BlockingClient client = Mqtt5Client.builder()
             .serverPort(hivemqCe.getMqttPort())
+            .serverHost(hivemqCe.getHost())
             .buildBlocking();
 
         client.connect();
diff --git a/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java b/modules/hivemq/src/test/java/org/testcontainers/hivemq/util/TestPublishModifiedUtil.java
@@ -3,27 +3,29 @@
 import com.hivemq.client.mqtt.MqttGlobalPublishFilter;
 import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
 import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import org.jetbrains.annotations.NotNull;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 
 public class TestPublishModifiedUtil {
 
-    public static void testPublishModified(final int mqttPort) throws InterruptedException, ExecutionException {
+    public static void testPublishModified(final int mqttPort, final @NotNull String host) throws Exception {
         final CompletableFuture<Void> publishReceived = new CompletableFuture<>();
 
         final Mqtt5BlockingClient publisher = Mqtt5Client.builder()
-                .serverPort(mqttPort)
-                .identifier("publisher")
-                .buildBlocking();
+            .serverPort(mqttPort)
+            .serverHost(host)
+            .identifier("publisher")
+            .buildBlocking();
         publisher.connect();
 
         final Mqtt5BlockingClient subscriber = Mqtt5Client.builder()
-                .serverPort(mqttPort)
-                .identifier("subscriber")
-                .buildBlocking();
+            .serverPort(mqttPort)
+            .serverHost(host)
+            .identifier("subscriber")
+            .buildBlocking();
         subscriber.connect();
         subscriber.subscribeWith().topicFilter("test/topic").send();
         subscriber.toAsync().publishes(MqttGlobalPublishFilter.ALL, publish -> {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ void test() throws Exception {`
`23`	`23`	`.withLogLevel(Level.DEBUG)) {`
`24`	`24`
`25`	`25`	`hivemq.start();`
`26`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`26`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -37,7 +37,7 @@ void test_wrongDirectoryName() throws Exception {`
`37`	`37`	`.withLogLevel(Level.DEBUG)) {`
`38`	`38`
`39`	`39`	`hivemq.start();`
`40`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`40`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@ void test() throws Exception {`
`27`	`27`	`.withExtension(hiveMQExtension)) {`
`28`	`28`
`29`	`29`	`hivemq.start();`
`30`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`30`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`31`	`31`	`hivemq.stop();`
`32`	`32`
`33`	`33`	`hivemq.start();`
`34`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`34`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`35`	`35`	`hivemq.stop();`
`36`	`36`
`37`	`37`	`hivemq.start();`
`38`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`38`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void test() throws Exception {`
`29`	`29`	`.withLogLevel(Level.DEBUG)) {`
`30`	`30`
`31`	`31`	`hivemq.start();`
`32`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`32`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void test() throws Exception {`
`43`	`43`	`"/additionalFiles/my-file.txt")) {`
`44`	`44`
`45`	`45`	`hivemq.start();`
`46`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`46`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void test() throws Exception {`
`41`	`41`
`42`	`42`
`43`	`43`	`hivemq.start();`
`44`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`44`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ void test() throws Exception {`
`51`	`51`	`.withFileInHomeFolder(createDirectory(), "directory")) {`
`52`	`52`
`53`	`53`	`hivemq.start();`
`54`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`54`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void test() throws Exception {`
`39`	`39`	`.withExtension(hiveMQExtension)) {`
`40`	`40`
`41`	`41`	`hivemq.start();`
`42`		`- TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort());`
	`42`	`+ TestPublishModifiedUtil.testPublishModified(hivemq.getMqttPort(), hivemq.getHost());`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`