Skip to content

Commit 01d71e1

Browse files
heyamsheyams
authored
Replace tomcat8java20test with tomcat8java21test (#3664)
1 parent 33e3e2f commit 01d71e1

File tree

84 files changed

+278
-619
lines changed

Some content is hidden

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

84 files changed

+278
-619
lines changed

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
99
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
11-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
1210
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
11+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
1413
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
1514
import static org.assertj.core.api.Assertions.assertThat;
@@ -88,12 +87,9 @@ static class Java17Test extends ActuatorMetricsTest {}
8887
@Environment(JAVA_17_OPENJ9)
8988
static class Java17OpenJ9Test extends ActuatorMetricsTest {}
9089

91-
@Environment(JAVA_20)
92-
static class JavaLatestTest extends ActuatorMetricsTest {}
93-
94-
@Environment(JAVA_20_OPENJ9)
95-
static class JavaLatestOpenJ9Test extends ActuatorMetricsTest {}
96-
9790
@Environment(JAVA_21)
98-
static class JavaPrereleaseTest extends ActuatorMetricsTest {}
91+
static class Java21Test extends ActuatorMetricsTest {}
92+
93+
@Environment(JAVA_21_OPENJ9)
94+
static class Java21OpenJ9Test extends ActuatorMetricsTest {}
9995
}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -147,11 +146,8 @@ static class Tomcat8Java11OpenJ9Test extends AutoPerfCountersTest {}
147146
@Environment(TOMCAT_8_JAVA_17)
148147
static class Tomcat8Java17Test extends AutoPerfCountersTest {}
149148

150-
@Environment(TOMCAT_8_JAVA_19)
151-
static class Tomcat8Java19Test extends AutoPerfCountersTest {}
152-
153-
@Environment(TOMCAT_8_JAVA_20)
154-
static class Tomcat8Java20Test extends AutoPerfCountersTest {}
149+
@Environment(TOMCAT_8_JAVA_21)
150+
static class Tomcat8Java21Test extends AutoPerfCountersTest {}
155151

156152
@Environment(WILDFLY_13_JAVA_8)
157153
static class Wildfly13Java8Test extends AutoPerfCountersTest {}

‎smoke-tests/apps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -63,11 +62,8 @@ static class Tomcat8Java11OpenJ9Test extends AzureSdkTest {}
6362
@Environment(TOMCAT_8_JAVA_17)
6463
static class Tomcat8Java17Test extends AzureSdkTest {}
6564

66-
@Environment(TOMCAT_8_JAVA_19)
67-
static class Tomcat8Java19Test extends AzureSdkTest {}
68-
69-
@Environment(TOMCAT_8_JAVA_20)
70-
static class Tomcat8Java20Test extends AzureSdkTest {}
65+
@Environment(TOMCAT_8_JAVA_21)
66+
static class Tomcat8Java21Test extends AzureSdkTest {}
7167

7268
@Environment(WILDFLY_13_JAVA_8)
7369
static class Wildfly13Java8Test extends AzureSdkTest {}

‎smoke-tests/apps/BrowserSdkLoader/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/BrowserSdkLoaderTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -45,11 +44,8 @@ static class Tomcat8Java11OpenJ9Test extends BrowserSdkLoaderTest {}
4544
@Environment(TOMCAT_8_JAVA_17)
4645
static class Tomcat8Java17Test extends BrowserSdkLoaderTest {}
4746

48-
@Environment(TOMCAT_8_JAVA_19)
49-
static class Tomcat8Java19Test extends BrowserSdkLoaderTest {}
50-
51-
@Environment(TOMCAT_8_JAVA_20)
52-
static class Tomcat8Java20Test extends BrowserSdkLoaderTest {}
47+
@Environment(TOMCAT_8_JAVA_21)
48+
static class Tomcat8Java21Test extends BrowserSdkLoaderTest {}
5349

5450
@Environment(WILDFLY_13_JAVA_8)
5551
static class Wildfly13Java8Test extends BrowserSdkLoaderTest {}

‎smoke-tests/apps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -68,11 +67,8 @@ static class Tomcat8Java11OpenJ9Test extends CassandraTest {}
6867
@Environment(TOMCAT_8_JAVA_17)
6968
static class Tomcat8Java17Test extends CassandraTest {}
7069

71-
@Environment(TOMCAT_8_JAVA_19)
72-
static class Tomcat8Java19Test extends CassandraTest {}
73-
74-
@Environment(TOMCAT_8_JAVA_20)
75-
static class Tomcat8Java20Test extends CassandraTest {}
70+
@Environment(TOMCAT_8_JAVA_21)
71+
static class Tomcat8Java21Test extends CassandraTest {}
7672

