Fix parent/child injector tests #583

Author: jknack

coverage-report/src/test/java/org/jooby/issues/PullRequest583Test.java

@@ -1,37 +1,39 @@
 package org.jooby.issues;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.jooby.test.ServerFeature;
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Test;
 
-import java.util.concurrent.atomic.AtomicReference;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 
 /**
  * @author Johannes Schneider (<a href="mailto:[email protected]">[email protected]</a>)
  */
 public class PullRequest583Test extends ServerFeature {
-  private final AtomicReference<Injector> createdInjector = new AtomicReference<>();
-
   {
+
+    AtomicReference<Injector> ref = new AtomicReference<>();
+
     injector((stage, module) -> {
       Injector injector = Guice.createInjector(module);
-      createdInjector.set(injector);
+      ref.set(injector);
       return injector;
     });
+
+    get("/583", () -> {
+      Injector injector = require(Injector.class);
+      Assert.assertSame(injector, ref.get());
+      return "OK";
+    });
   }
 
   @Test
-  public void appShouldBeMountedOnApplicationPath() throws Exception {
-    Assert.assertNull(createdInjector.get());
-
-    start();
-    try {
-      Injector injector = require(Injector.class);
-      Assert.assertNotNull(injector);
-      Assert.assertSame(injector, createdInjector.get());
-    } finally {
-      stop();
-    }
+  public void customInjector() throws Exception {
+    request()
+        .get("/583")
+        .expect("OK");
   }
 }

coverage-report/src/test/java/org/jooby/issues/PullRequest583WithChildInjectorTest.java

@@ -1,41 +1,45 @@
 package org.jooby.issues;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.jooby.test.ServerFeature;
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Test;
 
-import java.util.concurrent.atomic.AtomicReference;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 
 /**
  * @author Johannes Schneider (<a href="mailto:[email protected]">[email protected]</a>)
  */
 public class PullRequest583WithChildInjectorTest extends ServerFeature {
-  private final AtomicReference<Injector> createdInjector = new AtomicReference<>();
-
-  private final Injector parentInjector = Guice.createInjector(
-    binder -> binder.bind(MyInjectedClass.class).toInstance(new MyInjectedClass()));
 
   {
+    AtomicReference<Injector> ref = new AtomicReference<>();
+
+    Injector parentInjector = Guice.createInjector(
+        binder -> binder.bind(MyInjectedClass.class).toInstance(new MyInjectedClass()));
 
     injector((stage, module) -> {
       Injector injector = parentInjector.createChildInjector(module);
-      createdInjector.set(injector);
+      ref.set(injector);
       return injector;
     });
+
+    get("/583", () -> {
+      Injector injector = require(Injector.class);
+      Assert.assertSame(injector, ref.get());
+      Assert.assertSame(parentInjector.getInstance(MyInjectedClass.class),
+          injector.getInstance(MyInjectedClass.class));
+      return "OK";
+    });
   }
 
   @Test
-  public void appShouldBeMountedOnApplicationPath() throws Exception {
-    Assert.assertNull(createdInjector.get());
-
-    start();
-    try {
-      Injector injector = require(Injector.class);
-      Assert.assertSame(parentInjector.getInstance(MyInjectedClass.class), injector.getInstance(MyInjectedClass.class));
-    } finally {
-      stop();
-    }
+  public void childInjector() throws Exception {
+    request()
+        .get("/583")
+        .expect("OK");
   }
 
   private static class MyInjectedClass {