Skip to content

Commit d7a916f

Browse files
trasktrask
authored
Simplify smoke test apps (#2468)
* Simplify smoke test apps * Rename some tests * Fix * More * Fix
1 parent fd57874 commit d7a916f

File tree

134 files changed

+597
-1294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+597
-1294
lines changed

‎settings.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ include ':smoke-tests:apps:OpenTelemetryMetric'
107107
include ':smoke-tests:apps:RateLimitedSampling'
108108
include ':smoke-tests:apps:ReadOnly'
109109
include ':smoke-tests:apps:Sampling'
110-
include ':smoke-tests:apps:SamplingOverridesV1'
111-
include ':smoke-tests:apps:SamplingOverridesV2'
112-
include ':smoke-tests:apps:SpringBoot1_3Auto'
110+
include ':smoke-tests:apps:SamplingOverrides'
111+
include ':smoke-tests:apps:SamplingOverridesBackCompat'
112+
include ':smoke-tests:apps:SpringBoot'
113113
include ':smoke-tests:apps:SpringBootAttachInMain'
114114
include ':smoke-tests:apps:SpringBootAuto'
115-
include ':smoke-tests:apps:SpringBootTest'
115+
include ':smoke-tests:apps:SpringBootAuto1_3'
116116
include ':smoke-tests:apps:SpringCloudStream'
117117
include ':smoke-tests:apps:SpringScheduling'
118118
include ':smoke-tests:apps:Statsbeat'

‎smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerDisabledTest.java‎ renamed to ‎smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsDisabledTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
@Environment(JAVA_8)
3131
@UseAgent("disabled_applicationinsights.json")
32-
class MicrometerDisabledTest {
32+
class ActuatorMetricsDisabledTest {
3333

3434
@RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
3535

@@ -41,6 +41,6 @@ void doMostBasicTest() throws Exception {
4141
// sleep a bit and make sure no micrometer metrics are reported
4242
Thread.sleep(10000);
4343
assertThat(testing.mockedIngestion.getItemsEnvelopeDataType("MetricData"))
44-
.noneMatch(MicrometerTest::isMicrometerMetric);
44+
.noneMatch(ActuatorMetricsTest::isMicrometerMetric);
4545
}
4646
}

‎smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java‎ renamed to ‎smoke-tests/apps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.junit.jupiter.api.extension.RegisterExtension;
4343

4444
@UseAgent
45-
abstract class MicrometerTest {
45+
abstract class ActuatorMetricsTest {
4646

4747
@RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
4848

@@ -53,7 +53,7 @@ void doMostBasicTest() throws Exception {
5353

5454
List<Envelope> metricItems =
5555
testing.mockedIngestion.waitForItems(
56-
MicrometerTest::isMicrometerMetric, 1, 10, TimeUnit.SECONDS);
56+
ActuatorMetricsTest::isMicrometerMetric, 1, 10, TimeUnit.SECONDS);
5757

5858
MetricData data = (MetricData) ((Data<?>) metricItems.get(0).getData()).getBaseData();
5959
List<DataPoint> points = data.getMetrics();
@@ -89,29 +89,29 @@ static boolean isMicrometerMetric(Envelope input) {
8989
}
9090

9191
@Environment(JAVA_8)
92-
static class Java8Test extends MicrometerTest {}
92+
static class Java8Test extends ActuatorMetricsTest {}
9393

9494
@Environment(JAVA_8_OPENJ9)
95-
static class Java8OpenJ9Test extends MicrometerTest {}
95+
static class Java8OpenJ9Test extends ActuatorMetricsTest {}
9696

9797
@Environment(JAVA_11)
98-
static class Java11Test extends MicrometerTest {}
98+
static class Java11Test extends ActuatorMetricsTest {}
9999

100100
@Environment(JAVA_11_OPENJ9)
101-
static class Java11OpenJ9Test extends MicrometerTest {}
101+
static class Java11OpenJ9Test extends ActuatorMetricsTest {}
102102

103103
@Environment(JAVA_17)
104-
static class Java17Test extends MicrometerTest {}
104+
static class Java17Test extends ActuatorMetricsTest {}
105105

106106
@Environment(JAVA_17_OPENJ9)
107-
static class Java17OpenJ9Test extends MicrometerTest {}
107+
static class Java17OpenJ9Test extends ActuatorMetricsTest {}
108108

109109
@Environment(JAVA_18)
110-
static class Java18Test extends MicrometerTest {}
110+
static class Java18Test extends ActuatorMetricsTest {}
111111

112112
@Environment(JAVA_18_OPENJ9)
113-
static class Java18OpenJ9Test extends MicrometerTest {}
113+
static class Java18OpenJ9Test extends ActuatorMetricsTest {}
114114

115115
@Environment(JAVA_19)
116-
static class Java19Test extends MicrometerTest {}
116+
static class Java19Test extends ActuatorMetricsTest {}
117117
}

‎smoke-tests/apps/TraceJavaUtilLoggingUsingAgent/src/main/java/com/microsoft/applicationinsights/smoketestapp/ServletFuncs.java‎ renamed to ‎smoke-tests/apps/AutoPerfCounters/src/main/java/com/microsoft/applicationinsights/smoketestapp/HealthCheckServlet.java‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,15 @@
2121

2222
package com.microsoft.applicationinsights.smoketestapp;
2323

24-
import java.io.IOException;
25-
import java.io.PrintWriter;
24+
import javax.servlet.annotation.WebServlet;
25+
import javax.servlet.http.HttpServlet;
2626
import javax.servlet.http.HttpServletRequest;
2727
import javax.servlet.http.HttpServletResponse;
2828

29-
public class ServletFuncs {
29+
// this is used by the test infra in order to know when it's ok to start running the tests
30+
@WebServlet("")
31+
public class HealthCheckServlet extends HttpServlet {
3032

31-
protected static void geRrenderHtml(HttpServletRequest request, HttpServletResponse response)
32-
throws IOException {
33-
response.setContentType("text/html;charset=UTF-8");
34-
renderHtml(request, response.getWriter());
35-
}
36-
37-
private static void renderHtml(HttpServletRequest req, PrintWriter writer) {
38-
writer.println("<html>");
39-
writer.println("<head><title>Calculation Result</title></head>");
40-
writer.println("<body>");
41-
writer.printf("<h1>%s</h1>", req.getRequestURI());
42-
writer.println("<h2>OK!</h2>");
43-
writer.println("</body></html>");
44-
}
33+
@Override
34+
protected void doGet(HttpServletRequest request, HttpServletResponse response) {}
4535
}

‎smoke-tests/apps/AutoPerfCounters/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,4 @@
1313
<filter-name>ApplicationInsightsWebFilter</filter-name>
1414
<url-pattern>/*</url-pattern>
1515
</filter-mapping>
16-
<welcome-file-list>
17-
<welcome-file>index.jsp</welcome-file>
18-
<!--
19-
<welcome-file>index.html</welcome-file>
20-
<welcome-file>index.htm</welcome-file>
21-
<welcome-file>default.html</welcome-file>
22-
<welcome-file>default.htm</welcome-file>
23-
<welcome-file>default.jsp</welcome-file>
24-
-->
25-
</welcome-file-list>
2616
</web-app>

‎smoke-tests/apps/AutoPerfCounters/src/main/webapp/index.jsp‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PerfCountersDataTest.java‎ renamed to ‎smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AutoPerfCountersTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.junit.jupiter.api.extension.RegisterExtension;
4444

4545
@UseAgent
46-
abstract class PerfCountersDataTest {
46+
abstract class AutoPerfCountersTest {
4747

4848
@RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
4949

@@ -151,29 +151,29 @@ public boolean test(Envelope input) {
151151
}
152152

153153
@Environment(TOMCAT_8_JAVA_8)
154-
static class Tomcat8Java8Test extends PerfCountersDataTest {}
154+
static class Tomcat8Java8Test extends AutoPerfCountersTest {}
155155

156156
@Environment(TOMCAT_8_JAVA_8_OPENJ9)
157-
static class Tomcat8Java8OpenJ9Test extends PerfCountersDataTest {}
157+
static class Tomcat8Java8OpenJ9Test extends AutoPerfCountersTest {}
158158

159159
@Environment(TOMCAT_8_JAVA_11)
160-
static class Tomcat8Java11Test extends PerfCountersDataTest {}
160+
static class Tomcat8Java11Test extends AutoPerfCountersTest {}
161161

162162
@Environment(TOMCAT_8_JAVA_11_OPENJ9)
163-
static class Tomcat8Java11OpenJ9Test extends PerfCountersDataTest {}
163+
static class Tomcat8Java11OpenJ9Test extends AutoPerfCountersTest {}
164164

165165
@Environment(TOMCAT_8_JAVA_17)
166-
static class Tomcat8Java17Test extends PerfCountersDataTest {}
166+
static class Tomcat8Java17Test extends AutoPerfCountersTest {}
167167

168168
@Environment(TOMCAT_8_JAVA_18)
169-
static class Tomcat8Java18Test extends PerfCountersDataTest {}
169+
static class Tomcat8Java18Test extends AutoPerfCountersTest {}
170170

171171
@Environment(TOMCAT_8_JAVA_19)
172-
static class Tomcat8Java19Test extends PerfCountersDataTest {}
172+
static class Tomcat8Java19Test extends AutoPerfCountersTest {}
173173

174174
@Environment(WILDFLY_13_JAVA_8)
175-
static class Wildfly13Java8Test extends PerfCountersDataTest {}
175+
static class Wildfly13Java8Test extends AutoPerfCountersTest {}
176176

177177
@Environment(WILDFLY_13_JAVA_8_OPENJ9)
178-
static class Wildfly13Java8OpenJ9Test extends PerfCountersDataTest {}
178+
static class Wildfly13Java8OpenJ9Test extends AutoPerfCountersTest {}
179179
}

‎smoke-tests/apps/Cassandra/src/main/java/com/microsoft/applicationinsights/smoketestapp/CassandraTestServlet.java‎ renamed to ‎smoke-tests/apps/Cassandra/src/main/java/com/microsoft/applicationinsights/smoketestapp/CassandraServlet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import javax.servlet.http.HttpServletResponse;
3838

3939
@WebServlet("/*")
40-
public class CassandraTestServlet extends HttpServlet {
40+
public class CassandraServlet extends HttpServlet {
4141

4242
public void init() throws ServletException {
4343
try {

‎smoke-tests/apps/ClassicSdkWebInterop3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInteropTest.java‎ renamed to ‎smoke-tests/apps/ClassicSdkWebInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop2xTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.junit.jupiter.api.extension.RegisterExtension;
3737

3838
@UseAgent
39-
abstract class ClassicSdkWebInteropTest {
39+
abstract class ClassicSdkWebInterop2xTest {
4040

4141
@RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
4242

@@ -62,29 +62,29 @@ void doMostBasicTest() throws Exception {
6262
}
6363

6464
@Environment(TOMCAT_8_JAVA_8)
65-
static class Tomcat8Java8Test extends ClassicSdkWebInteropTest {}
65+
static class Tomcat8Java8Test extends ClassicSdkWebInterop2xTest {}
6666

6767
@Environment(TOMCAT_8_JAVA_8_OPENJ9)
68-
static class Tomcat8Java8OpenJ9Test extends ClassicSdkWebInteropTest {}
68+
static class Tomcat8Java8OpenJ9Test extends ClassicSdkWebInterop2xTest {}
6969

7070
@Environment(TOMCAT_8_JAVA_11)
71-
static class Tomcat8Java11Test extends ClassicSdkWebInteropTest {}
71+
static class Tomcat8Java11Test extends ClassicSdkWebInterop2xTest {}
7272

7373
@Environment(TOMCAT_8_JAVA_11_OPENJ9)
74-
static class Tomcat8Java11OpenJ9Test extends ClassicSdkWebInteropTest {}
74+
static class Tomcat8Java11OpenJ9Test extends ClassicSdkWebInterop2xTest {}
7575

7676
@Environment(TOMCAT_8_JAVA_17)
77-
static class Tomcat8Java17Test extends ClassicSdkWebInteropTest {}
77+
static class Tomcat8Java17Test extends ClassicSdkWebInterop2xTest {}
7878

7979
@Environment(TOMCAT_8_JAVA_18)
80-
static class Tomcat8Java18Test extends ClassicSdkWebInteropTest {}
80+
static class Tomcat8Java18Test extends ClassicSdkWebInterop2xTest {}
8181

8282
@Environment(TOMCAT_8_JAVA_19)
83-
static class Tomcat8Java19Test extends ClassicSdkWebInteropTest {}
83+
static class Tomcat8Java19Test extends ClassicSdkWebInterop2xTest {}
8484

8585
@Environment(WILDFLY_13_JAVA_8)
86-
static class Wildfly13Java8Test extends ClassicSdkWebInteropTest {}
86+
static class Wildfly13Java8Test extends ClassicSdkWebInterop2xTest {}
8787

8888
@Environment(WILDFLY_13_JAVA_8_OPENJ9)
89-
static class Wildfly13Java8OpenJ9Test extends ClassicSdkWebInteropTest {}
89+
static class Wildfly13Java8OpenJ9Test extends ClassicSdkWebInterop2xTest {}
9090
}

‎smoke-tests/apps/ClassicSdkWebInterop2x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInteropTest.java‎ renamed to ‎smoke-tests/apps/ClassicSdkWebInterop3x/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ClassicSdkWebInterop3xTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.junit.jupiter.api.extension.RegisterExtension;
3737

3838
@UseAgent
39-
abstract class ClassicSdkWebInteropTest {
39+
abstract class ClassicSdkWebInterop3xTest {
4040

4141
@RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
4242

@@ -62,29 +62,29 @@ void doMostBasicTest() throws Exception {
6262
}
6363

6464
@Environment(TOMCAT_8_JAVA_8)
65-
static class Tomcat8Java8Test extends ClassicSdkWebInteropTest {}
65+
static class Tomcat8Java8Test extends ClassicSdkWebInterop3xTest {}
6666

6767
@Environment(TOMCAT_8_JAVA_8_OPENJ9)
68-
static class Tomcat8Java8OpenJ9Test extends ClassicSdkWebInteropTest {}
68+
static class Tomcat8Java8OpenJ9Test extends ClassicSdkWebInterop3xTest {}
6969

7070
@Environment(TOMCAT_8_JAVA_11)
71-
static class Tomcat8Java11Test extends ClassicSdkWebInteropTest {}
71+
static class Tomcat8Java11Test extends ClassicSdkWebInterop3xTest {}
7272

7373
@Environment(TOMCAT_8_JAVA_11_OPENJ9)
74-
static class Tomcat8Java11OpenJ9Test extends ClassicSdkWebInteropTest {}
74+
static class Tomcat8Java11OpenJ9Test extends ClassicSdkWebInterop3xTest {}
7575

7676
@Environment(TOMCAT_8_JAVA_17)
77-
static class Tomcat8Java17Test extends ClassicSdkWebInteropTest {}
77+
static class Tomcat8Java17Test extends ClassicSdkWebInterop3xTest {}
7878

7979
@Environment(TOMCAT_8_JAVA_18)
80-
static class Tomcat8Java18Test extends ClassicSdkWebInteropTest {}
80+
static class Tomcat8Java18Test extends ClassicSdkWebInterop3xTest {}
8181

8282
@Environment(TOMCAT_8_JAVA_19)
83-
static class Tomcat8Java19Test extends ClassicSdkWebInteropTest {}
83+
static class Tomcat8Java19Test extends ClassicSdkWebInterop3xTest {}
8484

8585
@Environment(WILDFLY_13_JAVA_8)
86-
static class Wildfly13Java8Test extends ClassicSdkWebInteropTest {}
86+
static class Wildfly13Java8Test extends ClassicSdkWebInterop3xTest {}
8787

8888
@Environment(WILDFLY_13_JAVA_8_OPENJ9)
89-
static class Wildfly13Java8OpenJ9Test extends ClassicSdkWebInteropTest {}
89+
static class Wildfly13Java8OpenJ9Test extends ClassicSdkWebInterop3xTest {}
9090
}

0 commit comments

Comments
 (0)