[camel] branch main updated: (chores) fix camel-grpc test failures on CI

[orpiske]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 74137b0  (chores) fix camel-grpc test failures on CI
74137b0 is described below

commit 74137b0d532228d95d1da21e2bd53c83495463a1
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Mar 9 13:08:16 2022 +0100

    (chores) fix camel-grpc test failures on CI
---
 .../org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java   | 5 +++--
 .../org/apache/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 aa2be6e..2ce2af4 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.ManagedChannel;
 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.component.mock.MockEndpoint;
 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 org.slf4j.LoggerFactory;
 
 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 class GrpcConsumerSecurityTest extends 
CamelTestSupport {
                 .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 c6705bd..a0adaca 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.GrpcSslContexts;
 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.component.grpc.auth.jwt.JwtServerInterceptor;
 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 class GrpcProducerSecurityTest extends 
CamelTestSupport {
                 .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)