Merge pull request #70 from hivemq/develop

Version 1.3.1

Author: AcidSepp

build.gradle

@@ -6,7 +6,7 @@ plugins {
 /* ******************** metadata ******************** */
 
 allprojects {
-    version '1.3.0'
+    version '1.3.1'
     group 'com.hivemq'
     description 'Testcontainers for testing HiveMQ Extensions and Java MQTT Applications.'
 
@@ -47,7 +47,7 @@ allprojects {
     }
 
     ext {
-        testContainersVersion = '1.15.0'
+        testContainersVersion = '1.15.1'
         extensionSDKVersion = '4.4.4'
         hmcVersion = '1.2.1'
         junit4Version = '4.13.1'

core/src/main/java/com/hivemq/testcontainer/core/GradleHiveMQExtensionSupplier.java

@@ -23,6 +23,7 @@
 import java.io.File;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.AbstractMap;
 import java.util.Map;
 import java.util.function.Supplier;
@@ -66,7 +67,7 @@ public class GradleHiveMQExtensionSupplier implements Supplier<File> {
      */
     public static @NotNull GradleHiveMQExtensionSupplier direct() {
 
-        return new GradleHiveMQExtensionSupplier(new File(""));
+        return new GradleHiveMQExtensionSupplier(Paths.get("").toAbsolutePath().toFile());
     }
 
     /**

core/src/main/java/com/hivemq/testcontainer/core/HiveMQTestContainerCore.java

@@ -667,6 +667,12 @@ public int getMqttPort() {
         return this.getMappedPort(MQTT_PORT);
     }
 
+    @Override
+    public void stop() {
+        waitStrategy.reset();
+        super.stop();
+    }
+
     protected void signExtension(final @NotNull String extensionId, final @NotNull File jar) {
         // NOOP
     }

core/src/main/java/com/hivemq/testcontainer/core/MultiLogMessageWaitStrategy.java

@@ -23,6 +23,7 @@
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
 import org.testcontainers.utility.LogUtils;
 
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -68,4 +69,11 @@ protected void waitUntilReady() {
         regexes.put(regEx, false);
         return this;
     }
+
+    public @NotNull MultiLogMessageWaitStrategy reset() {
+        for (final Map.Entry<String, Boolean> stringBooleanEntry : regexes.entrySet()) {
+            stringBooleanEntry.setValue(false);
+        }
+        return this;
+    }
 }

junit4/src/test/java/com/hivemq/testcontainer/junit4/ContainerWithExtensionIT.java

@@ -15,10 +15,10 @@
  */
 package com.hivemq.testcontainer.junit4;
 
-import org.jetbrains.annotations.NotNull;
 import com.hivemq.testcontainer.core.HiveMQExtension;
 import com.hivemq.testcontainer.util.MyExtension;
 import com.hivemq.testcontainer.util.TestPublishModifiedUtil;
+import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 
 /**
@@ -42,5 +42,13 @@ public void test() throws Exception {
         rule.start();
         TestPublishModifiedUtil.testPublishModified(rule.getMqttPort());
         rule.stop();
+
+        rule.start();
+        TestPublishModifiedUtil.testPublishModified(rule.getMqttPort());
+        rule.stop();
+
+        rule.start();
+        TestPublishModifiedUtil.testPublishModified(rule.getMqttPort());
+        rule.stop();
     }
 }

junit5/src/test/java/com/hivemq/testcontainer/junit5/ContainerWithExtensionIT.java

@@ -45,5 +45,13 @@ void test() throws Exception {
         extension.beforeEach(null);
         TestPublishModifiedUtil.testPublishModified(extension.getMqttPort());
         extension.afterEach(null);
+
+        extension.beforeEach(null);
+        TestPublishModifiedUtil.testPublishModified(extension.getMqttPort());
+        extension.afterEach(null);
+
+        extension.beforeEach(null);
+        TestPublishModifiedUtil.testPublishModified(extension.getMqttPort());
+        extension.afterEach(null);
     }
 }