Merge pull request #1024 from microsoft/fix_flaky_test

Test is being flaky

Author: littleaj

web/src/test/java/com/microsoft/applicationinsights/web/internal/httputils/HttpServerHandlerTest.java

@@ -13,8 +13,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.mockito.InOrder;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -25,14 +23,12 @@
 import javax.servlet.http.HttpServletResponse;
 import java.net.MalformedURLException;
 import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.StringContains.containsString;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-@RunWith(JUnit4.class)
 public class HttpServerHandlerTest {
 
     @Rule public final ExpectedException thrown = ExpectedException.none();
@@ -152,7 +148,7 @@ public void requestTelemetryFieldsAreSetWhenHandleStartIsInvoked() throws Malfor
     }
 
     @Test
-    public void timeStatusCodeAreSetWhenHandleEndIsInvoked() throws MalformedURLException {
+    public void timeStatusCodeAreSetWhenHandleEndIsInvoked() throws Exception {
         RequestTelemetryContext rtc = httpServerHandler.handleStart(request, response);
         RequestTelemetry rt = rtc.getHttpRequestTelemetry();
         assertThat(rt.getId(), is(CoreMatchers.<String>notNullValue()));
@@ -161,7 +157,7 @@ public void timeStatusCodeAreSetWhenHandleEndIsInvoked() throws MalformedURLExce
         assertThat(rt.getUrl().toString(), equalTo(url));
         assertThat(rt.getContext().getUser().getUserAgent(), equalTo("User-Agent"));
         assertThat(rt.getTimestamp(), is(CoreMatchers.<Date>notNullValue()));
-
+        TimeUnit.MILLISECONDS.sleep(100); // pause so duration is nonzero
         httpServerHandler.handleEnd(request, response, rtc);
         // ensure same request telemetry is modified (picked from TLS)
         assertThat(rt.getDuration().getTotalMilliseconds(), is(not(0L)));