Add detailed message in test assertion

(cherry picked from commit 506f602)

Author: acogoluegnes

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

@@ -39,6 +39,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
+import java.util.function.Supplier;
+
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
@@ -130,6 +132,10 @@ public static void waitAtMost(CallableBooleanSupplier condition) {
   }
 
   public static void waitAtMost(Duration timeout, CallableBooleanSupplier condition) {
+    waitAtMost(timeout, condition, null);
+  }
+
+  public static void waitAtMost(Duration timeout, CallableBooleanSupplier condition, Supplier<String> message) {
     try {
       if (condition.getAsBoolean()) {
         return;
@@ -156,7 +162,13 @@ public static void waitAtMost(Duration timeout, CallableBooleanSupplier conditio
       }
       waitedTime += waitTime;
     }
-    Assertions.fail("Waited " + timeout.getSeconds() + " second(s), condition never got true");
+    String msg;
+    if (message == null) {
+      msg = "Waited " + timeout.getSeconds() + " second(s), condition never got true";
+    } else {
+      msg = "Waited " + timeout.getSeconds() + " second(s), " + message.get();
+    }
+    Assertions.fail(msg);
   }
 
   public static void close(Connection connection) {

src/test/java/com/rabbitmq/client/test/functional/Metrics.java

@@ -30,7 +30,6 @@
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.client.test.TestUtils;
 import com.rabbitmq.tools.Host;
-import java.util.UUID;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -313,17 +312,20 @@ public void multiThreadedMetricsStandardConnection(ConnectionFactory connectionF
             }
 
 
-            List<Callable<Void>> tasks = new ArrayList<Callable<Void>>();
+            List<Callable<Void>> tasks = new ArrayList<>();
             for(int i = 0; i < nbTasks; i++) {
                 Channel channelForConsuming = channels[random.nextInt(nbChannels)];
-                tasks.add(random.nextInt(10)%2 == 0 ?
+                tasks.add(random.nextInt(10) % 2 == 0 ?
                     new BasicGetTask(channelForConsuming, true) :
                     new BasicConsumeTask(channelForConsuming, true));
             }
             executorService.invokeAll(tasks);
 
+            waitAtMost(timeout(), () -> metrics.getPublishedMessages().getCount() == nbOfMessages,
+                () -> "expecting " + nbOfMessages + " published message(s), got " + metrics.getPublishedMessages().getCount());
             assertThat(metrics.getPublishedMessages().getCount()).isEqualTo(nbOfMessages);
-            waitAtMost(timeout(), () -> metrics.getConsumedMessages().getCount() == nbOfMessages);
+            waitAtMost(timeout(), () -> metrics.getConsumedMessages().getCount() == nbOfMessages,
+                () -> "expecting " + nbOfMessages + " consumed message(s), got " + metrics.getConsumedMessages().getCount());
             assertThat(metrics.getAcknowledgedMessages().getCount()).isEqualTo(0L);
 
             // to remove the listeners
@@ -635,7 +637,7 @@ private void sendMessage(Channel channel) throws IOException {
     }
 
     private Duration timeout() {
-        return Duration.ofSeconds(10);
+        return Duration.ofSeconds(20);
     }
 
     private static class MultipleAckConsumer extends DefaultConsumer {