Improve tests

Author: vietj

pom.xml

@@ -30,7 +30,7 @@
 
   <properties>
     <stack.version>3.6.0-SNAPSHOT</stack.version>
-    <termd.version>1.1.3</termd.version>
+    <termd.version>1.1.5</termd.version>
   </properties>
 
   <dependencyManagement>

src/main/java/io/vertx/ext/shell/command/base/BusTail.java

@@ -83,7 +83,7 @@ public void setLocal(boolean local) {
   public void process(CommandProcess process) {
     EventBus eb = process.vertx().eventBus();
     List<MessageConsumer<Object>> consumers = addresses.stream().map(address -> {
-      Handler<Message<Object>> consumer = msg -> {
+      Handler<Message<Object>> handler = msg -> {
         Object body = msg.body();
         String bodyString;
         if (body instanceof Buffer) {
@@ -103,7 +103,7 @@ public void process(CommandProcess process) {
           process.write(address + ":" + bodyString + "\n");
         }
       };
-      return local ? eb.localConsumer(address, consumer) : eb.consumer(address, consumer);
+      return local ? eb.localConsumer(address, handler) : eb.consumer(address, handler);
     }).collect(Collectors.toList());
     process.interruptHandler(done -> {
       process.end();

src/test/java/io/vertx/ext/shell/command/base/BusTest.java

@@ -352,12 +352,14 @@ private void assertSend(TestContext context, String address, Object body, int ti
   }
 
   private void assertSend(TestContext context, String address, Object body, DeliveryOptions options, int times) {
-    context.assertTrue(times > 0);
+    context.assertTrue(times > 0, "Could not send message " + body + " to address " + address);
     vertx.eventBus().send(address, body, options, ar -> {
       if (ar.failed()) {
         ReplyException ex = (ReplyException) ar.cause();
         if (ex.failureType() == NO_HANDLERS) {
           assertSend(context, address, body, options, times - 1);
+        } else {
+          context.fail();
         }
       }
     });

src/test/java/io/vertx/ext/shell/term/TelnetTermServerTest.java

@@ -57,6 +57,7 @@
 import java.io.Writer;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 /**
@@ -249,14 +250,19 @@ public void testOutBinaryFalse(TestContext context) throws Exception {
 
   @Test
   public void testDifferentCharset(TestContext context) throws Exception {
+    CompletableFuture<Void> closeLatch = new CompletableFuture<Void>();
     startTelnet(context, new TelnetTermOptions().setCharset("ISO_8859_1"), term -> {
       term.write("\u20AC");
-      term.close();
+      closeLatch.thenAccept(v -> {
+        term.close();
+      });
     });
     client.connect("localhost", server.actualPort());
     InputStream in = client.getInputStream();
     int b = in.read();
     context.assertEquals(63, b);
+    closeLatch.complete(null);
+
   }
 
   @Test