7773
@Environment(WILDFLY_13_JAVA_8)
7874
static class Wildfly13Java8Test extends CassandraTest {}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -146,11 +145,8 @@ static class Tomcat8Java11OpenJ9Test extends ClassicSdkLog4j1Interop2xTest {}
146145
@Environment(TOMCAT_8_JAVA_17)
147146
static class Tomcat8Java17Test extends ClassicSdkLog4j1Interop2xTest {}
148147

149-
@Environment(TOMCAT_8_JAVA_19)
150-
static class Tomcat8Java19Test extends ClassicSdkLog4j1Interop2xTest {}
151-
152-
@Environment(TOMCAT_8_JAVA_20)
153-
static class Tomcat8Java20Test extends ClassicSdkLog4j1Interop2xTest {}
148+
@Environment(TOMCAT_8_JAVA_21)
149+
static class Tomcat8Java21Test extends ClassicSdkLog4j1Interop2xTest {}
154150

155151
@Environment(WILDFLY_13_JAVA_8)
156152
static class Wildfly13Java8Test extends ClassicSdkLog4j1Interop2xTest {}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -138,11 +137,8 @@ static class Tomcat8Java11OpenJ9Test extends ClassicSdkLog4j2Interop2xTest {}
138137
@Environment(TOMCAT_8_JAVA_17)
139138
static class Tomcat8Java17Test extends ClassicSdkLog4j2Interop2xTest {}
140139

141-
@Environment(TOMCAT_8_JAVA_19)
142-
static class Tomcat8Java19Test extends ClassicSdkLog4j2Interop2xTest {}
143-
144-
@Environment(TOMCAT_8_JAVA_20)
145-
static class Tomcat8Java20Test extends ClassicSdkLog4j2Interop2xTest {}
140+
@Environment(TOMCAT_8_JAVA_21)
141+
static class Tomcat8Java21Test extends ClassicSdkLog4j2Interop2xTest {}
146142

147143
@Environment(WILDFLY_13_JAVA_8)
148144
static class Wildfly13Java8Test extends ClassicSdkLog4j2Interop2xTest {}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -122,11 +121,8 @@ static class Tomcat8Java11OpenJ9Test extends ClassicSdkLogbackInterop2xTest {}
122121
@Environment(TOMCAT_8_JAVA_17)
123122
static class Tomcat8Java17Test extends ClassicSdkLogbackInterop2xTest {}
124123

125-
@Environment(TOMCAT_8_JAVA_19)
126-
static class Tomcat8Java19Test extends ClassicSdkLogbackInterop2xTest {}
127-
128-
@Environment(TOMCAT_8_JAVA_20)
129-
static class Tomcat8Java20Test extends ClassicSdkLogbackInterop2xTest {}
124+
@Environment(TOMCAT_8_JAVA_21)
125+
static class Tomcat8Java21Test extends ClassicSdkLogbackInterop2xTest {}
130126

131127
@Environment(WILDFLY_13_JAVA_8)
132128
static class Wildfly13Java8Test extends ClassicSdkLogbackInterop2xTest {}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -58,11 +57,8 @@ static class Tomcat8Java11OpenJ9Test extends ClassicSdkWebInterop2xTest {}
5857
@Environment(TOMCAT_8_JAVA_17)
5958
static class Tomcat8Java17Test extends ClassicSdkWebInterop2xTest {}
6059

61-
@Environment(TOMCAT_8_JAVA_19)
62-
static class Tomcat8Java19Test extends ClassicSdkWebInterop2xTest {}
63-
64-
@Environment(TOMCAT_8_JAVA_20)
65-
static class Tomcat8Java20Test extends ClassicSdkWebInterop2xTest {}
60+
@Environment(TOMCAT_8_JAVA_21)
61+
static class Tomcat8Java21Test extends ClassicSdkWebInterop2xTest {}
6662

6763
@Environment(WILDFLY_13_JAVA_8)
6864
static class Wildfly13Java8Test extends ClassicSdkWebInterop2xTest {}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_19;
10-
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_20;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1110
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1211
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1312
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -58,11 +57,8 @@ static class Tomcat8Java11OpenJ9Test extends ClassicSdkWebInterop3xTest {}
5857
@Environment(TOMCAT_8_JAVA_17)
5958
static class Tomcat8Java17Test extends ClassicSdkWebInterop3xTest {}
6059

61-
@Environment(TOMCAT_8_JAVA_19)
62-
static class Tomcat8Java19Test extends ClassicSdkWebInterop3xTest {}
63-
64-
@Environment(TOMCAT_8_JAVA_20)
65-
static class Tomcat8Java20Test extends ClassicSdkWebInterop3xTest {}
60+
@Environment(TOMCAT_8_JAVA_21)
61+
static class Tomcat8Java21Test extends ClassicSdkWebInterop3xTest {}
6662

6763
@Environment(WILDFLY_13_JAVA_8)
6864
static class Wildfly13Java8Test extends ClassicSdkWebInterop3xTest {}

0 commit comments

Comments
 (0)