fix(test): do junit assert in vert.x and add timeout

Author: takeseem

vertx-web/src/test/java/io/vertx/ext/web/tests/SubRouterTest.java

@@ -18,13 +18,12 @@
 
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
-import io.vertx.core.http.HttpClientResponse;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
 import org.junit.Test;
 
-import java.io.IOException;
+import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 /**
@@ -762,9 +761,10 @@ public void testSetExceptionHandler() throws Exception {
       ctx.response().end();
     });
 
-    HttpClientResponse response = requestGet("/rest/product/123/ex").await();
-    assertEquals(500, response.statusCode());
-    assertEquals("Internal Server Error", response.body().await().toString());
+    requestGet("/rest/product/123/ex", (response, buffer) -> {
+      assertEquals(500, response.statusCode());
+      assertEquals("Internal Server Error", buffer.toString());
+    });
 
     assertRouterErrorHandlers("root", router, 500, "/rest/product/123/ex");
     assertRouterErrorHandlers("root", router, 404, "/rest/product/123/foo/404");
@@ -779,12 +779,13 @@ public void testSetExceptionHandler() throws Exception {
     assertRouterErrorHandlers("instance", instanceRouter, 404, "/rest/product/123/foo/404");
   }
 
-  private void assertRouterErrorHandlers(String name, Router router, int statusCode, String path) {
+  private void assertRouterErrorHandlers(String name, Router router, int statusCode, String path) throws TimeoutException {
     String handlerKey = name + "." + statusCode + ".errorHandler";
     router.errorHandler(statusCode, ctx -> ctx.response().setStatusCode(statusCode).end(handlerKey));
 
-    HttpClientResponse response = requestGet(path).await();
-    assertEquals(statusCode, response.statusCode());
-    assertEquals(handlerKey, response.body().await().toString());
+    requestGet(path, (response, buffer) -> {
+      assertEquals(statusCode, response.statusCode());
+      assertEquals(handlerKey, buffer.toString());
+    });
   }
 }

vertx-web/src/test/java/io/vertx/ext/web/tests/WebTestBase.java

@@ -37,6 +37,9 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 /**
@@ -318,8 +321,14 @@ public static void cleanupFileUploadDir() throws IOException {
     }
   }
 
-  public Future<HttpClientResponse> requestGet(String path) {
+  long timeout = 200;
+  TimeUnit timeoutUnit = TimeUnit.MILLISECONDS;
+
+  public void requestGet(String path, BiConsumer<HttpClientResponse, Buffer> assertAction) throws TimeoutException {
     RequestOptions options = new RequestOptions().setHost("localhost").setPort(server.actualPort()).setURI(path);
-    return client.request(options).compose(HttpClientRequest::send).compose(resp -> resp.body().map(resp));
+    client.request(options).compose(HttpClientRequest::send).compose(resp -> resp.body().compose(buffer -> {
+      assertAction.accept(resp, buffer);
+      return Future.succeededFuture();
+    })).await(timeout, timeoutUnit);
   }
 }