Merge pull request #1050 from microsoft/trask/test-improvements

Test improvements

Author: trask

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/docker/AiDockerClient.java

@@ -197,7 +197,7 @@ public void stopContainer(String id) throws IOException, InterruptedException {
 
     public boolean isContainerRunning(String id) throws IOException, InterruptedException {
         Process p = new ProcessBuilder(dockerExePath, "inspect", "-f", "{{.State.Running}}", id).start();
-        waitAndCheckCodeForProcess(p, 1, TimeUnit.SECONDS, String.format("checking if container is running: %s", id));
+        waitAndCheckCodeForProcess(p, 10, TimeUnit.SECONDS, String.format("checking if container is running: %s", id));
 
         StringWriter sw = new StringWriter();
         try {

test/smoke/testApps/CoreAndFilter/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilterTests.java

@@ -1,17 +1,12 @@
 package com.microsoft.applicationinsights.smoketest;
 
-import org.junit.*;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class SpringBootAutoTest extends AiSmokeTest {
 
     @Test
     @TargetUri("/test")
-    public void doMostBasicTest() {
-        assertTrue("mocked ingestion has no data", mockedIngestion.hasData());
-        assertTrue("mocked ingestion has 0 items", mockedIngestion.getItemCount() > 0);
-
-        assertEquals(1, mockedIngestion.getCountForType("RequestData"));
+    public void doMostBasicTest() throws Exception {
+        mockedIngestion.waitForItems("RequestData", 1);
     }
 }

test/smoke/testApps/SpringBoot1_3Auto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java

@@ -1,17 +1,12 @@
 package com.microsoft.applicationinsights.smoketest;
 
-import org.junit.*;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class SpringBootAutoTest extends AiSmokeTest {
 
     @Test
     @TargetUri("/test")
-    public void doMostBasicTest() {
-        assertTrue("mocked ingestion has no data", mockedIngestion.hasData());
-        assertTrue("mocked ingestion has 0 items", mockedIngestion.getItemCount() > 0);
-
-        assertEquals(1, mockedIngestion.getCountForType("RequestData"));
+    public void doMostBasicTest() throws Exception {
+        mockedIngestion.waitForItems("RequestData", 1);
     }
 }

test/smoke/testApps/SpringBootAuto/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java

@@ -34,9 +34,6 @@ public void trackEvent() throws Exception {
         mockedIngestion.waitForItems("RequestData", 1);
         mockedIngestion.waitForItems("EventData", 2);
 
-        assertEquals(1, mockedIngestion.getCountForType("RequestData"));
-        assertEquals(2, mockedIngestion.getCountForType("EventData"));
-
         // TODO get event data envelope and verify value
         final List<EventData> data = mockedIngestion.getTelemetryDataByType("EventData");
         assertThat(data, hasItem(new TypeSafeMatcher<EventData>() {

test/smoke/testApps/SpringBootTest/src/main/java/com/springbootstartertest/controller/TargetObject.java

@@ -18,11 +18,11 @@ public class TraceLog4j1_2Test extends AiSmokeTest {
 
     @Test
     @TargetUri("/traceLog4j1_2")
-    public void testTraceLog4j1_2() {
+    public void testTraceLog4j1_2() throws Exception {
         // FIXME this doesn't work with jbosseap6; under investigation
         Assume.assumeFalse(currentImageName.contains("jbosseap6"));
 
-        assertEquals(6, mockedIngestion.getCountForType("MessageData"));
+        mockedIngestion.waitForItems("MessageData", 6);
 
         final List<MessageData> logs = mockedIngestion.getTelemetryDataByType("MessageData");
         logs.sort(new Comparator<MessageData>() {
@@ -76,8 +76,8 @@ public int compare(MessageData o1, MessageData o2) {
 
     @Test
     @TargetUri("traceLog4j1_2WithException")
-    public void testTraceLog4j1_2WithExeption() {
-        assertEquals(1, mockedIngestion.getCountForType("ExceptionData"));
+    public void testTraceLog4j1_2WithExeption() throws Exception {
+        mockedIngestion.waitForItems("ExceptionData", 1);
 
         ExceptionData ed1 = getTelemetryDataForType(0, "ExceptionData");
         List<ExceptionDetails> details = ed1.getExceptions();

test/smoke/testApps/SpringBootTest/src/smokeTest/java/com/springbootstartertest/smoketest/SpringbootSmokeTest.java

@@ -17,8 +17,8 @@ public class TraceLog4j2Test extends AiSmokeTest {
 
     @Test
     @TargetUri("/traceLog4j2")
-    public void testTraceLog4j2() {
-        assertEquals(6, mockedIngestion.getCountForType("MessageData"));
+    public void testTraceLog4j2() throws Exception {
+        mockedIngestion.waitForItems("MessageData", 6);
 
         final List<MessageData> logs = mockedIngestion.getTelemetryDataByType("MessageData");
         logs.sort(new Comparator<MessageData>() {
@@ -72,8 +72,8 @@ public int compare(MessageData o1, MessageData o2) {
 
     @Test
     @TargetUri("/traceLog4j2WithException")
-    public void testTraceLog4j2WithException() {
-        assertEquals(1, mockedIngestion.getCountForType("ExceptionData"));
+    public void testTraceLog4j2WithException() throws Exception {
+        mockedIngestion.waitForItems("ExceptionData", 1);
 
         ExceptionData ed1 = getTelemetryDataForType(0, "ExceptionData");
         List<ExceptionDetails> details = ed1.getExceptions();

test/smoke/testApps/TraceLog4j1_2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j1_2Test.java

@@ -5,6 +5,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+import com.microsoft.applicationinsights.internal.schemav2.Envelope;
 import com.microsoft.applicationinsights.internal.schemav2.ExceptionData;
 import com.microsoft.applicationinsights.internal.schemav2.ExceptionDetails;
 import com.microsoft.applicationinsights.internal.schemav2.MessageData;
@@ -26,8 +27,8 @@ public void skipJbosseap6AndJbosseap7Image() {
 
     @Test
     @TargetUri("/traceLogBack")
-    public void testTraceLogBack() {
-        assertEquals(5, mockedIngestion.getCountForType("MessageData"));
+    public void testTraceLogBack() throws Exception {
+        mockedIngestion.waitForItems("MessageData", 5);
 
         final List<MessageData> logs = mockedIngestion.getTelemetryDataByType("MessageData");
         logs.sort(new Comparator<MessageData>() {
@@ -74,8 +75,8 @@ public int compare(MessageData o1, MessageData o2) {
 
     @Test
     @TargetUri("traceLogBackWithException")
-    public void testTraceLogBackWithExeption() {
-        assertEquals(1, mockedIngestion.getCountForType("ExceptionData"));
+    public void testTraceLogBackWithExeption() throws Exception {
+        mockedIngestion.waitForItems("ExceptionData", 1);
 
         ExceptionData ed1 = getTelemetryDataForType(0, "ExceptionData");
         List<ExceptionDetails> details = ed1.getExceptions();

test/smoke/testApps/TraceLog4j2/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/TraceLog4j2Test.java

@@ -1,17 +1,12 @@
 package com.microsoft.applicationinsights.smoketest;
 
-import org.junit.*;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class WebAutoTest extends AiSmokeTest {
 
     @Test
     @TargetUri("/test")
-    public void doMostBasicTest() {
-        assertTrue("mocked ingestion has no data", mockedIngestion.hasData());
-        assertTrue("mocked ingestion has 0 items", mockedIngestion.getItemCount() > 0);
-
-        assertEquals(1, mockedIngestion.getCountForType("RequestData"));
+    public void doMostBasicTest() throws Exception {
+        mockedIngestion.waitForItems("RequestData", 1);
     }
 }