Skip to content

Commit 236611e

Browse files
sergiitksergiitk
committed
address feedback wrt itrop tests. will be fixed up
1 parent c3793c0 commit 236611e

File tree

9 files changed

+74
-93
lines changed

9 files changed

+74
-93
lines changed

‎interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -365,10 +365,10 @@ protected final ServerStreamTracer.Factory createCustomCensusTracerFactory() {
365365
}
366366

367367
/**
368-
* Return {@code true} when custom census module used.
368+
* Override this when census module presence is different from {@link #metricsExpected()}
369369
*/
370370
protected boolean customCensusModulePresent() {
371-
return false;
371+
return metricsExpected();
372372
}
373373

374374
/**

‎interop-testing/src/main/java/io/grpc/testing/integration/AbstractNettyInteropTest.java

-33
This file was deleted.

‎interop-testing/src/test/java/io/grpc/testing/integration/AutoWindowSizingOnTest.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,23 @@
1818

1919
import io.grpc.ServerBuilder;
2020
import io.grpc.netty.InternalNettyChannelBuilder;
21+
import io.grpc.netty.InternalNettyServerBuilder;
2122
import io.grpc.netty.NegotiationType;
2223
import io.grpc.netty.NettyChannelBuilder;
2324
import io.grpc.netty.NettyServerBuilder;
2425
import org.junit.runner.RunWith;
2526
import org.junit.runners.JUnit4;
2627

2728
@RunWith(JUnit4.class)
28-
public class AutoWindowSizingOnTest extends AbstractNettyInteropTest {
29+
public class AutoWindowSizingOnTest extends AbstractInteropTest {
2930

3031
@Override
3132
protected ServerBuilder<?> getServerBuilder() {
32-
return withCustomCensusModule(
33-
NettyServerBuilder.forPort(0).maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE));
33+
NettyServerBuilder builder = NettyServerBuilder.forPort(0)
34+
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE);
35+
// Disable the default census stats tracer, use testing tracer instead.
36+
InternalNettyServerBuilder.setStatsEnabled(builder, false);
37+
return builder.addStreamTracerFactory(createCustomCensusTracerFactory());
3438
}
3539

3640
@Override

‎interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java

+12-9
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import io.grpc.ServerBuilder;
2020
import io.grpc.netty.InternalNettyChannelBuilder;
21+
import io.grpc.netty.InternalNettyServerBuilder;
2122
import io.grpc.netty.NegotiationType;
2223
import io.grpc.netty.NettyChannelBuilder;
2324
import io.grpc.netty.NettyServerBuilder;
@@ -33,20 +34,22 @@
3334
* Run transport tests over the Netty in-process channel.
3435
*/
3536
@RunWith(JUnit4.class)
36-
public class Http2NettyLocalChannelTest extends AbstractNettyInteropTest {
37+
public class Http2NettyLocalChannelTest extends AbstractInteropTest {
3738

3839
private DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup();
3940

4041
@Override
4142
protected ServerBuilder<?> getServerBuilder() {
42-
return withCustomCensusModule(
43-
NettyServerBuilder
44-
.forAddress(new LocalAddress("in-process-1"))
45-
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW)
46-
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
47-
.channelType(LocalServerChannel.class)
48-
.workerEventLoopGroup(eventLoopGroup)
49-
.bossEventLoopGroup(eventLoopGroup));
43+
NettyServerBuilder builder = NettyServerBuilder
44+
.forAddress(new LocalAddress("in-process-1"))
45+
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW)
46+
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
47+
.channelType(LocalServerChannel.class)
48+
.workerEventLoopGroup(eventLoopGroup)
49+
.bossEventLoopGroup(eventLoopGroup);
50+
// Disable the default census stats tracer, use testing tracer instead.
51+
InternalNettyServerBuilder.setStatsEnabled(builder, false);
52+
return builder.addStreamTracerFactory(createCustomCensusTracerFactory());
5053
}
5154

5255
@Override

‎interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java

