From 5e57b77e20442762437ce524482ec5259cb1c73d Mon Sep 17 00:00:00 2001
From: Julien Viet <julien@julienviet.com>
Date: Wed, 30 Jan 2019 16:45:15 +0100
Subject: [PATCH] Move the assertOnIOContext to VertxTestBase

---
 .../java/io/vertx/core/http/Http2TestBase.java     | 12 ------------
 .../java/io/vertx/test/core/AsyncTestBase.java     |  6 ++++++
 .../java/io/vertx/test/core/VertxTestBase.java     | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/test/java/io/vertx/core/http/Http2TestBase.java b/src/test/java/io/vertx/core/http/Http2TestBase.java
index c5e615d3a..2f0fb1907 100644
--- a/src/test/java/io/vertx/core/http/Http2TestBase.java
+++ b/src/test/java/io/vertx/core/http/Http2TestBase.java
@@ -73,16 +73,4 @@ public class Http2TestBase extends HttpTestBase {
   protected HttpClientOptions createBaseClientOptions() {
     return clientOptions;
   }
-
-  protected void assertOnIOContext(Context context) {
-    Context current = Vertx.currentContext();
-    assertNotNull(current);
-    assertEquals(context, current);
-    for (StackTraceElement elt : Thread.currentThread().getStackTrace()) {
-      if (elt.getMethodName().equals("executeFromIO")) {
-        return;
-      }
-    }
-    fail("Not from IO");
-  }
 }
diff --git a/src/test/java/io/vertx/test/core/AsyncTestBase.java b/src/test/java/io/vertx/test/core/AsyncTestBase.java
index 10532ec60..a0ce10ab0 100644
--- a/src/test/java/io/vertx/test/core/AsyncTestBase.java
+++ b/src/test/java/io/vertx/test/core/AsyncTestBase.java
@@ -12,8 +12,10 @@
 package io.vertx.test.core;
 
 import io.vertx.core.AsyncResult;
+import io.vertx.core.Context;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
+import io.vertx.core.impl.ContextInternal;
 import io.vertx.core.logging.Logger;
 import io.vertx.core.logging.LoggerFactory;
 import org.hamcrest.Matcher;
@@ -655,4 +657,8 @@ public class AsyncTestBase {
     });
     awaitLatch(latch);
   }
+
+  protected void assertSameEventLoop(Context expected, Context actual) {
+    assertSame(((ContextInternal)expected).nettyEventLoop(), ((ContextInternal)actual).nettyEventLoop());
+  }
 }
diff --git a/src/test/java/io/vertx/test/core/VertxTestBase.java b/src/test/java/io/vertx/test/core/VertxTestBase.java
index 27902a967..72cb1536f 100644
--- a/src/test/java/io/vertx/test/core/VertxTestBase.java
+++ b/src/test/java/io/vertx/test/core/VertxTestBase.java
@@ -235,4 +235,18 @@ public class VertxTestBase extends AsyncTestBase {
     }
     return contexts;
   }
+
+  protected void assertOnIOContext(Context context) {
+    Context current = Vertx.currentContext();
+    assertNotNull(current);
+    assertSameEventLoop(context, current);
+    for (StackTraceElement elt : Thread.currentThread().getStackTrace()) {
+      String className = elt.getClassName();
+      String methodName = elt.getMethodName();
+      if (className.equals("io.vertx.core.impl.ContextImpl") && methodName.equals("dispatch")) {
+        return;
+      }
+    }
+    fail("Not dispatching");
+  }
 }