From faadb6eac1e9d0ff5e8323ebd7bfb6c8727b8db0 Mon Sep 17 00:00:00 2001 From: Otavio Rodolfo Piske Date: Wed, 9 Mar 2022 13:08:16 +0100 Subject: [PATCH] (chores) fix camel-grpc test failures on CI --- .../camel/component/grpc/GrpcConsumerSecurityTest.java | 5 +++-- .../camel/component/grpc/GrpcProducerSecurityTest.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java index aa2be6e609d50..2ce2af4e6d154 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java @@ -26,6 +26,7 @@ import io.grpc.netty.GrpcSslContexts; import io.grpc.netty.NettyChannelBuilder; import io.grpc.stub.StreamObserver; +import io.netty.handler.ssl.JdkSslContext; import io.netty.handler.ssl.OpenSslClientContext; import io.netty.handler.ssl.SslContext; import org.apache.camel.builder.RouteBuilder; @@ -36,6 +37,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -43,7 +45,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class GrpcConsumerSecurityTest extends CamelTestSupport { @@ -77,7 +78,7 @@ public void startGrpcChannels() throws SSLException { .trustManager(new File("src/test/resources/certs/ca.pem")) .build(); - assertTrue(sslContext instanceof OpenSslClientContext); + Assumptions.assumeTrue(sslContext instanceof OpenSslClientContext || sslContext instanceof JdkSslContext); tlsChannel = NettyChannelBuilder.forAddress("localhost", GRPC_TLS_TEST_PORT) .sslContext(sslContext) diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java index c6705bdbc527d..a0adacae78cc4 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java @@ -25,7 +25,8 @@ import io.grpc.netty.NettyServerBuilder; import io.grpc.stub.StreamObserver; import io.netty.handler.ssl.ClientAuth; -import io.netty.handler.ssl.OpenSslServerContext; +import io.netty.handler.ssl.JdkSslContext; +import io.netty.handler.ssl.OpenSslClientContext; import io.netty.handler.ssl.SslContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.grpc.auth.jwt.JwtAlgorithm; @@ -33,6 +34,7 @@ import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -68,7 +70,7 @@ public static void startGrpcServer() throws Exception { .clientAuth(ClientAuth.REQUIRE) .build(); - assertTrue(sslContext instanceof OpenSslServerContext); + Assumptions.assumeTrue(sslContext instanceof OpenSslClientContext || sslContext instanceof JdkSslContext); grpcServerWithTLS = NettyServerBuilder.forPort(GRPC_TLS_TEST_PORT) .sslContext(sslContext)