Skip to content

Commit b47f316

Browse files
ludochgae-java-bot
authored andcommitted
Test CookieComplianceTest with all EE versions now.
PiperOrigin-RevId: 817433352 Change-Id: Ic78a714598f320b5918d725762e81681c15d0d90
1 parent d80bd1d commit b47f316

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.junit.Assume.assumeTrue;
2121

2222
import java.util.List;
23-
import java.util.Objects;
2423
import org.apache.http.Header;
2524
import org.apache.http.HttpResponse;
2625
import org.apache.http.client.HttpClient;
@@ -41,30 +40,31 @@ public class CookieComplianceTest extends JavaRuntimeViaHttpBase {
4140
System.setProperty("com.google.apphosting.runtime.jetty94.LEGACY_MODE", "true");
4241
}
4342

44-
@Parameterized.Parameters
45-
public static List<Object[]> version() {
46-
return allVersions();
47-
}
43+
@Parameterized.Parameters
44+
public static List<Object[]> version() {
45+
return allVersions();
46+
}
4847

49-
public CookieComplianceTest(String runtimeVersion, String jettyVersion, String version, boolean useHttpConnector) {
50-
super(runtimeVersion, jettyVersion, version, useHttpConnector);
48+
public CookieComplianceTest(
49+
String runtimeVersion, String jettyVersion, String version, boolean useHttpConnector) {
50+
super(runtimeVersion, jettyVersion, version, useHttpConnector);
5151
}
5252

5353
@Rule public TemporaryFolder temp = new TemporaryFolder();
5454

5555
@Before
5656
public void copyAppToTemp() throws Exception {
57-
// Internal testing is limited to Jetty 9.4 EE6 for now.
58-
boolean internal = Boolean.getBoolean("test.running.internally");
59-
assumeTrue(!internal || Objects.equals(jakartaVersion, "EE6"));
57+
// Internal testing is limited to Jetty 9.4 EE6 for now.
58+
boolean internal = Boolean.getBoolean("test.running.internally");
59+
assumeTrue(!internal);
6060

61-
String app = "com/google/apphosting/runtime/jetty9/cookiecomplianceapp/";
62-
if (isJakarta()) {
63-
app = app + "jakarta";
64-
} else {
65-
app = app + "javax";
66-
}
67-
copyAppToDir(app, temp.getRoot().toPath());
61+
String app = "com/google/apphosting/runtime/jetty9/cookiecomplianceapp/";
62+
if (isJakarta()) {
63+
app = app + "jakarta";
64+
} else {
65+
app = app + "javax";
66+
}
67+
copyAppToDir(app, temp.getRoot().toPath());
6868
}
6969

7070
@Test

0 commit comments

Comments
 (0)