Use onSuccess for asserting AsyncResult properly

eclipse-vertx · May 21, 2015 · 05a34e0 · 05a34e0
1 parent 8f77889
commit 05a34e0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 48 deletions.
diff --git a/src/test/java/io/vertx/test/core/AsyncTestBase.java b/src/test/java/io/vertx/test/core/AsyncTestBase.java
@@ -608,4 +608,14 @@ protected void waitUntil(BooleanSupplier supplier, long timeout) {
     }
   }
 
+  protected <T> Handler<AsyncResult<T>> onSuccess(Consumer<T> consumer) {
+    return result -> {
+      if (result.failed()) {
+        result.cause().printStackTrace();
+        fail(result.cause().getMessage());
+      } else {
+        consumer.accept(result.result());
+      }
+    };
+  }
 }
diff --git a/src/test/java/io/vertx/test/core/MetricsContextTest.java b/src/test/java/io/vertx/test/core/MetricsContextTest.java
@@ -89,12 +89,11 @@ public void testFactoryInCluster() throws Exception {
       metricsContext.set(Vertx.currentContext());
       return new DummyVertxMetrics();
     };
-    Vertx.clusteredVertx(new VertxOptions().setClustered(true).setMetricsOptions(new MetricsOptions().setEnabled(true)), ar -> {
+    Vertx.clusteredVertx(new VertxOptions().setClustered(true).setMetricsOptions(new MetricsOptions().setEnabled(true)), onSuccess(vertx -> {
-      assertTrue(ar.succeeded());
       assertSame(testThread, metricsThread.get());
       assertNull(metricsContext.get());
       testComplete();
-    });
+    }));
     await();
   }
 
@@ -174,12 +173,11 @@ public void close() {
         response.setStatusCode(200).setChunked(true).write("bye").end();
         response.close();
       });
-      server.listen(8080, "localhost", ar -> {
+      server.listen(8080, "localhost", onSuccess(s -> {
-        assertTrue(ar.succeeded());
         expectedThread.set(Thread.currentThread());
         expectedContext.set(Vertx.currentContext());
         latch.countDown();
-      });
+      }));
     });
     awaitLatch(latch);
     HttpClient client = vertx.createHttpClient();
@@ -278,12 +276,11 @@ public void close() {
           ws.write(Buffer.buffer("bye"));
         });
       });
-      server.listen(8080, "localhost", ar -> {
+      server.listen(8080, "localhost", onSuccess(s -> {
-        assertTrue(ar.succeeded());
         expectedThread.set(Thread.currentThread());
         expectedContext.set(Vertx.currentContext());
         latch.countDown();
-      });
+      }));
     });
     awaitLatch(latch);
     HttpClient client = vertx.createHttpClient();
@@ -383,10 +380,9 @@ public boolean isEnabled() {
       });
     });
     CountDownLatch latch = new CountDownLatch(1);
-    server.listen(8080, "localhost", ar -> {
+    server.listen(8080, "localhost", onSuccess(s -> {
-      assertTrue(ar.succeeded());
       latch.countDown();
-    });
+    }));
     awaitLatch(latch);
     Context ctx = contextFactory.apply(vertx);
     ctx.runOnContext(v1 -> {
@@ -490,10 +486,9 @@ public boolean isEnabled() {
       });
     });
     CountDownLatch latch = new CountDownLatch(1);
-    server.listen(8080, "localhost", ar -> {
+    server.listen(8080, "localhost", onSuccess(s -> {
-      assertTrue(ar.succeeded());
       latch.countDown();
-    });
+    }));
     awaitLatch(latch);
     Context ctx = contextFactory.apply(vertx);
     ctx.runOnContext(v1 -> {
@@ -589,19 +584,16 @@ public void close() {
           so.write("bye");
         });
       });
