Fix issues with CookieCompliance on Jetty 9.4 HttpConnector mode.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

Author: lachlan-roberts

runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/CookieComplianceTest.java

@@ -19,7 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-import java.util.Arrays;
 import java.util.List;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -36,34 +35,14 @@
 @RunWith(Parameterized.class)
 public class CookieComplianceTest extends JavaRuntimeViaHttpBase {
 
-  // This is set in the app appengine-web.xml file
+  // This is set in the app appengine-web.xml file.
   static {
     System.setProperty("com.google.apphosting.runtime.jetty94.LEGACY_MODE", "true");
   }
 
     @Parameterized.Parameters
     public static List<Object[]> version() {
-        return Arrays.asList(
-                new Object[][] {
-                        {"java17", "9.4", "EE6", false},
-                        {"java17", "12.0", "EE8", false},
-                        {"java17", "12.0", "EE10", false},
-                        {"java17", "12.1", "EE11", false},
-                        {"java21", "12.0", "EE8", false},
-                        {"java21", "12.0", "EE10", false},
-                        {"java21", "12.1", "EE11", false},
-                        {"java25", "12.1", "EE8", false},
-                        {"java25", "12.1", "EE11", false},
-                        {"java17", "9.4", "EE6", true},
-                        {"java17", "12.0", "EE8", true},
-                        {"java17", "12.0", "EE10", true},
-                        {"java17", "12.1", "EE11", true},
-                        {"java21", "12.0", "EE8", true},
-                        {"java21", "12.0", "EE10", true},
-                        {"java21", "12.1", "EE11", true},
-                        {"java25", "12.1", "EE8", true},
-                        {"java25", "12.1", "EE11", true},
-                });
+        return allVersions();
     }
 
   public CookieComplianceTest(String runtimeVersion, String jettyVersion, String version, boolean useHttpConnector) {

runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/JavaRuntimeViaHttpBase.java

@@ -31,6 +31,10 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
 
+import com.google.appengine.repackaged.com.google.protobuf.ByteString;
+import com.google.appengine.repackaged.com.google.protobuf.ExtensionRegistry;
+import com.google.appengine.repackaged.com.google.protobuf.InvalidProtocolBufferException;
+import com.google.appengine.repackaged.com.google.protobuf.UninitializedMessageException;
 import com.google.apphosting.base.protos.api.RemoteApiPb;
 import com.google.apphosting.testing.PortPicker;
 import com.google.auto.value.AutoValue;
@@ -45,10 +49,6 @@
 import com.google.common.reflect.Reflection;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.ForOverride;
-import com.google.appengine.repackaged.com.google.protobuf.ByteString;
-import com.google.appengine.repackaged.com.google.protobuf.ExtensionRegistry;
-import com.google.appengine.repackaged.com.google.protobuf.InvalidProtocolBufferException;
-import com.google.appengine.repackaged.com.google.protobuf.UninitializedMessageException;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpServer;
 import java.io.BufferedReader;
@@ -171,7 +171,7 @@ public static List<Object[]> allVersions() {
     System.out.println("javaVersionForTest " + javaVersionForTest);
 
     return allVersions.stream()
-        .filter(v -> v[0].toString().equals(javaVersionForTest))
+        .filter(v -> v[0].toString().equals(javaVersionForTest) || v[1].equals("9.4"))
         .collect(toImmutableList());
   }