This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 52bb0578378abca4f9a23e3574ba26720b7d943c
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jul 7 11:52:48 2020 +0200
[CAMEL-11807] Upgrade camel-grpc to junit5
---
components/camel-grpc/pom.xml | 2 +-
.../component/grpc/GrpcConsumerAggregationTest.java | 16 ++++++++++------
.../component/grpc/GrpcConsumerConcurrentTest.java | 11 +++++++----
.../component/grpc/GrpcConsumerExceptionTest.java | 20 ++++++++++++--------
.../component/grpc/GrpcConsumerPropagationTest.java | 16 ++++++++++------
.../component/grpc/GrpcConsumerSecurityTest.java | 16 ++++++++++------
.../camel/component/grpc/GrpcProducerAsyncTest.java | 17 +++++++++++------
.../component/grpc/GrpcProducerSecurityTest.java | 17 +++++++++++------
.../component/grpc/GrpcProducerStreamingTest.java | 16 ++++++++++------
.../camel/component/grpc/GrpcProducerSyncTest.java | 17 +++++++++++------
10 files changed, 93 insertions(+), 55 deletions(-)
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 23c0ff2..a740468 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -99,7 +99,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
index a4cd967..f1f23ad 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
@@ -26,14 +26,18 @@ import io.grpc.ManagedChannelBuilder;
import io.grpc.stub.StreamObserver;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class GrpcConsumerAggregationTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcConsumerAggregationTest.class);
private static final int GRPC_SYNC_REQUEST_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -48,7 +52,7 @@ public class GrpcConsumerAggregationTest extends
CamelTestSupport {
private PingPongGrpc.PingPongStub nonBlockingStub;
private PingPongGrpc.PingPongStub asyncNonBlockingStub;
- @Before
+ @BeforeEach
public void startGrpcChannels() {
syncRequestChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext().build();
asyncRequestChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build();
@@ -57,7 +61,7 @@ public class GrpcConsumerAggregationTest extends
CamelTestSupport {
asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel);
}
- @After
+ @AfterEach
public void stopGrpcChannels() {
syncRequestChannel.shutdown().shutdownNow();
asyncRequestChannel.shutdown().shutdownNow();
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
index ef777f6..d8408ce 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
@@ -30,11 +30,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class GrpcConsumerConcurrentTest extends CamelTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(GrpcConsumerConcurrentTest.class);
@@ -81,7 +84,7 @@ public class GrpcConsumerConcurrentTest extends
CamelTestSupport {
PongResponse pongResponse = responseObserver.getPongResponse();
- assertNotNull("instanceId = " + instanceId, pongResponse);
+ assertNotNull(pongResponse, "instanceId = " + instanceId);
assertEquals(instanceId, pongResponse.getPongId());
assertEquals(GRPC_TEST_PING_VALUE + GRPC_TEST_PONG_VALUE,
pongResponse.getPongName());
@@ -119,7 +122,7 @@ public class GrpcConsumerConcurrentTest extends
CamelTestSupport {
PongResponse pongResponse = responseObserver.getPongResponse();
- assertNotNull("instanceId = " + instanceId, pongResponse);
+ assertNotNull(pongResponse, "instanceId = " + instanceId);
assertEquals(instanceId, pongResponse.getPongId());
assertEquals(GRPC_USER_AGENT_PREFIX + instanceId,
pongResponse.getPongName());
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
index b3ec622..ad747cf 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
@@ -26,14 +26,18 @@ import io.grpc.stub.StreamObserver;
import org.apache.camel.CamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class GrpcConsumerExceptionTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcConsumerExceptionTest.class);
private static final int GRPC_SYNC_REQUEST_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -44,23 +48,23 @@ public class GrpcConsumerExceptionTest extends
CamelTestSupport {
private PingPongGrpc.PingPongBlockingStub blockingStub;
private PingPongGrpc.PingPongStub nonBlockingStub;
- @Before
+ @BeforeEach
public void startGrpcChannels() {
syncRequestChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext().build();
blockingStub = PingPongGrpc.newBlockingStub(syncRequestChannel);
nonBlockingStub = PingPongGrpc.newStub(syncRequestChannel);
}
- @After
+ @AfterEach
public void stopGrpcChannels() {
syncRequestChannel.shutdown().shutdownNow();
}
- @Test(expected = StatusRuntimeException.class)
+ @Test
public void testExceptionExpected() throws Exception {
LOG.info("gRPC expected exception test start");
PingRequest pingRequest =
PingRequest.newBuilder().setPingName(GRPC_TEST_PING_VALUE).setPingId(GRPC_TEST_PING_ID).build();
- PongResponse pongResponse = blockingStub.pingSyncSync(pingRequest);
+ assertThrows(StatusRuntimeException.class, () ->
blockingStub.pingSyncSync(pingRequest));
}
@Test
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
index f6e11e1..6724051 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
@@ -25,14 +25,18 @@ import io.grpc.stub.StreamObserver;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class GrpcConsumerPropagationTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcConsumerPropagationTest.class);
private static final int GRPC_ASYNC_NEXT_REQUEST_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -46,7 +50,7 @@ public class GrpcConsumerPropagationTest extends
CamelTestSupport {
private PingPongGrpc.PingPongStub asyncOnNextStub;
private PingPongGrpc.PingPongStub asyncOnCompletedStub;
- @Before
+ @BeforeEach
public void startGrpcChannels() {
asyncOnNextChannel = ManagedChannelBuilder.forAddress("localhost",
GRPC_ASYNC_NEXT_REQUEST_TEST_PORT).usePlaintext().build();
asyncOnCompletedChannel =
ManagedChannelBuilder.forAddress("localhost",
GRPC_ASYNC_COMPLETED_REQUEST_TEST_PORT).usePlaintext().build();
@@ -54,7 +58,7 @@ public class GrpcConsumerPropagationTest extends
CamelTestSupport {
asyncOnCompletedStub = PingPongGrpc.newStub(asyncOnCompletedChannel);
}
- @After
+ @AfterEach
public void stopGrpcChannels() throws Exception {
asyncOnNextChannel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
asyncOnCompletedChannel.shutdown().awaitTermination(5,
TimeUnit.SECONDS);
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 b426a73..1d8bcd6 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
@@ -33,14 +33,18 @@ import
org.apache.camel.component.grpc.auth.jwt.JwtCallCredentials;
import org.apache.camel.component.grpc.auth.jwt.JwtHelper;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class GrpcConsumerSecurityTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcConsumerSecurityTest.class);
private static final int GRPC_TLS_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -61,7 +65,7 @@ public class GrpcConsumerSecurityTest extends
CamelTestSupport {
private PingPongGrpc.PingPongStub jwtCorrectAsyncStub;
private PingPongGrpc.PingPongStub jwtIncorrectAsyncStub;
- @Before
+ @BeforeEach
public void startGrpcChannels() throws SSLException {
String correctJwtToken =
JwtHelper.createJwtToken(JwtAlgorithm.HMAC256, GRPC_JWT_CORRECT_SECRET, null,
null);
String incorrectJwtToken =
JwtHelper.createJwtToken(JwtAlgorithm.HMAC256, GRPC_JWT_INCORRECT_SECRET, null,
null);
@@ -83,7 +87,7 @@ public class GrpcConsumerSecurityTest extends
CamelTestSupport {
}
- @After
+ @AfterEach
public void stopGrpcChannels() throws Exception {
tlsChannel.shutdown().awaitTermination(1, TimeUnit.SECONDS);
jwtCorrectChannel.shutdown().awaitTermination(1, TimeUnit.SECONDS);
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java
index d11ffca..699f3b1 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java
@@ -28,14 +28,19 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
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 GrpcProducerAsyncTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcProducerAsyncTest.class);
private static final int GRPC_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -48,13 +53,13 @@ public class GrpcProducerAsyncTest extends CamelTestSupport
{
private static Server grpcServer;
private Object asyncPongResponse;
- @BeforeClass
+ @BeforeAll
public static void startGrpcServer() throws Exception {
grpcServer = ServerBuilder.forPort(GRPC_TEST_PORT).addService(new
PingPongImpl()).build().start();
LOG.info("gRPC server started on port {}", GRPC_TEST_PORT);
}
- @AfterClass
+ @AfterAll
public static void stopGrpcServer() throws IOException {
if (grpcServer != null) {
grpcServer.shutdown();
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 657cc20..67fd3c3 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
@@ -30,14 +30,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.grpc.auth.jwt.JwtAlgorithm;
import org.apache.camel.component.grpc.auth.jwt.JwtServerInterceptor;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
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 GrpcProducerSecurityTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcProducerSecurityTest.class);
private static final int GRPC_TLS_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -54,7 +59,7 @@ public class GrpcProducerSecurityTest extends
CamelTestSupport {
private static Server grpcServerWithTLS;
private static Server grpcServerWithJWT;
- @BeforeClass
+ @BeforeAll
public static void startGrpcServer() throws Exception {
grpcServerWithTLS = NettyServerBuilder.forPort(GRPC_TLS_TEST_PORT)
.sslContext(GrpcSslContexts.forServer(new
File("src/test/resources/certs/server.pem"),
@@ -75,7 +80,7 @@ public class GrpcProducerSecurityTest extends
CamelTestSupport {
LOG.info("gRPC server with the JWT auth started on port {}",
GRPC_JWT_TEST_PORT);
}
- @AfterClass
+ @AfterAll
public static void stopGrpcServer() throws IOException {
if (grpcServerWithTLS != null) {
grpcServerWithTLS.shutdown();
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
index 8953bc4..4ef72a1 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
@@ -26,14 +26,18 @@ import io.grpc.stub.StreamObserver;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.assertListSize;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class GrpcProducerStreamingTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcProducerStreamingTest.class);
private static final int GRPC_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -41,14 +45,14 @@ public class GrpcProducerStreamingTest extends
CamelTestSupport {
private static Server grpcServer;
private static PingPongImpl pingPongServer;
- @Before
+ @BeforeEach
public void startGrpcServer() throws Exception {
pingPongServer = new PingPongImpl();
grpcServer =
ServerBuilder.forPort(GRPC_TEST_PORT).addService(pingPongServer).build().start();
LOG.info("gRPC server started on port {}", GRPC_TEST_PORT);
}
- @After
+ @AfterEach
public void stopGrpcServer() throws IOException {
if (grpcServer != null) {
grpcServer.shutdown();
diff --git
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java
index 740c7b7..e607fda 100644
---
a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java
+++
b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java
@@ -26,14 +26,19 @@ import io.grpc.ServerBuilder;
import io.grpc.stub.StreamObserver;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
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 GrpcProducerSyncTest extends CamelTestSupport {
+
private static final Logger LOG =
LoggerFactory.getLogger(GrpcProducerSyncTest.class);
private static final int GRPC_TEST_PORT =
AvailablePortFinder.getNextAvailable();
@@ -46,13 +51,13 @@ public class GrpcProducerSyncTest extends CamelTestSupport {
private static Server grpcServer;
- @BeforeClass
+ @BeforeAll
public static void startGrpcServer() throws Exception {
grpcServer = ServerBuilder.forPort(GRPC_TEST_PORT).addService(new
PingPongImpl()).build().start();
LOG.info("gRPC server started on port {}", GRPC_TEST_PORT);
}
- @AfterClass
+ @AfterAll
public static void stopGrpcServer() throws IOException {
if (grpcServer != null) {
grpcServer.shutdown();
