Skip to content

Commit 56b59b8

Browse files
trasktrask
authored
Add smoke test assertions for exception type name (#3837)
1 parent 9cca8e7 commit 56b59b8

File tree

13 files changed

+64
-53
lines changed

13 files changed

+64
-53
lines changed

‎smoke-tests/apps/ClassicSdkLog4j1Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j1Interop2xTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ void testWithException() throws Exception {
117117
List<ExceptionDetails> details = ed.getExceptions();
118118
ExceptionDetails ex = details.get(0);
119119

120+
assertThat(ex.getTypeName()).isEqualTo("java.lang.Exception");
120121
assertThat(ex.getMessage()).isEqualTo("Fake Exception");
121122
assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
122123
assertThat(ed.getProperties()).containsEntry("Logger Message", "This is an exception!");

‎smoke-tests/apps/ClassicSdkLog4j2Interop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLog4j2Interop2xTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ void testWithException() throws Exception {
109109
List<ExceptionDetails> details = ed.getExceptions();
110110
ExceptionDetails ex = details.get(0);
111111

112+
assertThat(ex.getTypeName()).isEqualTo("java.lang.Exception");
112113
assertThat(ex.getMessage()).isEqualTo("Fake Exception");
113114
assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
114115
assertThat(ed.getProperties()).containsEntry("Logger Message", "This is an exception!");

‎smoke-tests/apps/ClassicSdkLogbackInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkLogbackInterop2xTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ void testWithException() throws Exception {
9393
RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
9494
ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
9595

96+
assertThat(ed.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
9697
assertThat(ed.getExceptions().get(0).getMessage()).isEqualTo("Fake Exception");
9798
assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
9899
assertThat(ed.getProperties()).containsEntry("Logger Message", "This is an exception!");

‎smoke-tests/apps/CoreAndFilter2x/src/main/java/com/microsoft/applicationinsights/smoketestapp/SimpleTrackExceptionServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3939
client.trackException(exception, properties, metrics);
4040

4141
ExceptionTelemetry et = new ExceptionTelemetry(exception);
42-
et.setSeverityLevel(SeverityLevel.Error);
42+
et.setSeverityLevel(SeverityLevel.Warning);
4343
client.track(et);
4444
}
4545
}

‎smoke-tests/apps/CoreAndFilter2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter2xTest.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -124,27 +124,27 @@ void testTrackException() throws Exception {
124124
List<ExceptionData> exceptions =
125125
testing.mockedIngestion.getTelemetryDataByTypeInRequest("ExceptionData");
126126
assertThat(exceptions)
127-
.anySatisfy(
128-
e ->
129-
assertThat(e.getExceptions())
130-
.extracting(ExceptionDetails::getMessage)
131-
.contains(expectedName));
132-
assertThat(exceptions)
133-
.anySatisfy(
127+
.satisfiesExactlyInAnyOrder(
128+
e -> {
129+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
130+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
131+
assertThat(e.getProperties()).isEmpty();
132+
assertThat(e.getMeasurements()).isEmpty();
133+
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
134+
},
134135
e -> {
135-
assertThat(e.getExceptions())
136-
.extracting(ExceptionDetails::getMessage)
137-
.contains(expectedName);
136+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
137+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
138138
assertThat(e.getProperties()).containsEntry("key", expectedProperties);
139139
assertThat(e.getMeasurements()).containsEntry("key", expectedMetrice);
140-
});
141-
assertThat(exceptions)
142-
.anySatisfy(
143-
e -> {
144-
assertThat(e.getExceptions())
145-
.extracting(ExceptionDetails::getMessage)
146-
.contains(expectedName);
147140
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
141+
},
142+
e -> {
143+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
144+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
145+
assertThat(e.getProperties()).isEmpty();
146+
assertThat(e.getMeasurements()).isEmpty();
147+
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.WARNING);
148148
});
149149

150150
SmokeTestExtension.assertParentChild(
@@ -460,6 +460,7 @@ void testAutoExceptionWithFailedRequest() throws Exception {
460460
assertThat(rd.getSuccess()).isFalse();
461461

462462
ExceptionDetails details = getExceptionDetails(ed);
463+
assertThat(details.getTypeName()).isEqualTo("javax.servlet.ServletException");
463464
assertThat(details.getMessage()).isEqualTo("This is a auto thrown exception !");
464465
}
465466

‎smoke-tests/apps/CoreAndFilter3x/src/main/java/com/microsoft/applicationinsights/smoketestapp/SimpleTrackExceptionServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3939
client.trackException(exception, properties, metrics);
4040

4141
ExceptionTelemetry et = new ExceptionTelemetry(exception);
42-
et.setSeverityLevel(SeverityLevel.Error);
42+
et.setSeverityLevel(SeverityLevel.Warning);
4343
client.track(et);
4444
}
4545
}

‎smoke-tests/apps/CoreAndFilter3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xTest.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -126,27 +126,27 @@ void testTrackException() throws Exception {
126126
List<ExceptionData> exceptions =
127127
testing.mockedIngestion.getTelemetryDataByTypeInRequest("ExceptionData");
128128
assertThat(exceptions)
129-
.anySatisfy(
130-
e ->
131-
assertThat(e.getExceptions())
132-
.extracting(ExceptionDetails::getMessage)
133-
.contains(expectedName));
134-
assertThat(exceptions)
135-
.anySatisfy(
129+
.satisfiesExactlyInAnyOrder(
130+
e -> {
131+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
132+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
133+
assertThat(e.getProperties()).isEmpty();
134+
assertThat(e.getMeasurements()).isEmpty();
135+
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
136+
},
136137
e -> {
137-
assertThat(e.getExceptions())
138-
.extracting(ExceptionDetails::getMessage)
139-
.contains(expectedName);
138+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
139+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
140140
assertThat(e.getProperties()).containsEntry("key", expectedProperties);
141141
assertThat(e.getMeasurements()).containsEntry("key", expectedMetrice);
142-
});
143-
assertThat(exceptions)
144-
.anySatisfy(
145-
e -> {
146-
assertThat(e.getExceptions())
147-
.extracting(ExceptionDetails::getMessage)
148-
.contains(expectedName);
149142
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
143+
},
144+
e -> {
145+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
146+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
147+
assertThat(e.getProperties()).isEmpty();
148+
assertThat(e.getMeasurements()).isEmpty();
149+
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.WARNING);
150150
});
151151

152152
SmokeTestExtension.assertParentChild(
@@ -492,6 +492,7 @@ void testAutoExceptionWithFailedRequest() throws Exception {
492492
assertThat(rd.getSuccess()).isFalse();
493493

494494
ExceptionDetails details = getExceptionDetails(ed);
495+
assertThat(details.getTypeName()).isEqualTo("javax.servlet.ServletException");
495496
assertThat(details.getMessage()).isEqualTo("This is a auto thrown exception !");
496497
}
497498

‎smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/main/java/com/microsoft/applicationinsights/smoketestapp/SimpleTrackExceptionServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
3939
client.trackException(exception, properties, metrics);
4040

4141
ExceptionTelemetry et = new ExceptionTelemetry(exception);
42-
et.setSeverityLevel(SeverityLevel.Error);
42+
et.setSeverityLevel(SeverityLevel.Warning);
4343
client.track(et);
4444
}
4545
}

‎smoke-tests/apps/CoreAndFilter3xUsingOld3xAgent/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilter3xUsingOld3xAgentTest.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -127,26 +127,27 @@ void testTrackException() throws Exception {
127127
List<ExceptionData> exceptions =
128128
testing.mockedIngestion.getTelemetryDataByTypeInRequest("ExceptionData");
129129
assertThat(exceptions)
130-
.anySatisfy(
131-
e ->
132-
assertThat(e.getExceptions())
133-
.extracting(ExceptionDetails::getMessage)
134-
.contains(expectedName));
135-
assertThat(exceptions)
136-
.anySatisfy(
130+
.satisfiesExactlyInAnyOrder(
131+
e -> {
132+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
133+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
134+
assertThat(e.getProperties()).isEmpty();
135+
assertThat(e.getMeasurements()).isEmpty();
136+
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
137+
},
137138
e -> {
138-
assertThat(e.getExceptions())
139-
.extracting(ExceptionDetails::getMessage)
140-
.contains(expectedName);
139+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
140+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
141141
assertThat(e.getProperties()).containsEntry("key", expectedProperties);
142142
assertThat(e.getMeasurements()).containsEntry("key", expectedMetrice);
143-
});
144-
assertThat(exceptions)
145-
.anySatisfy(
143+
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
144+
},
146145
e -> {
147-
assertThat(e.getExceptions())
148-
.extracting(ExceptionDetails::getMessage)
149-
.contains(expectedName);
146+
assertThat(e.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
147+
assertThat(e.getExceptions().get(0).getMessage()).isEqualTo(expectedName);
148+
assertThat(e.getProperties()).isEmpty();
149+
assertThat(e.getMeasurements()).isEmpty();
150+
// this should be WARNING, but is incorrect in old 3.x Java agent (prior to 3.4.0)
150151
assertThat(e.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
151152
});
152153

@@ -485,6 +486,7 @@ public boolean test(Envelope input) {
485486
assertThat(rd.getSuccess()).isFalse();
486487

487488
ExceptionDetails details = getExceptionDetails(ed);
489+
assertThat(details.getTypeName()).isEqualTo("javax.servlet.ServletException");
488490
assertThat(details.getMessage()).isEqualTo("This is a auto thrown exception !");
489491
}
490492

‎smoke-tests/apps/JavaUtilLogging/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaUtilLoggingTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ void testWithException() throws Exception {
9292

9393
ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
9494

95+
assertThat(ed.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.Exception");
9596
assertThat(ed.getExceptions().get(0).getMessage()).isEqualTo("Fake Exception");
9697
assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
9798
assertThat(ed.getProperties()).containsEntry("Logger Message", "This is an exception!");

0 commit comments

Comments
 (0)