more unit tests/test coverage

jknack · jknack · commit 58b7f6e5e7f4 · 2016-07-19T17:27:07.000-03:00
diff --git a/jooby/src/main/java/org/jooby/Jooby.java b/jooby/src/main/java/org/jooby/Jooby.java
@@ -4070,13 +4070,8 @@ public void stop() {
   private static void fireStop(final Injector injector, final Jooby app, final Logger log,
       final List<CheckedConsumer<Registry>> onStop) {
     // stop services
-    onStop.forEach(c -> {
-      try {
-        c.accept(app);
-      } catch (Throwable x) {
-        log.error("shutdown of {} resulted in error", c, x);
-      }
-    });
+    onStop.forEach(c -> Try.run(() -> c.accept(app))
+        .onFailure(x -> log.error("shutdown of {} resulted in error", c, x)));
   }
 
   /**
diff --git a/jooby/src/main/java/org/jooby/Response.java b/jooby/src/main/java/org/jooby/Response.java
@@ -630,7 +630,19 @@ default Response status(final int status) {
    */
   void end();
 
+  /**
+   * Append an after handler, will be execute before sending response.
+   *
+   * @param handler A handler
+   * @see Route.After
+   */
   void push(Route.After handler);
 
+  /**
+   * Append complete handler, will be execute after sending response.
+   *
+   * @param handler A handler
+   * @see Route.After
+   */
   void push(Route.Complete handler);
 }
diff --git a/jooby/src/test/java/org/jooby/JoobyTest.java b/jooby/src/test/java/org/jooby/JoobyTest.java
@@ -687,6 +687,53 @@ public void onStartStopCallback() throws Exception {
         }, boot);
   }
 
+  @Test(expected = IllegalStateException.class)
+  public void appDidnStart() throws Exception {
+    new Jooby().require(Object.class);
+  }
+
+  @Test
+  public void onStopCallbackLogError() throws Exception {
+
+    new MockUnit(Binder.class, CheckedRunnable.class)
+        .expect(guice)
+        .expect(shutdown)
+        .expect(config)
+        .expect(env)
+        .expect(classInfo)
+        .expect(ssl)
+        .expect(charset)
+        .expect(locale)
+        .expect(zoneId)
+        .expect(timeZone)
+        .expect(dateTimeFormatter)
+        .expect(numberFormat)
+        .expect(decimalFormat)
+        .expect(renderers)
+        .expect(session)
+        .expect(routes)
+        .expect(routeHandler)
+        .expect(params)
+        .expect(requestScope)
+        .expect(webSockets)
+        .expect(tmpdir)
+        .expect(err)
+        .expect(unit -> {
+          unit.get(CheckedRunnable.class).run();
+          unit.get(CheckedRunnable.class).run();
+          expectLastCall().andThrow(new IllegalStateException("intentional err"));
+        })
+        .run(unit -> {
+
+          Jooby app = new Jooby()
+              .onStart(unit.get(CheckedRunnable.class))
+              .onStop(unit.get(CheckedRunnable.class));
+          app.start();
+          app.stop();
+
+        }, boot);
+  }
+
   @Test
   public void defaultsWithCallback() throws Exception {
 
diff --git a/jooby/src/test/java/org/jooby/ResponseForwardingTest.java b/jooby/src/test/java/org/jooby/ResponseForwardingTest.java
@@ -345,4 +345,32 @@ public void end() throws Exception {
         });
   }
 
+  @Test
+  public void pushAfter() throws Exception {
+    new MockUnit(Response.class, Route.After.class)
+        .expect(unit -> {
+          Response rsp = unit.get(Response.class);
+          rsp.push(unit.get(Route.After.class));
+        })
+        .run(unit -> {
+          Response rsp = new Response.Forwarding(unit.get(Response.class));
+
+          rsp.push(unit.get(Route.After.class));
+        });
+  }
+
+  @Test
+  public void pushComplete() throws Exception {
+    new MockUnit(Response.class, Route.Complete.class)
+        .expect(unit -> {
+          Response rsp = unit.get(Response.class);
+          rsp.push(unit.get(Route.Complete.class));
+        })
+        .run(unit -> {
+          Response rsp = new Response.Forwarding(unit.get(Response.class));
+
+          rsp.push(unit.get(Route.Complete.class));
+        });
+  }
+
 }
