Skip to content

Commit 8d8addb

Browse files
committed
test: refactor duplicated code
1 parent 77161ec commit 8d8addb

File tree

1 file changed

+25
-19
lines changed
  • sdk-platform-java/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it

1 file changed

+25
-19
lines changed

sdk-platform-java/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelTracing.java

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,7 @@ void tearDown() {
103103
void testTracing_successfulEcho_grpc() throws Exception {
104104
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
105105

106-
EchoSettings grpcEchoSettings =
107-
EchoSettings.newBuilder()
108-
.setCredentialsProvider(NoCredentialsProvider.create())
109-
.setTransportChannelProvider(
110-
EchoSettings.defaultGrpcTransportProviderBuilder()
111-
.setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
112-
.build())
113-
.setEndpoint(SHOWCASE_GRPC_ENDPOINT)
114-
.build();
106+
EchoSettings grpcEchoSettings = createEchoSettings(false);
115107

116108
EchoStub stub = createStubWithServiceName(grpcEchoSettings, tracingFactory);
117109

@@ -178,16 +170,7 @@ void testTracing_successfulEcho_grpc() throws Exception {
178170
void testTracing_successfulEcho_httpjson() throws Exception {
179171
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
180172

181-
EchoSettings httpJsonEchoSettings =
182-
EchoSettings.newHttpJsonBuilder()
183-
.setCredentialsProvider(NoCredentialsProvider.create())
184-
.setTransportChannelProvider(
185-
EchoSettings.defaultHttpJsonTransportProviderBuilder()
186-
.setHttpTransport(
187-
new NetHttpTransport.Builder().doNotValidateCertificate().build())
188-
.build())
189-
.setEndpoint(SHOWCASE_HTTPJSON_ENDPOINT)
190-
.build();
173+
EchoSettings httpJsonEchoSettings = createEchoSettings(true);
191174

192175
EchoStub stub = createStubWithServiceName(httpJsonEchoSettings, tracingFactory);
193176

@@ -406,6 +389,29 @@ void testTracing_retry_httpjson() throws Exception {
406389
assertThat(resendCounts).containsExactlyElementsIn(expectedCounts).inOrder();
407390
}
408391

392+
private EchoSettings createEchoSettings(boolean isHttpJson) throws Exception {
393+
if (isHttpJson) {
394+
return EchoSettings.newHttpJsonBuilder()
395+
.setCredentialsProvider(NoCredentialsProvider.create())
396+
.setTransportChannelProvider(
397+
EchoSettings.defaultHttpJsonTransportProviderBuilder()
398+
.setHttpTransport(
399+
new NetHttpTransport.Builder().doNotValidateCertificate().build())
400+
.build())
401+
.setEndpoint(SHOWCASE_HTTPJSON_ENDPOINT)
402+
.build();
403+
} else {
404+
return EchoSettings.newBuilder()
405+
.setCredentialsProvider(NoCredentialsProvider.create())
406+
.setTransportChannelProvider(
407+
EchoSettings.defaultGrpcTransportProviderBuilder()
408+
.setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
409+
.build())
410+
.setEndpoint(SHOWCASE_GRPC_ENDPOINT)
411+
.build();
412+
}
413+
}
414+
409415
private EchoStub createStubWithServiceName(
410416
EchoSettings settings, SpanTracerFactory tracingFactory) throws IOException {
411417
EchoStubSettings.Builder builder =

0 commit comments

Comments
 (0)