Fix #1389

Close vert.x instances in the LauncherTest and StarterTest Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
eclipse-vertx · Apr 25, 2016 · a6a4301 · a6a4301
1 parent 5bfc9d6
commit a6a4301
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 9 deletions.
diff --git a/src/main/java/io/vertx/core/impl/launcher/commands/BareCommand.java b/src/main/java/io/vertx/core/impl/launcher/commands/BareCommand.java
@@ -363,4 +363,11 @@ protected String getDefaultAddress() {
   public void setExecutionContext(ExecutionContext context) {
     this.executionContext = context;
   }
+
+  /**
+   * @return the vert.x instance if created.
+   */
+  public synchronized Vertx vertx() {
+    return vertx;
+  }
 }
diff --git a/src/test/java/io/vertx/core/impl/launcher/commands/ClasspathHandlerTest.java b/src/test/java/io/vertx/core/impl/launcher/commands/ClasspathHandlerTest.java
@@ -56,12 +56,12 @@ public void setUp() throws IOException {
   }
 
   @After
-  public void tearDown() {
+  public void tearDown() throws InterruptedException {
     if (run != null) {
-      run.vertx.close();
+      close(run.vertx);
     }
     if (bare != null) {
-      bare.vertx.close();
+      close(bare.vertx);
     }
   }
 

diff --git a/src/test/java/io/vertx/test/core/LauncherTest.java b/src/test/java/io/vertx/test/core/LauncherTest.java
@@ -24,7 +24,9 @@
 import io.vertx.core.metrics.MetricsOptions;
 import io.vertx.core.metrics.impl.DummyVertxMetrics;
 import io.vertx.core.spi.VertxMetricsFactory;
+import io.vertx.core.spi.launcher.Command;
 import io.vertx.core.spi.metrics.VertxMetrics;
+import org.junit.AfterClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -44,6 +46,7 @@ public class LauncherTest extends VertxTestBase {
   private String expectedVersion;
   private ByteArrayOutputStream out;
   private PrintStream stream;
+  private Vertx vertx;
 
   @Override
   public void setUp() throws Exception {
@@ -76,6 +79,10 @@ public void tearDown() throws Exception {
 
     out.close();
     stream.close();
+
+    if (vertx != null) {
+      vertx.close();
+    }
   }
 
 
@@ -184,6 +191,18 @@ public void testRunVerticleWithMainVerticleInManifestNoArgs() throws Exception {
     launcher.dispatch(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
+
+    cleanup(launcher);
+  }
+
+  private void cleanup(Launcher launcher) {
+    RunCommand run = (RunCommand) launcher.getExistingCommandInstance("run");
+    if (run != null) {
+      Vertx v = run.vertx();
+      if (v != null) {
+        v.close();
+      }
+    }
   }
 
   @Test
@@ -201,6 +220,8 @@ public void testRunVerticleWithMainVerticleInManifestWithArgs() throws Exception
     launcher.dispatch(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 10);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
+
+    cleanup(launcher);
   }
 
   @Test
@@ -249,8 +270,11 @@ public void testRunWithOverriddenDefaultCommand() throws Exception {
 
     HelloCommand.called = false;
     String[] args = {"run", TestVerticle.class.getName(), "--name=vert.x"};
-    Launcher.main(args);
+    Launcher launcher = new Launcher();
+    launcher.dispatch(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
+
+    cleanup(launcher);
   }
 
   @Test
@@ -264,8 +288,11 @@ public void testRunWithOverriddenDefaultCommandRequiringArgs() throws Exception
     Files.copy(manifest.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING);
 
     String[] args = {TestVerticle.class.getName()};
-    Launcher.main(args);
+    Launcher launcher = new Launcher();
+    launcher.dispatch(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
+
+    cleanup(launcher);
   }
 
 
@@ -530,7 +557,6 @@ class MyLauncher extends Launcher {
     boolean afterStartingVertxInvoked = false;
     boolean beforeDeployingVerticle = false;
 
-    Vertx vertx;
     VertxOptions options;
     DeploymentOptions deploymentOptions;
     JsonObject config;
@@ -569,7 +595,7 @@ public void beforeStartingVertx(VertxOptions options) {
     @Override
     public void afterStartingVertx(Vertx vertx) {
       afterStartingVertxInvoked = true;
-      this.vertx = vertx;
+      LauncherTest.this.vertx = vertx;
     }
 
     @Override

diff --git a/src/test/java/io/vertx/test/core/StarterTest.java b/src/test/java/io/vertx/test/core/StarterTest.java
@@ -26,6 +26,7 @@
 import io.vertx.core.metrics.impl.DummyVertxMetrics;
 import io.vertx.core.spi.VertxMetricsFactory;
 import io.vertx.core.spi.metrics.VertxMetrics;
+import org.junit.AfterClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -44,6 +45,8 @@
  */
 public class StarterTest extends VertxTestBase {
 
+  Vertx vertx;
+
   @Override
   public void setUp() throws Exception {
     super.setUp();
@@ -65,6 +68,10 @@ public void setUp() throws Exception {
   public void tearDown() throws Exception {
     clearProperties();
     super.tearDown();
+
+    if (vertx != null) {
+      vertx.close();
+    }
   }
 
   @Test
@@ -74,6 +81,7 @@ public void testVersion() throws Exception {
     starter.run(args);
     // TODO some way of getting this from the version in pom.xml
     assertEquals(System.getProperty("vertxVersion"), starter.getVersion());
+    cleanup(starter);
   }
 
   @Test
@@ -93,6 +101,7 @@ public void testRunVerticleMultiple(int instances) throws Exception {
     waitUntil(() -> TestVerticle.instanceCount.get() == instances);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
     starter.assertHooksInvoked();
+    cleanup(starter);
   }
 
   @Test
@@ -103,6 +112,7 @@ public void testRunVerticleClustered() throws Exception {
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
     starter.assertHooksInvoked();
+    cleanup(starter);
   }
 
   @Test
@@ -113,6 +123,7 @@ public void testRunVerticleHA() throws Exception {
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
     starter.assertHooksInvoked();
+    cleanup(starter);
   }
 
 
@@ -123,6 +134,13 @@ public void testRunVerticleWithMainVerticleInManifestNoArgs() throws Exception {
     starter.run(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
+    cleanup(starter);
+  }
+
+  private void cleanup(MyStarter starter) {
+    if (starter != null  && starter.getVertx() != null) {
+      starter.getVertx().close();
+    }
   }
 
   @Test
@@ -132,6 +150,7 @@ public void testRunVerticleWithMainVerticleInManifestWithHA() throws Exception {
     starter.run(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
+    cleanup(starter);
   }
 
   @Test
@@ -141,6 +160,7 @@ public void testRunVerticleWithMainVerticleInManifestWithArgs() throws Exception
     starter.run(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(Arrays.asList(args), TestVerticle.processArgs);
+    cleanup(starter);
   }
 
   @Test
@@ -151,6 +171,7 @@ public void testRunVerticleWithConfString() throws Exception {
     starter.run(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(conf, TestVerticle.conf);
+    cleanup(starter);
   }
 
   @Rule
@@ -168,6 +189,7 @@ public void testRunVerticleWithConfFile() throws Exception {
     starter.run(args);
     waitUntil(() -> TestVerticle.instanceCount.get() == 1);
     assertEquals(conf, TestVerticle.conf);
+    cleanup(starter);
   }
 
   @Test
@@ -201,10 +223,11 @@ private void testConfigureFromSystemProperties(boolean clustered) throws Excepti
     VertxOptions opts = starter.getVertxOptions();
 
     assertEquals(123, opts.getEventLoopPoolSize(), 0);
-    assertEquals(123767667l, opts.getMaxEventLoopExecuteTime());
+    assertEquals(123767667L, opts.getMaxEventLoopExecuteTime());
     assertEquals(true, opts.getMetricsOptions().isEnabled());
     assertEquals("somegroup", opts.getHAGroup());
 
+    cleanup(starter);
   }
 
   private void clearProperties() {
@@ -245,6 +268,8 @@ public MetricsOptions newOptions() {
       VertxOptions opts = starter.getVertxOptions();
       CustomMetricsOptions custom = (CustomMetricsOptions) opts.getMetricsOptions();
       assertEquals("customPropertyValue", custom.getCustomProperty());
+
+      cleanup(starter);
     } finally {
       ConfigurableMetricsFactory.delegate = null;
     }
@@ -268,6 +293,7 @@ public void testConfigureFromSystemPropertiesInvalidPropertyName() throws Except
       def.getMetricsOptions().setEnabled(true);
     }
     assertEquals(def, opts);
+    cleanup(starter);
   }
 
   @Test
@@ -287,6 +313,7 @@ public void testConfigureFromSystemPropertiesInvalidPropertyType() throws Except
       def.getMetricsOptions().setEnabled(true);
     }
     assertEquals(def, opts);
+    cleanup(starter);
   }
 
   @Test
@@ -296,14 +323,15 @@ public void testRunWithCommandLine() throws Exception {
     String cl = "run java:" + TestVerticle.class.getCanonicalName() + " -instances " + instances;
     starter.run(cl);
     waitUntil(() -> TestVerticle.instanceCount.get() == instances);
+    cleanup(starter);
   }
 
   class MyStarter extends Starter {
     boolean beforeStartingVertxInvoked = false;
     boolean afterStartingVertxInvoked = false;
     boolean beforeDeployingVerticle = false;
 
-    public Vertx getVert() {
+    public Vertx getVertx() {
       return vertx;
     }
 
@@ -341,6 +369,7 @@ protected void beforeDeployingVerticle(DeploymentOptions deploymentOptions) {
     }
 
     public void assertHooksInvoked() {
+      StarterTest.this.vertx = vertx;
       assertTrue(beforeStartingVertxInvoked);
       assertTrue(afterStartingVertxInvoked);
       assertTrue(beforeDeployingVerticle);