Skip to content

Commit 841c6d9

Browse files
trasktrask
committed
Gradle 9 prereq: convert jar smoke tests to war
1 parent cbafd8d commit 841c6d9

39 files changed

Lines changed: 387 additions & 299 deletions

File tree

‎smoke-tests/apps/ActuatorMetrics/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("ai.smoke-test-jar")
2+
id("ai.smoke-test-war")
33
}
44

55
dependencies {

‎smoke-tests/apps/ActuatorMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55

66
import org.springframework.boot.SpringApplication;
77
import org.springframework.boot.autoconfigure.SpringBootApplication;
8+
import org.springframework.boot.builder.SpringApplicationBuilder;
9+
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
810

911
@SpringBootApplication
10-
public class SpringBootApp {
12+
public class SpringBootApp extends SpringBootServletInitializer {
1113

12-
public static void main(String[] args) {
14+
@Override
15+
protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
16+
return applicationBuilder.sources(SpringBootApp.class);
17+
}
1318

19+
public static void main(String[] args) {
1420
SpringApplication.run(SpringBootApp.class, args);
1521
}
1622
}

‎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
@@ -3,13 +3,13 @@
33

44
package com.microsoft.applicationinsights.smoketest;
55

6-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
6+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
77
import static org.assertj.core.api.Assertions.assertThat;
88

99
import org.junit.jupiter.api.Test;
1010
import org.junit.jupiter.api.extension.RegisterExtension;
1111

12-
@Environment(JAVA_8)
12+
@Environment(TOMCAT_8_JAVA_8)
1313
@UseAgent("disabled_applicationinsights.json")
1414
class ActuatorMetricsDisabledTest {
1515

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
package com.microsoft.applicationinsights.smoketest;
55

6-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
7-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
8-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
11-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9;
12-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
13-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
6+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
7+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
8+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9;
10+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
11+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9;
12+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
13+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1414
import static org.assertj.core.api.Assertions.assertThat;
1515

1616
import com.microsoft.applicationinsights.smoketest.schemav2.Data;
@@ -58,7 +58,7 @@ static boolean isMicrometerMetric(Envelope input) {
5858
return false;
5959
}
6060
MetricData data = (MetricData) ((Data<?>) input.getData()).getBaseData();
61-
if (!"/test".equals(data.getProperties().get("uri"))) {
61+
if (!"/ActuatorMetrics/test".equals(data.getProperties().get("uri"))) {
6262
return false;
6363
}
6464
for (DataPoint point : data.getMetrics()) {
@@ -69,27 +69,27 @@ static boolean isMicrometerMetric(Envelope input) {
6969
return false;
7070
}
7171

72-
@Environment(JAVA_8)
73-
static class Java8Test extends ActuatorMetricsTest {}
72+
@Environment(TOMCAT_8_JAVA_8)
73+
static class Tomcat8Java8Test extends ActuatorMetricsTest {}
7474

75-
@Environment(JAVA_8_OPENJ9)
76-
static class Java8OpenJ9Test extends ActuatorMetricsTest {}
75+
@Environment(TOMCAT_8_JAVA_8_OPENJ9)
76+
static class Tomcat8Java8OpenJ9Test extends ActuatorMetricsTest {}
7777

78-
@Environment(JAVA_11)
79-
static class Java11Test extends ActuatorMetricsTest {}
78+
@Environment(TOMCAT_8_JAVA_11)
79+
static class Tomcat8Java11Test extends ActuatorMetricsTest {}
8080

81-
@Environment(JAVA_11_OPENJ9)
82-
static class Java11OpenJ9Test extends ActuatorMetricsTest {}
81+
@Environment(TOMCAT_8_JAVA_11_OPENJ9)
82+
static class Tomcat8Java11OpenJ9Test extends ActuatorMetricsTest {}
8383

84-
@Environment(JAVA_17)
85-
static class Java17Test extends ActuatorMetricsTest {}
84+
@Environment(TOMCAT_8_JAVA_17)
85+
static class Tomcat8Java17Test extends ActuatorMetricsTest {}
8686

87-
@Environment(JAVA_17_OPENJ9)
88-
static class Java17OpenJ9Test extends ActuatorMetricsTest {}
87+
@Environment(TOMCAT_8_JAVA_17_OPENJ9)
88+
static class Tomcat8Java17OpenJ9Test extends ActuatorMetricsTest {}
8989

90-
@Environment(JAVA_21)
91-
static class Java21Test extends ActuatorMetricsTest {}
90+
@Environment(TOMCAT_8_JAVA_21)
91+
static class Tomcat8Java21Test extends ActuatorMetricsTest {}
9292

93-
@Environment(JAVA_21_OPENJ9)
94-
static class Java21OpenJ9Test extends ActuatorMetricsTest {}
93+
@Environment(TOMCAT_8_JAVA_21_OPENJ9)
94+
static class Tomcat8Java21OpenJ9Test extends ActuatorMetricsTest {}
9595
}

‎smoke-tests/apps/CustomInstrumentation/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("ai.smoke-test-jar")
2+
id("ai.smoke-test-war")
33
}
44

55
dependencies {

‎smoke-tests/apps/CustomInstrumentation/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@
55

66
import org.springframework.boot.SpringApplication;
77
import org.springframework.boot.autoconfigure.SpringBootApplication;
8+
import org.springframework.boot.builder.SpringApplicationBuilder;
9+
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
810

911
@SpringBootApplication
10-
public class SpringBootApp {
12+
public class SpringBootApp extends SpringBootServletInitializer {
13+
14+
@Override
15+
protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
16+
return applicationBuilder.sources(SpringBootApp.class);
17+
}
1118

1219
public static void main(String[] args) {
1320
SpringApplication.run(SpringBootApp.class, args);

‎smoke-tests/apps/CustomInstrumentation/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
package com.microsoft.applicationinsights.smoketest;
55

6-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
7-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
8-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
11-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9;
12-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
13-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
6+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
7+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
8+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9;
10+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
11+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9;
12+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
13+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1414
import static org.assertj.core.api.Assertions.assertThat;
1515
import static org.assertj.core.data.MapEntry.entry;
1616

@@ -44,7 +44,7 @@ void internalSpan() throws Exception {
4444

4545
MessageData md = (MessageData) ((Data<?>) mdEnvelope.getData()).getBaseData();
4646

47-
assertThat(telemetry.rd.getName()).isEqualTo("GET /internal-span");
47+
assertThat(telemetry.rd.getName()).isEqualTo("GET /CustomInstrumentation/internal-span");
4848
assertThat(telemetry.rd.getResponseCode()).isEqualTo("200");
4949
assertThat(telemetry.rd.getProperties())
5050
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
@@ -62,18 +62,24 @@ void internalSpan() throws Exception {
6262
assertThat(md.getProperties()).hasSize(3);
6363

6464
SmokeTestExtension.assertParentChild(
65-
telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope1, "GET /internal-span");
65+
telemetry.rd,
66+
telemetry.rdEnvelope,
67+
telemetry.rddEnvelope1,
68+
"GET /CustomInstrumentation/internal-span");
6669

6770
SmokeTestExtension.assertParentChild(
68-
telemetry.rdd1, telemetry.rddEnvelope1, mdEnvelope, "GET /internal-span");
71+
telemetry.rdd1,
72+
telemetry.rddEnvelope1,
73+
mdEnvelope,
74+
"GET /CustomInstrumentation/internal-span");
6975
}
7076

7177
@Test
7278
@TargetUri("/server-span")
7379
void serverSpan() throws Exception {
7480
List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 2);
7581

76-
Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /server-span");
82+
Envelope rdEnvelope1 = getRequestEnvelope(rdList, "GET /CustomInstrumentation/server-span");
7783
Envelope rdEnvelope2 = getRequestEnvelope(rdList, "TestController.run");
7884

7985
String operationId = rdEnvelope2.getTags().get("ai.operation.id");
@@ -89,7 +95,7 @@ void serverSpan() throws Exception {
8995
RequestData rd2 = (RequestData) ((Data<?>) rdEnvelope2.getData()).getBaseData();
9096
MessageData md = (MessageData) ((Data<?>) mdEnvelope.getData()).getBaseData();
9197

92-
assertThat(rd1.getName()).isEqualTo("GET /server-span");
98+
assertThat(rd1.getName()).isEqualTo("GET /CustomInstrumentation/server-span");
9399
assertThat(rd1.getResponseCode()).isEqualTo("200");
94100
assertThat(rd1.getProperties())
95101
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
@@ -120,27 +126,27 @@ private static Envelope getRequestEnvelope(List<Envelope> envelopes, String name
120126
throw new IllegalStateException("Could not find request with name: " + name);
121127
}
122128

123-
@Environment(JAVA_8)
124-
static class Java8Test extends CustomInstrumentationTest {}
129+
@Environment(TOMCAT_8_JAVA_8)
130+
static class Tomcat8Java8Test extends CustomInstrumentationTest {}
125131

126-
@Environment(JAVA_8_OPENJ9)
127-
static class Java8OpenJ9Test extends CustomInstrumentationTest {}
132+
@Environment(TOMCAT_8_JAVA_8_OPENJ9)
133+
static class Tomcat8Java8OpenJ9Test extends CustomInstrumentationTest {}
128134

129-
@Environment(JAVA_11)
130-
static class Java11Test extends CustomInstrumentationTest {}
135+
@Environment(TOMCAT_8_JAVA_11)
136+
static class Tomcat8Java11Test extends CustomInstrumentationTest {}
131137

132-
@Environment(JAVA_11_OPENJ9)
133-
static class Java11OpenJ9Test extends CustomInstrumentationTest {}
138+
@Environment(TOMCAT_8_JAVA_11_OPENJ9)
139+
static class Tomcat8Java11OpenJ9Test extends CustomInstrumentationTest {}
134140

135-
@Environment(JAVA_17)
136-
static class Java17Test extends CustomInstrumentationTest {}
141+
@Environment(TOMCAT_8_JAVA_17)
142+
static class Tomcat8Java17Test extends CustomInstrumentationTest {}
137143

138-
@Environment(JAVA_17_OPENJ9)
139-
static class Java17OpenJ9Test extends CustomInstrumentationTest {}
144+
@Environment(TOMCAT_8_JAVA_17_OPENJ9)
145+
static class Tomcat8Java17OpenJ9Test extends CustomInstrumentationTest {}
140146

141-
@Environment(JAVA_21)
142-
static class Java21Test extends CustomInstrumentationTest {}
147+
@Environment(TOMCAT_8_JAVA_21)
148+
static class Tomcat8Java21Test extends CustomInstrumentationTest {}
143149

144-
@Environment(JAVA_21_OPENJ9)
145-
static class Java21OpenJ9Test extends CustomInstrumentationTest {}
150+
@Environment(TOMCAT_8_JAVA_21_OPENJ9)
151+
static class Tomcat8Java21OpenJ9Test extends CustomInstrumentationTest {}
146152
}

‎smoke-tests/apps/DiagnosticExtension/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("ai.smoke-test-jar")
2+
id("ai.smoke-test-war")
33
}
44

55
dependencies {

‎smoke-tests/apps/DiagnosticExtension/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,17 @@
55

66
import org.springframework.boot.SpringApplication;
77
import org.springframework.boot.autoconfigure.SpringBootApplication;
8+
import org.springframework.boot.builder.SpringApplicationBuilder;
9+
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
810

911
@SpringBootApplication
10-
public class SpringBootApp {
12+
public class SpringBootApp extends SpringBootServletInitializer {
13+
14+
@Override
15+
protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
16+
return applicationBuilder.sources(SpringBootApp.class);
17+
}
18+
1119
public static void main(String[] args) {
1220
SpringApplication.run(SpringBootApp.class, args);
1321
}

‎smoke-tests/apps/DiagnosticExtension/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticExtensionTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
package com.microsoft.applicationinsights.smoketest;
55

6-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
7-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
8-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
6+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
7+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
8+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1010
import static java.util.Collections.emptyMap;
1111

1212
import com.microsoft.applicationinsights.smoketest.fakeingestion.ProfilerState;
@@ -33,15 +33,15 @@ void doDelayedDiagnosticExtensionTest() throws Exception {
3333
Assertions.assertTrue(Boolean.parseBoolean(response));
3434
}
3535

36-
@Environment(JAVA_8)
37-
static class Java8Test extends DiagnosticExtensionTest {}
36+
@Environment(TOMCAT_8_JAVA_8)
37+
static class Tomcat8Java8Test extends DiagnosticExtensionTest {}
3838

39-
@Environment(JAVA_11)
40-
static class Java11Test extends DiagnosticExtensionTest {}
39+
@Environment(TOMCAT_8_JAVA_11)
40+
static class Tomcat8Java11Test extends DiagnosticExtensionTest {}
4141

42-
@Environment(JAVA_17)
43-
static class Java17Test extends DiagnosticExtensionTest {}
42+
@Environment(TOMCAT_8_JAVA_17)
43+
static class Tomcat8Java17Test extends DiagnosticExtensionTest {}
4444

45-
@Environment(JAVA_21)
46-
static class Java21Test extends DiagnosticExtensionTest {}
45+
@Environment(TOMCAT_8_JAVA_21)
46+
static class Tomcat8Java21Test extends DiagnosticExtensionTest {}
4747
}

0 commit comments

Comments
 (0)