br/TACO-137 converted metric handler integration tests to use mocks i…

…n hopes it solves a race condition
xjdr · Apr 19, 2018 · 2fda754 · 2fda754
1 parent ffdd55c
commit 2fda754
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/xio-core/src/main/java/com/xjeffrose/xio/application/ApplicationState.java b/xio-core/src/main/java/com/xjeffrose/xio/application/ApplicationState.java
@@ -1,6 +1,7 @@
 package com.xjeffrose.xio.application;
 
 import com.codahale.metrics.MetricRegistry;
+import com.google.common.annotations.VisibleForTesting;
 import com.xjeffrose.xio.bootstrap.ChannelConfiguration;
 import com.xjeffrose.xio.bootstrap.ClientChannelConfiguration;
 import com.xjeffrose.xio.bootstrap.ServerChannelConfiguration;
@@ -33,7 +34,12 @@ public class ApplicationState {
   @Getter
   private final XioTracing tracing;
 
-  @Getter private final MetricRegistry metricRegistry;
+  @Getter private MetricRegistry metricRegistry;
+
+  @VisibleForTesting
+  public void setMetricRegistry(MetricRegistry metricRegistry) {
+    this.metricRegistry = metricRegistry;
+  }
 
   private final AtomicReference<IpFilterConfig> ipFilterConfig;
 

diff --git a/xio-core/src/test/java/com/xjeffrose/xio/metric/HttpServerMetricHandlerIntegrationTest.java b/xio-core/src/test/java/com/xjeffrose/xio/metric/HttpServerMetricHandlerIntegrationTest.java
@@ -1,6 +1,6 @@
 package com.xjeffrose.xio.metric;
 
-import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
@@ -22,7 +22,8 @@
 
 public class HttpServerMetricHandlerIntegrationTest {
   private Application application = null;
-  private MetricRegistry metricRegistry = null;
+  private Meter requestsMeter = null;
+  private Meter successMeter = null;
 
   @Before
   public void before() {
@@ -32,52 +33,39 @@ public void before() {
                 "exampleServer", (bs) -> bs.addToPipeline(new SmartHttpPipeline(TestHandler::new)))
             .build();
 
-    metricRegistry = application.getState().getMetricRegistry();
-  }
-
-  @After
-  public void stop() {
-    application.close();
-  }
+    MetricRegistry metricRegistry = mock(MetricRegistry.class);
 
-  @Test
-  public void testRequestMetricH1() throws Exception {
-    InetSocketAddress address = application.instrumentation("exampleServer").boundAddress();
-    ClientHelper.https(address, Protocol.HTTP_1_1);
-    ClientHelper.https(address, Protocol.HTTP_1_1);
+    requestsMeter = mock(Meter.class);
+    when(metricRegistry.meter("requests")).thenReturn(requestsMeter);
+    successMeter = mock(Meter.class);
+    when(metricRegistry.meter("statusClassSuccess")).thenReturn(successMeter);
 
-    Meter meter = metricRegistry.meter("requests");
-    assertEquals(2, meter.getCount());
+    application.getState().setMetricRegistry(metricRegistry);
   }
 
-  @Test
-  public void testRequestMetricH2() throws Exception {
-    InetSocketAddress address = application.instrumentation("exampleServer").boundAddress();
-    ClientHelper.https(address, Protocol.HTTP_2, Protocol.HTTP_1_1);
-    ClientHelper.https(address, Protocol.HTTP_2, Protocol.HTTP_1_1);
-
-    Meter meter = metricRegistry.meter("requests");
-    assertEquals(2, meter.getCount());
+  @After
+  public void tearDown() {
+    application.close();
   }
 
   @Test
-  public void teststatusClassMetricH1() throws Exception {
+  public void testMetricsH1() throws Exception {
     InetSocketAddress address = application.instrumentation("exampleServer").boundAddress();
     ClientHelper.https(address, Protocol.HTTP_1_1);
     ClientHelper.https(address, Protocol.HTTP_1_1);
 
-    Meter meter = metricRegistry.meter("statusClassSuccess");
-    assertEquals(2, meter.getCount());
+    verify(requestsMeter, times(2)).mark();
+    verify(successMeter, times(2)).mark();
   }
 
   @Test
-  public void teststatusClassMetricH2() throws Exception {
+  public void testMetricsH2() throws Exception {
     InetSocketAddress address = application.instrumentation("exampleServer").boundAddress();
     ClientHelper.https(address, Protocol.HTTP_2, Protocol.HTTP_1_1);
     ClientHelper.https(address, Protocol.HTTP_2, Protocol.HTTP_1_1);
 
-    Meter meter = metricRegistry.meter("statusClassSuccess");
-    assertEquals(2, meter.getCount());
+    verify(requestsMeter, times(2)).mark();
+    verify(successMeter, times(2)).mark();
   }
 
   private class TestHandler extends SimpleChannelInboundHandler<Request> {