Faster tests (#2606)

microsoft · Oct 20, 2022 · c44d4b2 · c44d4b2
1 parent 8e1b94a
commit c44d4b2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/...x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter2xTest.java b/...x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter2xTest.java
@@ -7,6 +7,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
@@ -437,9 +438,9 @@ void testRequestSlowWithResponseTime() throws Exception {
   }
 
   @Test
-  @TargetUri("/slowLoop?responseTime=20")
+  @TargetUri("/slowLoop?responseTime=5")
   void testSlowRequestUsingCpuBoundLoop() throws Exception {
-    validateSlowTest(20, "GET /CoreAndFilter2x/slowLoop");
+    validateSlowTest(5, "GET /CoreAndFilter2x/slowLoop");
   }
 
   @Test
@@ -505,8 +506,8 @@ private void validateSlowTest(int expectedDurationSeconds, String operationName)
     RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
 
     long actual = rd.getDuration().getTotalMilliseconds();
-    long expected = (new Duration(0, 0, 0, expectedDurationSeconds, 0).getTotalMilliseconds());
-    long tolerance = 2 * 1000; // 2 seconds
+    long expected = SECONDS.toMillis(expectedDurationSeconds);
+    long tolerance = 2000; // 2 seconds
 
     long min = expected - tolerance;
     long max = expected + tolerance;

diff --git a/...x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xTest.java b/...x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xTest.java
@@ -12,6 +12,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.AvailabilityData;
@@ -29,7 +30,6 @@
 import com.microsoft.applicationinsights.smoketest.schemav2.SeverityLevel;
 import java.util.Comparator;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -469,9 +469,9 @@ void testRequestSlowWithResponseTime() throws Exception {
   }
 
   @Test
-  @TargetUri("/slowLoop?responseTime=20")
+  @TargetUri("/slowLoop?responseTime=5")
   void testSlowRequestUsingCpuBoundLoop() throws Exception {
-    validateSlowTest(20, "GET /CoreAndFilter3x/slowLoop");
+    validateSlowTest(5, "GET /CoreAndFilter3x/slowLoop");
   }
 
   @Test
@@ -499,7 +499,7 @@ public boolean test(Envelope input) {
             },
             1,
             10,
-            TimeUnit.SECONDS);
+            SECONDS);
 
     Envelope edEnvelope = edList.get(0);
 
@@ -537,8 +537,8 @@ private void validateSlowTest(int expectedDurationSeconds, String operationName)
     RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
 
     long actual = rd.getDuration().getTotalMilliseconds();
-    long expected = (new Duration(0, 0, 0, expectedDurationSeconds, 0).getTotalMilliseconds());
-    long tolerance = 2 * 1000; // 2 seconds
+    long expected = SECONDS.toMillis(expectedDurationSeconds);
+    long tolerance = 2000; // 2 seconds
 
     long min = expected - tolerance;
     long max = expected + tolerance;

diff --git a/.../java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentTest.java b/.../java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentTest.java
@@ -11,6 +11,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
@@ -442,9 +443,9 @@ void testRequestSlowWithResponseTime() throws Exception {
   }
 
   @Test
-  @TargetUri("/slowLoop?responseTime=20")
+  @TargetUri("/slowLoop?responseTime=5")
   void testSlowRequestUsingCpuBoundLoop() throws Exception {
-    validateSlowTest(20, "GET /CoreAndFilter3xUsingOld3xAgent/slowLoop");
+    validateSlowTest(5, "GET /CoreAndFilter3xUsingOld3xAgent/slowLoop");
   }
 
   @Test
@@ -510,8 +511,8 @@ private void validateSlowTest(int expectedDurationSeconds, String operationName)
     RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
 
     long actual = rd.getDuration().getTotalMilliseconds();
-    long expected = (new Duration(0, 0, 0, expectedDurationSeconds, 0).getTotalMilliseconds());
-    long tolerance = 2 * 1000; // 2 seconds
+    long expected = SECONDS.toMillis(expectedDurationSeconds);
+    long tolerance = 2000; // 2 seconds
 
     long min = expected - tolerance;
     long max = expected + tolerance;