+14-11
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.grpc.internal.testing.TestUtils;
2424
import io.grpc.netty.GrpcSslContexts;
2525
import io.grpc.netty.InternalNettyChannelBuilder;
26+
import io.grpc.netty.InternalNettyServerBuilder;
2627
import io.grpc.netty.NettyChannelBuilder;
2728
import io.grpc.netty.NettyServerBuilder;
2829
import io.netty.handler.ssl.ClientAuth;
@@ -38,22 +39,24 @@
3839
* Integration tests for GRPC over HTTP2 using the Netty framework.
3940
*/
4041
@RunWith(JUnit4.class)
41-
public class Http2NettyTest extends AbstractNettyInteropTest {
42+
public class Http2NettyTest extends AbstractInteropTest {
4243

4344
@Override
4445
protected ServerBuilder<?> getServerBuilder() {
4546
// Starts the server with HTTPS.
4647
try {
47-
return withCustomCensusModule(
48-
NettyServerBuilder.forPort(0)
49-
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW)
50-
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
51-
.sslContext(GrpcSslContexts
52-
.forServer(TestUtils.loadCert("server1.pem"), TestUtils.loadCert("server1.key"))
53-
.clientAuth(ClientAuth.REQUIRE)
54-
.trustManager(TestUtils.loadCert("ca.pem"))
55-
.ciphers(TestUtils.preferredTestCiphers(), SupportedCipherSuiteFilter.INSTANCE)
56-
.build()));
48+
NettyServerBuilder builder = NettyServerBuilder.forPort(0)
49+
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW)
50+
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
51+
.sslContext(GrpcSslContexts
52+
.forServer(TestUtils.loadCert("server1.pem"), TestUtils.loadCert("server1.key"))
53+
.clientAuth(ClientAuth.REQUIRE)
54+
.trustManager(TestUtils.loadCert("ca.pem"))
55+
.ciphers(TestUtils.preferredTestCiphers(), SupportedCipherSuiteFilter.INSTANCE)
56+
.build());
57+
// Disable the default census stats tracer, use testing tracer instead.
58+
InternalNettyServerBuilder.setStatsEnabled(builder, false);
59+
return builder.addStreamTracerFactory(createCustomCensusTracerFactory());
5760
} catch (IOException ex) {
5861
throw new RuntimeException(ex);
5962
}

‎interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import io.grpc.internal.testing.StreamRecorder;
2929
import io.grpc.internal.testing.TestUtils;
3030
import io.grpc.netty.GrpcSslContexts;
31+
import io.grpc.netty.InternalNettyServerBuilder;
3132
import io.grpc.netty.NettyServerBuilder;
3233
import io.grpc.okhttp.InternalOkHttpChannelBuilder;
3334
import io.grpc.okhttp.OkHttpChannelBuilder;
@@ -52,7 +53,7 @@
5253
* Integration tests for GRPC over Http2 using the OkHttp framework.
5354
*/
5455
@RunWith(JUnit4.class)
55-
public class Http2OkHttpTest extends AbstractNettyInteropTest {
56+
public class Http2OkHttpTest extends AbstractInteropTest {
5657

5758
private static final String BAD_HOSTNAME = "I.am.a.bad.hostname";
5859

@@ -77,11 +78,13 @@ protected ServerBuilder<?> getServerBuilder() {
7778
.forServer(TestUtils.loadCert("server1.pem"), TestUtils.loadCert("server1.key"));
7879
GrpcSslContexts.configure(contextBuilder, sslProvider);
7980
contextBuilder.ciphers(TestUtils.preferredTestCiphers(), SupportedCipherSuiteFilter.INSTANCE);
80-
return withCustomCensusModule(
81-
NettyServerBuilder.forPort(0)
82-
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW)
83-
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
84-
.sslContext(contextBuilder.build()));
81+
NettyServerBuilder builder = NettyServerBuilder.forPort(0)
82+
.flowControlWindow(AbstractInteropTest.TEST_FLOW_CONTROL_WINDOW)
83+
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
84+
.sslContext(contextBuilder.build());
85+
// Disable the default census stats tracer, use testing tracer instead.
86+
InternalNettyServerBuilder.setStatsEnabled(builder, false);
87+
return builder.addStreamTracerFactory(createCustomCensusTracerFactory());
8588
} catch (IOException ex) {
8689
throw new RuntimeException(ex);
8790
}

‎interop-testing/src/test/java/io/grpc/testing/integration/InProcessTest.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,10 @@ public class InProcessTest extends AbstractInteropTest {
3333
@Override
3434
protected ServerBuilder<?> getServerBuilder() {
3535
// Starts the in-process server.
36-
return withCustomCensusModule(InProcessServerBuilder.forName(SERVER_NAME));
37-
}
38-
39-
private InProcessServerBuilder withCustomCensusModule(InProcessServerBuilder builder) {
36+
InProcessServerBuilder builder = InProcessServerBuilder.forName(SERVER_NAME);
37+
// Disable the default census stats tracer, use testing tracer instead.
4038
InternalInProcessServerBuilder.setStatsEnabled(builder, false);
41-
builder.addStreamTracerFactory(createCustomCensusTracerFactory());
42-
return builder;
43-
}
44-
45-
@Override
46-
protected boolean customCensusModulePresent() {
47-
return true;
39+
return builder.addStreamTracerFactory(createCustomCensusTracerFactory());
4840
}
4941

5042
@Override
@@ -55,6 +47,12 @@ protected InProcessChannelBuilder createChannelBuilder() {
5547
return builder.intercept(createCensusStatsClientInterceptor());
5648
}
5749

50+
@Override
51+
protected boolean customCensusModulePresent() {
52+
// Metrics are disabled, but the census module is still used.
53+
return true;
54+
}
55+
5856
@Override
5957
protected boolean metricsExpected() {
6058
// TODO(zhangkun83): InProcessTransport by-passes framer and deframer, thus message sizes are

‎interop-testing/src/test/java/io/grpc/testing/integration/TransportCompressionTest.java

+19-16
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import io.grpc.ServerInterceptor;
3939
import io.grpc.internal.GrpcUtil;
4040
import io.grpc.netty.InternalNettyChannelBuilder;
41+
import io.grpc.netty.InternalNettyServerBuilder;
4142
import io.grpc.netty.NettyChannelBuilder;
4243
import io.grpc.netty.NettyServerBuilder;
4344
import io.grpc.testing.integration.Messages.BoolValue;
@@ -59,7 +60,7 @@
5960
* Tests that compression is turned on.
6061
*/
6162
@RunWith(JUnit4.class)
62-
public class TransportCompressionTest extends AbstractNettyInteropTest {
63+
public class TransportCompressionTest extends AbstractInteropTest {
6364

6465
// Masquerade as identity.
6566
private static final Fzip FZIPPER = new Fzip("gzip", new Codec.Gzip());
@@ -84,21 +85,23 @@ public static void registerCompressors() {
8485

8586
@Override
8687
protected ServerBuilder<?> getServerBuilder() {
87-
return withCustomCensusModule(
88-
NettyServerBuilder.forPort(0)
89-
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
90-
.compressorRegistry(compressors)
91-
.decompressorRegistry(decompressors)
92-
.intercept(new ServerInterceptor() {
93-
@Override
94-
public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
95-
Metadata headers, ServerCallHandler<ReqT, RespT> next) {
96-
Listener<ReqT> listener = next.startCall(call, headers);
97-
// TODO(carl-mastrangelo): check that encoding was set.
98-
call.setMessageCompression(true);
99-
return listener;
100-
}
101-
}));
88+
NettyServerBuilder builder = NettyServerBuilder.forPort(0)
89+
.maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
90+
.compressorRegistry(compressors)
91+
.decompressorRegistry(decompressors)
92+
.intercept(new ServerInterceptor() {
93+
@Override
94+
public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
95+
Metadata headers, ServerCallHandler<ReqT, RespT> next) {
96+
Listener<ReqT> listener = next.startCall(call, headers);
97+
// TODO(carl-mastrangelo): check that encoding was set.
98+
call.setMessageCompression(true);
99+
return listener;
100+
}
101+
});
102+
// Disable the default census stats tracer, use testing tracer instead.
103+
InternalNettyServerBuilder.setStatsEnabled(builder, false);
104+
return builder.addStreamTracerFactory(createCustomCensusTracerFactory());
102105
}
103106

104107
@Test

‎okhttp/src/test/java/io/grpc/okhttp/OkHttpTransportTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void releaseClientFactory() {
5353
@Override
5454
protected List<? extends InternalServer> newServer(
5555
List<ServerStreamTracer.Factory> streamTracerFactories) {
56-
final NettyServerBuilder builder = NettyServerBuilder
56+
NettyServerBuilder builder = NettyServerBuilder
5757
.forPort(0)
5858
.flowControlWindow(AbstractTransportTest.TEST_FLOW_CONTROL_WINDOW);
5959
InternalNettyServerBuilder.setTransportTracerFactory(builder, fakeClockTransportTracer);
@@ -63,7 +63,7 @@ protected List<? extends InternalServer> newServer(
6363
@Override
6464
protected List<? extends InternalServer> newServer(
6565
int port, List<ServerStreamTracer.Factory> streamTracerFactories) {
66-
final NettyServerBuilder builder = NettyServerBuilder
66+
NettyServerBuilder builder = NettyServerBuilder
6767
.forAddress(new InetSocketAddress(port))
6868
.flowControlWindow(AbstractTransportTest.TEST_FLOW_CONTROL_WINDOW);
6969
InternalNettyServerBuilder.setTransportTracerFactory(builder, fakeClockTransportTracer);

0 commit comments

Comments
 (0)