Skip to content

Change GAE interop tests to use java11 runtime #10933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ejona86 merged 3 commits into from
Feb 20, 2024
Merged

Change GAE interop tests to use java11 runtime #10933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
401f792
Change GAE interop tests to use java11 runtime
ejona86 Feb 20, 2024
9439870
Remove Java 8 assertion
ejona86 Feb 20, 2024
7f0d269
Remove unused imports
ejona86 Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ...testing/gae-jdk8/src/main/java/io/grpc/testing/integration/NettyClientInteropServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@

package io.grpc.testing.integration;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import io.grpc.Grpc;
import io.grpc.ManagedChannelBuilder;
import io.grpc.TlsChannelCredentials;
Expand Down Expand Up @@ -131,14 +128,9 @@ private void doGetHelper(HttpServletResponse resp) throws IOException {
public static final class Tester extends AbstractInteropTest {
@Override
protected ManagedChannelBuilder<?> createChannelBuilder() {
assertEquals(
"jdk8 required",
"1.8",
System.getProperty("java.specification.version"));
ManagedChannelBuilder<?> builder =
Grpc.newChannelBuilder(INTEROP_TEST_ADDRESS, TlsChannelCredentials.create())
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE);
assertTrue(builder instanceof NettyChannelBuilder);
((NettyChannelBuilder) builder)
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW);
return builder;
Expand Down
3 changes: 1 addition & 2 deletions gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
-->
<!-- [START config] -->
<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
<threadsafe>true</threadsafe>
<service>java-gae-interop-test</service>
<runtime>java8</runtime>
<runtime>java11</runtime>
</appengine-web-app>
<!-- [END config] -->