Refactor DevAppServer and Runtime tests for parameterized java versions to pick the one used in our github actions to optimize build and test time.

ludoch · gae-java-bot · commit 9d63cbc416ba · 2025-09-13T12:25:29.000-07:00
Our actions have 3 jdk used in .github/workflows/maven.yml

This change introduces parameterized testing to `DevAppServerTestBase` and `JavaRuntimeViaHttpBase`. Tests will now run across various combinations of Java runtime versions (java17, java21, java25), Jetty versions (9.4, 12.0, 12.1), and Jakarta EE versions (EE6, EE8, EE10, EE11). The test execution is filtered to only run with the Java version matching the current test environment. `JavaRuntimeViaHttpBase` also parameterizes on the use of the HTTP connector.
 DevAppServerMainTest.java is changed to a single test method to avoid multiple start and stop of the server. We could have used @BeforeClass but seems more complicated for static fields needed.

PiperOrigin-RevId: 806707657
Change-Id: Iebb74077ad23644b0677533086a08493b86e3c36
diff --git a/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerMainTest.java b/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerMainTest.java
@@ -46,7 +46,7 @@ public void setUpClass() throws IOException, InterruptedException {
   }
 
   @Test
-  public void useMemcache() throws Exception {
+  public void globaltest() throws Exception {
     // App Engine Memcache access.
     executeHttpGet(
         "/?memcache_loops=10&memcache_size=10",
@@ -68,16 +68,10 @@ public void useMemcache() throws Exception {
             + "Cache hits: 25\n"
             + "Cache misses: 0\n",
         RESPONSE_200);
-  }
 
-  @Test
-  public void useUserApi() throws Exception {
     // App Engine User API access.
     executeHttpGet("/?user", "Sign in with /_ah/login?continue=%2F\n", RESPONSE_200);
-  }
 
-  @Test
-  public void useDatastoreAndTaskQueue() throws Exception {
     // First, populate Datastore entities
     executeHttpGet("/?datastore_entities=3", "Added 3 entities\n", RESPONSE_200);
 
@@ -90,10 +84,7 @@ public void useDatastoreAndTaskQueue() throws Exception {
     // After a while, we should have 10 or more entities.
     executeHttpGetWithRetriesContains(
         "/?datastore_count", "Found ", RESPONSE_200, NUMBER_OF_RETRIES);
-  }
 
-  @Test
-  public void localAdminConsoleWorks() throws Exception {
     HttpGet get =
         new HttpGet(
             String.format(
diff --git a/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java b/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java
@@ -16,6 +16,8 @@
 package com.google.appengine.tools.development;
 
 import static com.google.common.base.StandardSystemProperty.JAVA_HOME;
+import static com.google.common.base.StandardSystemProperty.JAVA_VERSION;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -56,18 +58,54 @@ public abstract class DevAppServerTestBase {
 
   @Parameterized.Parameters
   public static List<Object[]> version() {
-    return Arrays.asList(
-        new Object[][] {
-          {"java17", "9.4", "EE6"},
-          {"java17", "12.0", "EE8"},
-          {"java17", "12.0", "EE10"},
-          {"java17", "12.1", "EE11"},
-          {"java21", "12.0", "EE8"},
-          {"java21", "12.0", "EE10"},
-          {"java21", "12.1", "EE11"},
-          {"java25", "12.1", "EE8"},
-          {"java25", "12.1", "EE11"}
-        });
+    List<Object[]> allVersions =
+        Arrays.asList(
+            new Object[][] {
+              {"java17", "9.4", "EE6"},
+              {"java17", "12.0", "EE8"},
+              {"java17", "12.0", "EE10"},
+              {"java17", "12.1", "EE11"},
+              {"java21", "12.0", "EE8"},
+              {"java21", "12.0", "EE10"},
+              {"java21", "12.1", "EE11"},
+              {"java25", "12.1", "EE8"},
+              {"java25", "12.1", "EE11"}
+            });
+    String version = JAVA_VERSION.value();
+    String majorVersion;
+    // Major version parsing in java.version property can be "1.8.0_201" for java8, "11.0.17" for
+    // java11+, or "25-ea+35" for early access versions.
+    if (version.startsWith("1.")) {
+      majorVersion = version.substring(2, 3);
+    } else {
+      int dash = version.indexOf("-");
+      if (dash != -1) {
+        majorVersion = version.substring(0, dash);
+      } else {
+        int dot = version.indexOf(".");
+        if (dot != -1) {
+          majorVersion = version.substring(0, dot);
+        } else {
+          majorVersion = version;
+        }
+      }
+    }
+    // We only run the tests for the current JDK version.
+    // So we filter the list of versions based on the current `java.version` property.
+    // We bucket versions into 17, 21, or 25.
+    int numVersion = Integer.parseInt(majorVersion);
+    if ((numVersion > 21) && (numVersion < 25)) {
+      numVersion = 21;
+    } else if ((numVersion > 25)) {
+      numVersion = 25;
+    } else if ((numVersion < 21)) {
+      numVersion = 17;
+    }
+    String javaVersionForTest = "java" + numVersion;
+    System.out.println("javaVersionForTest " + javaVersionForTest);
+    return allVersions.stream()
+        .filter(v -> v[0].toString().equals(javaVersionForTest))
+        .collect(toImmutableList());
   }
 
   public DevAppServerTestBase(String runtimeVersion, String jettyVersion, String jakartaVersion) {
@@ -268,5 +306,4 @@ public void run() {
       }
     }
   }
-
 }
diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/JavaRuntimeViaHttpBase.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/JavaRuntimeViaHttpBase.java
@@ -17,6 +17,8 @@
 
 import static com.google.common.base.StandardSystemProperty.FILE_SEPARATOR;
 import static com.google.common.base.StandardSystemProperty.JAVA_HOME;
+import static com.google.common.base.StandardSystemProperty.JAVA_VERSION;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
@@ -108,9 +110,10 @@ public interface ApiServerFactory<ApiServerT extends Closeable> {
    * 4. useHttpConnector: true or false
    */
   public static List<Object[]> allVersions() {
-    return Arrays.asList(
-        new Object[][] {
-          {"java17", "9.4", "EE6", true},
+    List<Object[]> allVersions =
+        Arrays.asList(
+            new Object[][] {
+              {"java17", "9.4", "EE6", true},
           {"java17", "12.0", "EE8", true},
           {"java17", "12.0", "EE10", true},
           {"java17", "12.1", "EE11", true},
@@ -133,7 +136,43 @@ public static List<Object[]> allVersions() {
           // A warning should be logged, but the runtime should behave identically to EE11.
           {"java17", "12.1", "EE10", true},
           {"java21", "12.1", "EE10", true},
-        });
+            });
+    String version = JAVA_VERSION.value();
+    String majorVersion;
+    // Major version parsing in java.version property can be "1.8.0_201" for java8, "11.0.17" for
+    // java11+, or "25-ea+35" for early access versions.
+    if (version.startsWith("1.")) {
+      majorVersion = version.substring(2, 3);
+    } else {
+      int dash = version.indexOf("-");
+      if (dash != -1) {
+        majorVersion = version.substring(0, dash);
+      } else {
+        int dot = version.indexOf(".");
+        if (dot != -1) {
+          majorVersion = version.substring(0, dot);
+        } else {
+          majorVersion = version;
+        }
+      }
+    }
+    // We only run the tests for the current JDK version.
+    // So we filter the list of versions based on the current `java.version` property.
+    // We bucket versions into 17, 21, or 25.
+    int numVersion = Integer.parseInt(majorVersion);
+    if ((numVersion > 21) && (numVersion < 25)) {
+      numVersion = 21;
+    } else if ((numVersion > 25)) {
+      numVersion = 25;
+    } else if ((numVersion < 21)) {
+      numVersion = 17;
+    }
+    String javaVersionForTest = "java" + numVersion;
+    System.out.println("javaVersionForTest " + javaVersionForTest);
+
+    return allVersions.stream()
+        .filter(v -> v[0].toString().equals(javaVersionForTest))
+        .collect(toImmutableList());
   }
 
   @Before
@@ -519,8 +558,8 @@ public void run() {
           System.out.println(echoPrefix + line);
           outputQueue.add(line);
         }
-      } catch (IOException e) {
-        throw new RuntimeException(e);
+      } catch (IOException ignored) {
+        // ignored, spurious log when we kill the process
       }
     }
 