-      server.listen(1234, "localhost", ar -> {
+      server.listen(1234, "localhost", onSuccess(s -> {
-        assertTrue(ar.succeeded());
         expectedThread.set(Thread.currentThread());
         expectedContext.set(Vertx.currentContext());
         checker.accept(expectedThread.get(), expectedContext.get());
         latch.countDown();
-      });
+      }));
     });
     awaitLatch(latch);
     NetClient client = vertx.createNetClient();
-    client.connect(1234, "localhost", ar -> {
+    client.connect(1234, "localhost", onSuccess(so -> {
-      assertTrue(ar.succeeded());
-      NetSocket so = ar.result();
       so.handler(buf -> {
         so.closeHandler(v -> {
           executeInVanillaThread(() -> {
@@ -618,7 +610,7 @@ public void close() {
         so.close();
       });
       so.write("hello");
-    });
+    }));
     await();
   }
 
@@ -684,18 +676,15 @@ public void close() {
         so.write("bye");
       });
     });
-    server.listen(1234, "localhost", ar -> {
+    server.listen(1234, "localhost", onSuccess(s -> {
-      assertTrue(ar.succeeded());
       latch.countDown();
-    });
+    }));
     awaitLatch(latch);
     ctx.runOnContext(v1 -> {
       NetClient client = vertx.createNetClient();
       expectedThread.set(Thread.currentThread());
       expectedContext.set(Vertx.currentContext());
-      client.connect(1234, "localhost", ar -> {
+      client.connect(1234, "localhost", onSuccess(so -> {
-        assertTrue(ar.succeeded());
-        NetSocket so = ar.result();
         so.handler(buf -> {
           so.closeHandler(v -> {
             assertTrue(bytesReadCalled.get());
@@ -713,7 +702,7 @@ public void close() {
           so.close();
         });
         so.write("hello");
-      });
+      }));
     });
     await();
   }
@@ -815,11 +804,10 @@ public void close() {
     Vertx vertx = Vertx.vertx(new VertxOptions().setMetricsOptions(new MetricsOptions().setEnabled(true)));
     vertx.eventBus();
     executeInVanillaThread(() -> {
-      vertx.close(ar -> {
+      vertx.close(onSuccess(v -> {
-        assertTrue(ar.succeeded());
         assertTrue(closeCalled.get());
         testComplete();
-      });
+      }));
     });
     await();
   }
@@ -880,19 +868,18 @@ public void endHandleMessage(Void handler, Throwable failure) {
         checker.accept(consumerThread.get(), consumerContext.get());
         executeInVanillaThread(() -> {
           vertx.getOrCreateContext().runOnContext(v2 -> {
-            consumer.unregister(ar -> {
+            consumer.unregister(onSuccess(v3 -> {
               assertTrue(registeredCalled.get());
               assertTrue(beginHandleCalled.get());
               assertTrue(endHandleCalled.get());
               waitUntil(() -> unregisteredCalled.get());
               testComplete();
-            });
+            }));
           });
         });
-      }).completionHandler(ar -> {
+      }).completionHandler(onSuccess(v2 -> {
-        assertTrue(ar.succeeded());
         eb.send("the_address", "the_msg");
-      });
+      }));
     });
     await();
   }

diff --git a/src/test/java/io/vertx/test/core/VertxTestBase.java b/src/test/java/io/vertx/test/core/VertxTestBase.java
@@ -139,17 +139,6 @@ protected String findFileOnClasspath(String fileName) {
     }
   }
 
-  protected <T> Handler<AsyncResult<T>> onSuccess(Consumer<T> consumer) {
-    return result -> {
-      if (result.failed()) {
-        result.cause().printStackTrace();
-        fail(result.cause().getMessage());
-      } else {
-        consumer.accept(result.result());
-      }
-    };
-  }
-
   protected void setOptions(TCPSSLOptions sslOptions, KeyCertOptions options) {
     if (options instanceof JksOptions) {
       sslOptions.setKeyStoreOptions((JksOptions) options);