From ba74b71985ed884f0f9afadb620d4bc99d56ff02 Mon Sep 17 00:00:00 2001
From: Julien Viet <julien@julienviet.com>
Date: Fri, 15 Nov 2019 13:01:28 +0100
Subject: [PATCH] Improve MetricsTest#testBroadcastMessage to avoid race when
 the metrics has not yet fully published the collected metrics which are
 asserted

---
 src/test/java/io/vertx/core/spi/metrics/MetricsTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/vertx/core/spi/metrics/MetricsTest.java b/src/test/java/io/vertx/core/spi/metrics/MetricsTest.java
index 5dea8fe6d..63b9a1026 100644
--- a/src/test/java/io/vertx/core/spi/metrics/MetricsTest.java
+++ b/src/test/java/io/vertx/core/spi/metrics/MetricsTest.java
@@ -108,8 +108,7 @@ public class MetricsTest extends VertxTestBase {
     AtomicInteger receiveCount = new AtomicInteger();
     for (Vertx vertx : to) {
       MessageConsumer<Object> consumer = vertx.eventBus().consumer(ADDRESS1);
-      consumer.completionHandler(done -> {
-        assertTrue(done.succeeded());
+      consumer.completionHandler(onSuccess(v -> {
         if (broadcastCount.incrementAndGet() == to.length) {
           String msg = TestUtils.randomAlphaString(10);
           if (publish) {
@@ -118,14 +117,15 @@ public class MetricsTest extends VertxTestBase {
             from.eventBus().send(ADDRESS1, msg);
           }
         }
-      });
+      }));
       consumer.handler(msg -> {
         if (receiveCount.incrementAndGet() == to.length) {
-          assertEquals(new HashSet<>(Arrays.asList(expected)), new HashSet<>(eventBusMetrics.getSentMessages()));
           testComplete();
         }
       });
     }
+    waitUntil(() -> eventBusMetrics.getSentMessages().size() == expected.length);
+    assertEquals(new HashSet<>(Arrays.asList(expected)), new HashSet<>(eventBusMetrics.getSentMessages()));
     await();
   }