Update smoke test Java versions (#3248)

microsoft · Aug 23, 2023 · 5517341 · 5517341
1 parent cdf40b3
commit 5517341
Show file tree

Hide file tree

Showing 20 changed files with 155 additions and 156 deletions.
diff --git a/...s/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsTest.java b/...s/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ActuatorMetricsTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -88,12 +88,12 @@ static class Java17Test extends ActuatorMetricsTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends ActuatorMetricsTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends ActuatorMetricsTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends ActuatorMetricsTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends ActuatorMetricsTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends ActuatorMetricsTest {}
 }
diff --git a/...smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java b/...smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -139,12 +139,12 @@ static class Java17Test extends CustomInstrumentationTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends CustomInstrumentationTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends CustomInstrumentationTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends CustomInstrumentationTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends CustomInstrumentationTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends CustomInstrumentationTest {}
 }
diff --git a/...c/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticExtensionTest.java b/...c/smokeTest/java/com/microsoft/applicationinsights/smoketest/DiagnosticExtensionTest.java
@@ -5,8 +5,8 @@
 
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static java.util.Collections.emptyMap;
 
@@ -43,9 +43,9 @@ static class Java11Test extends DiagnosticExtensionTest {}
   @Environment(JAVA_17)
   static class Java17Test extends DiagnosticExtensionTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends DiagnosticExtensionTest {}
-
   @Environment(JAVA_20)
-  static class Java19Test extends DiagnosticExtensionTest {}
+  static class JavaLatestTest extends DiagnosticExtensionTest {}
+
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends DiagnosticExtensionTest {}
 }
diff --git a/...c/smokeTest/java/com/microsoft/applicationinsights/smoketest/InheritedAttributesTest.java b/...c/smokeTest/java/com/microsoft/applicationinsights/smoketest/InheritedAttributesTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -79,12 +79,12 @@ static class Java17Test extends InheritedAttributesTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends InheritedAttributesTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends InheritedAttributesTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends InheritedAttributesTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends InheritedAttributesTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends InheritedAttributesTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends InheritedAttributesTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends InheritedAttributesTest {}
 }
diff --git a/...ests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java b/...ests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -127,12 +127,12 @@ static class Java17Test extends JmsTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends JmsTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends JmsTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends JmsTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends JmsTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends JmsTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends JmsTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends JmsTest {}
 }
diff --git a/.../smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerDisabledTest.java b/.../smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerDisabledTest.java
@@ -5,8 +5,8 @@
 
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 
 import org.junit.jupiter.api.Test;
@@ -23,17 +23,17 @@ void checkJavaProfilerDisabled() throws Exception {
   }
 
   @Environment(JAVA_8)
-  static class Java8DisabledTest extends JavaProfilerDisabledTest {}
+  static class Java8Test extends JavaProfilerDisabledTest {}
 
   @Environment(JAVA_11)
-  static class Java11DisabledTest extends JavaProfilerDisabledTest {}
+  static class Java11Test extends JavaProfilerDisabledTest {}
 
   @Environment(JAVA_17)
-  static class Java17DisabledTest extends JavaProfilerDisabledTest {}
-
-  @Environment(JAVA_19)
-  static class Java19DisabledTest extends JavaProfilerDisabledTest {}
+  static class Java17Test extends JavaProfilerDisabledTest {}
 
   @Environment(JAVA_20)
-  static class Java20DisabledTest extends JavaProfilerDisabledTest {}
+  static class JavaLatestTest extends JavaProfilerDisabledTest {}
+
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends JavaProfilerDisabledTest {}
 }
diff --git a/...c/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerEnabledTest.java b/...c/smokeTest/java/com/microsoft/applicationinsights/smoketest/JavaProfilerEnabledTest.java
@@ -5,8 +5,8 @@
 
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
@@ -51,17 +51,17 @@ public static void runTest(boolean expectEnabled, SmokeTestExtension testing)
   }
 
   @Environment(JAVA_8)
-  static class Java8EnabledTest extends JavaProfilerEnabledTest {}
+  static class Java8Test extends JavaProfilerEnabledTest {}
 
   @Environment(JAVA_11)
-  static class Java11EnabledTest extends JavaProfilerEnabledTest {}
+  static class Java11Test extends JavaProfilerEnabledTest {}
 
   @Environment(JAVA_17)
-  static class Java17EnabledTest extends JavaProfilerEnabledTest {}
-
-  @Environment(JAVA_19)
-  static class Java18EnabledTest extends JavaProfilerEnabledTest {}
+  static class Java17Test extends JavaProfilerEnabledTest {}
 
   @Environment(JAVA_20)
-  static class Java19EnabledTest extends JavaProfilerEnabledTest {}
+  static class JavaLatestTest extends JavaProfilerEnabledTest {}
+
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends JavaProfilerEnabledTest {}
 }
diff --git a/...rc/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java b/...rc/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -56,12 +56,12 @@ static class Java17Test extends JettyNativeHandlerTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends JettyNativeHandlerTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends JettyNativeHandlerTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends JettyNativeHandlerTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends JettyNativeHandlerTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends JettyNativeHandlerTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends JettyNativeHandlerTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends JettyNativeHandlerTest {}
 }
diff --git a/.../apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java b/.../apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -144,12 +144,12 @@ static class Java17Test extends KafkaTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends KafkaTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends KafkaTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends KafkaTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends KafkaTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends KafkaTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends KafkaTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends KafkaTest {}
 }
diff --git a/...ometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java b/...ometer/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -95,12 +95,12 @@ static class Java17Test extends MicrometerTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends MicrometerTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends MicrometerTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends MicrometerTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends MicrometerTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends MicrometerTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends MicrometerTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends MicrometerTest {}
 }
diff --git a/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/NonDaemonThreadsTest.java b/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/NonDaemonThreadsTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -94,12 +94,12 @@ static class Java17Test extends NonDaemonThreadsTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends NonDaemonThreadsTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends NonDaemonThreadsTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends NonDaemonThreadsTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends NonDaemonThreadsTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends NonDaemonThreadsTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends NonDaemonThreadsTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends NonDaemonThreadsTest {}
 }
diff --git a/...keTest/java/com/microsoft/applicationinsights/smoketest/PreferForwardedUrlSchemeTest.java b/...keTest/java/com/microsoft/applicationinsights/smoketest/PreferForwardedUrlSchemeTest.java
@@ -7,9 +7,9 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_18_OPENJ9;
-import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_19;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_20_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -58,12 +58,12 @@ static class Java17Test extends PreferForwardedUrlSchemeTest {}
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends PreferForwardedUrlSchemeTest {}
 
-  @Environment(JAVA_19)
-  static class Java18Test extends PreferForwardedUrlSchemeTest {}
+  @Environment(JAVA_20)
+  static class JavaLatestTest extends PreferForwardedUrlSchemeTest {}
 
-  @Environment(JAVA_18_OPENJ9)
-  static class Java18OpenJ9Test extends PreferForwardedUrlSchemeTest {}
+  @Environment(JAVA_20_OPENJ9)
+  static class JavaLatestOpenJ9Test extends PreferForwardedUrlSchemeTest {}
 
-  @Environment(JAVA_20)
-  static class Java19Test extends PreferForwardedUrlSchemeTest {}
+  @Environment(JAVA_21)
+  static class JavaPrereleaseTest extends PreferForwardedUrlSchemeTest {}
 }