Enhance test expectation message

Author: acogoluegnes

src/test/java/com/rabbitmq/perf/TestUtils.java

@@ -25,6 +25,7 @@
 import java.util.Locale;
 import java.util.concurrent.ThreadFactory;
 import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.assertj.core.api.Condition;
@@ -44,7 +45,11 @@ static int randomNetworkPort() throws IOException {
     return port;
   }
 
-  public static void waitAtMost(int timeoutInSeconds, BooleanSupplier condition)
+  public static void waitAtMost(int timeoutInSeconds, BooleanSupplier condition) throws InterruptedException {
+    waitAtMost(timeoutInSeconds, condition, null);
+  }
+
+  public static void waitAtMost(int timeoutInSeconds, BooleanSupplier condition, Supplier<String> message)
       throws InterruptedException {
     if (condition.getAsBoolean()) {
       return;
@@ -59,7 +64,13 @@ public static void waitAtMost(int timeoutInSeconds, BooleanSupplier condition)
       }
       waitedTime += waitTime;
     }
-    fail("Waited " + timeoutInSeconds + " second(s), condition never got true");
+    String msg;
+    if (message == null) {
+      msg = "Waited " + timeoutInSeconds + " second(s), condition never got true";
+    } else {
+      msg = "Waited " + timeoutInSeconds + " second(s), " + message.get();
+    }
+    fail(msg);
   }
 
   public static ThreadFactory threadFactory(TestInfo info) {

src/test/java/com/rabbitmq/perf/it/ConnectionRecoveryIT.java

@@ -288,7 +288,9 @@ public void shouldRecoverWhenConnectionsAreKilledAndUsingPublishingInterval(
     waitAtMost(10, () -> msgConsumed.get() >= 3 * producerConsumerCount);
     long messageCountBeforeClosing = msgConsumed.get();
     closeAllConnections();
-    waitAtMost(20, () -> msgConsumed.get() >= 2 * messageCountBeforeClosing);
+    long expectedMessageCount = 2 * messageCountBeforeClosing;
+    waitAtMost(20, () -> msgConsumed.get() >= expectedMessageCount,
+        () -> String.format("Expecting at least %d messages, got %d", expectedMessageCount, msgConsumed.get()));
     assertThat(testIsDone.get()).isFalse();
   }
 

src/test/java/com/rabbitmq/perf/it/Host.java

@@ -26,6 +26,8 @@
 
 public class Host {
 
+  private static final String DOCKER_PREFIX = "DOCKER:";
+
   public static String capture(InputStream is) throws IOException {
     BufferedReader br = new BufferedReader(new InputStreamReader(is));
     String line;
@@ -101,9 +103,9 @@ public static void startBrokerApp() throws IOException {
   public static String rabbitmqctlCommand() {
     String rabbitmqCtl = System.getProperty("rabbitmqctl.bin");
     if (rabbitmqCtl == null) {
-      throw new IllegalStateException("Please define the rabbitmqctl.bin system property");
+      rabbitmqCtl = DOCKER_PREFIX + "rabbitmq";
     }
-    if (rabbitmqCtl.startsWith("DOCKER:")) {
+    if (rabbitmqCtl.startsWith(DOCKER_PREFIX)) {
       String containerId = rabbitmqCtl.split(":")[1];
       return "docker exec " + containerId + " rabbitmqctl";
     } else {