Skip to content

Commit 8ec2df1

Browse files
authored
Split the slowest smoke test to reduce PR check time (#4598)
1 parent 2883926 commit 8ec2df1

File tree

2 files changed

+37
-18
lines changed

2 files changed

+37
-18
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
package com.microsoft.applicationinsights.smoketest;
5+
6+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
7+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9;
8+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
10+
11+
/**
12+
* Container for additional environment variants of {@link CoreAndFilter3xUsingOld3xAgentTest}.
13+
*
14+
* <p>This class is split out so build/CI can run the "core" environment matrix from {@link
15+
* CoreAndFilter3xUsingOld3xAgentTest} (e.g. via Gradle {@code --tests
16+
* "*CoreAndFilter3xUsingOld3xAgentTest*"}) independently from these extra environments. This keeps
17+
* the default job/runtime smaller while still allowing coverage for Tomcat Java 17 and WildFly Java
18+
* 8 when desired.
19+
*
20+
* <p>The outer class intentionally contains no tests; only the nested classes are executed.
21+
*/
22+
public class CoreAndFilter3xUsingOld3xAgentSplitTest {
23+
24+
@Environment(TOMCAT_8_JAVA_17)
25+
static class Tomcat8Java17Test extends CoreAndFilter3xUsingOld3xAgentTest {}
26+
27+
@Environment(TOMCAT_8_JAVA_17_OPENJ9)
28+
static class Tomcat8Java17OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {}
29+
30+
// note: old 3.x agents don't support Java 19
31+
32+
@Environment(WILDFLY_13_JAVA_8)
33+
static class Wildfly13Java8Test extends CoreAndFilter3xUsingOld3xAgentTest {}
34+
35+
@Environment(WILDFLY_13_JAVA_8_OPENJ9)
36+
static class Wildfly13Java8OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {}
37+
}

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

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

66
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
77
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;
108
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
119
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
12-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
13-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
1410
import static java.util.concurrent.TimeUnit.SECONDS;
1511
import static org.assertj.core.api.Assertions.assertThat;
1612

@@ -537,18 +533,4 @@ static class Tomcat8Java11Test extends CoreAndFilter3xUsingOld3xAgentTest {}
537533

538534
@Environment(TOMCAT_8_JAVA_11_OPENJ9)
539535
static class Tomcat8Java11OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {}
540-
541-
@Environment(TOMCAT_8_JAVA_17)
542-
static class Tomcat8Java17Test extends CoreAndFilter3xUsingOld3xAgentTest {}
543-
544-
@Environment(TOMCAT_8_JAVA_17_OPENJ9)
545-
static class Tomcat8Java17OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {}
546-
547-
// note: old 3.x agents don't support Java 19
548-
549-
@Environment(WILDFLY_13_JAVA_8)
550-
static class Wildfly13Java8Test extends CoreAndFilter3xUsingOld3xAgentTest {}
551-
552-
@Environment(WILDFLY_13_JAVA_8_OPENJ9)
553-
static class Wildfly13Java8OpenJ9Test extends CoreAndFilter3xUsingOld3xAgentTest {}
554536
}

0 commit comments

Comments
 (0)