Fix metrics health check tests

Author: jknack

jooby-metrics/src/test/java/org/jooby/internal/metrics/HealthCheckRegistryInitializerTest.java

@@ -4,13 +4,13 @@
 
 import java.util.Map;
 
-import com.codahale.metrics.health.HealthCheck;
 import org.jooby.test.MockUnit;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import com.codahale.metrics.health.HealthCheck;
 import com.codahale.metrics.health.HealthCheckRegistry;
 import com.google.common.collect.ImmutableMap;
 
@@ -21,15 +21,14 @@ public class HealthCheckRegistryInitializerTest {
   @Test
   public void register() throws Exception {
     new MockUnit(HealthCheckRegistry.class, HealthCheck.class)
-      .expect(unit -> {
-        HealthCheckRegistry registry = unit.get(HealthCheckRegistry.class);
-        registry.register("h", unit.get(HealthCheck.class));
-        expectLastCall();
-      })
-      .run(unit -> {
-        Map<String, HealthCheck> checks = ImmutableMap.of("h", unit.get(HealthCheck.class));
-        HealthCheckRegistryInitializer hcri = new HealthCheckRegistryInitializer(
-        unit.get(HealthCheckRegistry.class), checks);
-      });
+        .expect(unit -> {
+          HealthCheckRegistry registry = unit.get(HealthCheckRegistry.class);
+          registry.register("h", unit.get(HealthCheck.class));
+          expectLastCall();
+        })
+        .run(unit -> {
+          Map<String, HealthCheck> checks = ImmutableMap.of("h", unit.get(HealthCheck.class));
+          new HealthCheckRegistryInitializer(unit.get(HealthCheckRegistry.class), checks);
+        });
   }
 }

jooby-metrics/src/test/java/org/jooby/metrics/MetricsTest.java

@@ -5,7 +5,6 @@
 
 import java.util.function.BiConsumer;
 
-import com.codahale.metrics.health.HealthCheckRegistry;
 import org.jooby.Env;
 import org.jooby.Jooby;
 import org.jooby.Route;
@@ -25,6 +24,7 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Reporter;
 import com.codahale.metrics.health.HealthCheck;
+import com.codahale.metrics.health.HealthCheckRegistry;
 import com.google.inject.Binder;
 import com.google.inject.binder.AnnotatedBindingBuilder;
 import com.google.inject.binder.LinkedBindingBuilder;
@@ -59,6 +59,7 @@ public class MetricsTest {
     expect(binder.bind(MetricRegistryInitializer.class)).andReturn(mrABB);
   };
 
+  @SuppressWarnings("unchecked")
   private Block bindHealthCheckRegistry = unit -> {
     HealthCheckRegistry registry = unit.get(HealthCheckRegistry.class);
 
@@ -72,7 +73,7 @@ public class MetricsTest {
   @SuppressWarnings("unchecked")
   private Block bindHealthCheckRegistryInitializer = unit -> {
     AnnotatedBindingBuilder<HealthCheckRegistryInitializer> hcrABB = unit
-      .mock(AnnotatedBindingBuilder.class);
+        .mock(AnnotatedBindingBuilder.class);
     hcrABB.asEagerSingleton();
 
     Binder binder = unit.get(Binder.class);
@@ -87,7 +88,7 @@ public class MetricsTest {
 
   private Block newHealthCheckRegistry = unit -> {
     HealthCheckRegistry registry = unit.constructor(HealthCheckRegistry.class)
-                                     .build();
+        .build();
     unit.registerMock(HealthCheckRegistry.class, registry);
   };
 
@@ -166,6 +167,11 @@ public void basicWithExtMetricRegistry() throws Exception {
           MetricRegistry registry = unit.mock(MetricRegistry.class);
           unit.registerMock(MetricRegistry.class, registry);
         })
+        .expect(unit -> {
+          HealthCheckRegistry registry = unit.constructor(HealthCheckRegistry.class)
+              .build();
+          unit.registerMock(HealthCheckRegistry.class, registry);
+        })
         .expect(mapBinderStatic)
         .expect(mapbinder(Metric.class, (unit, binder) -> {
         }))
@@ -191,31 +197,31 @@ public void basicWithExtMetricRegistry() throws Exception {
   @Test
   public void basicWithExtHealthCheckRegistry() throws Exception {
     new MockUnit(Env.class, Config.class, Binder.class)
-      .expect(newMetricRegistry)
-      .expect(unit -> {
-        HealthCheckRegistry registry = unit.mock(HealthCheckRegistry.class);
-        unit.registerMock(HealthCheckRegistry.class, registry);
-      })
-      .expect(mapBinderStatic)
-      .expect(mapbinder(Metric.class, (unit, binder) -> {
-      }))
-      .expect(mapbinder(HealthCheck.class, (unit, binder) -> {
-      }))
-      .expect(multibinderStatic)
-      .expect(routes)
-      .expect(setbinder(Reporter.class, (unit, binder) -> {
-
-      }))
-      .expect(bindMetricRegistry)
-      .expect(bindMetricRegistryInitializer)
-      .expect(bindHealthCheckRegistry)
-      .expect(bindHealthCheckRegistryInitializer)
-      .expect(onStop)
-      .run(unit -> {
-        HealthCheckRegistry registry = unit.get(HealthCheckRegistry.class);
-        new Metrics(registry)
-          .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
-      });
+        .expect(newMetricRegistry)
+        .expect(unit -> {
+          HealthCheckRegistry registry = unit.mock(HealthCheckRegistry.class);
+          unit.registerMock(HealthCheckRegistry.class, registry);
+        })
+        .expect(mapBinderStatic)
+        .expect(mapbinder(Metric.class, (unit, binder) -> {
+        }))
+        .expect(mapbinder(HealthCheck.class, (unit, binder) -> {
+        }))
+        .expect(multibinderStatic)
+        .expect(routes)
+        .expect(setbinder(Reporter.class, (unit, binder) -> {
+
+        }))
+        .expect(bindMetricRegistry)
+        .expect(bindMetricRegistryInitializer)
+        .expect(bindHealthCheckRegistry)
+        .expect(bindHealthCheckRegistryInitializer)
+        .expect(onStop)
+        .run(unit -> {
+          HealthCheckRegistry registry = unit.get(HealthCheckRegistry.class);
+          new Metrics(registry)
+              .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+        });
   }
 
   @Test
@@ -305,7 +311,8 @@ public void threadDump() throws Exception {
         .expect(unit -> {
           Router routes = unit.get(Router.class);
 
-          route(unit, routes, "/sys/thread-dump", unit.constructor(ThreadDumpHandler.class).build());
+          route(unit, routes, "/sys/thread-dump",
+              unit.constructor(ThreadDumpHandler.class).build());
         })
         .expect(setbinder(Reporter.class, (unit, binder) -> {
 

jooby-servlet/src/test/java/org/jooby/servlet/ServletContainerTest.java

@@ -1,5 +1,7 @@
 package org.jooby.servlet;
 
+import static org.junit.Assert.assertFalse;
+
 import org.junit.Test;
 
 public class ServletContainerTest {
@@ -18,4 +20,9 @@ public void stop() throws Exception {
   public void join() throws Exception {
     ServletContainer.NOOP.join();
   }
+
+  @Test
+  public void excutor() throws Exception {
+    assertFalse(ServletContainer.NOOP.executor().isPresent());
+  }
 }