You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/09 20:02:08 UTC
[camel] 17/19: [CAMEL-11807] Upgrade camel-nats to junit5
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 3538177e29f68096d827360e21c2d53835383981
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jul 9 15:35:35 2020 +0200
[CAMEL-11807] Upgrade camel-nats to junit5
---
components/camel-nats/pom.xml | 4 ++--
.../org/apache/camel/component/nats/NatsAuthConsumerLoadTest.java | 2 +-
.../org/apache/camel/component/nats/NatsAuthProducerTest.java | 2 +-
.../java/org/apache/camel/component/nats/NatsAuthTestSupport.java | 4 ++--
.../camel/component/nats/NatsAuthTokenConsumerLoadTest.java | 2 +-
.../apache/camel/component/nats/NatsAuthTokenProducerTest.java | 2 +-
.../org/apache/camel/component/nats/NatsAuthTokenTestSupport.java | 4 ++--
.../org/apache/camel/component/nats/NatsConsumerLoadTest.java | 2 +-
.../camel/component/nats/NatsConsumerMaxMessagesQueueTest.java | 2 +-
.../apache/camel/component/nats/NatsConsumerMaxMessagesTest.java | 2 +-
.../org/apache/camel/component/nats/NatsConsumerReplyToTest.java | 2 +-
.../java/org/apache/camel/component/nats/NatsConsumerTest.java | 2 +-
.../camel/component/nats/NatsConsumerWithConnectionLoadTest.java | 2 +-
.../camel/component/nats/NatsConsumerWithRedeliveryTest.java | 2 +-
.../java/org/apache/camel/component/nats/NatsProducerTLSTest.java | 8 ++++----
.../java/org/apache/camel/component/nats/NatsProducerTest.java | 2 +-
.../java/org/apache/camel/component/nats/NatsTestSupport.java | 4 ++--
17 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml
index 6610459..8122bf0 100644
--- a/components/camel-nats/pom.xml
+++ b/components/camel-nats/pom.xml
@@ -47,7 +47,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<!-- logging -->
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testcontainers</artifactId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthConsumerLoadTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthConsumerLoadTest.java
index d1af70c..519224a 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthConsumerLoadTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthConsumerLoadTest.java
@@ -25,7 +25,7 @@ import io.nats.client.Options;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsAuthConsumerLoadTest extends NatsAuthTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthProducerTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthProducerTest.java
index 1a34bc2..3f26497 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthProducerTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthProducerTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.nats;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsAuthProducerTest extends NatsAuthTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java
index 401887b..e64066c 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.nats;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.Wait;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class NatsAuthTestSupport extends ContainerAwareTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenConsumerLoadTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenConsumerLoadTest.java
index bb38064..57bc43a 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenConsumerLoadTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenConsumerLoadTest.java
@@ -25,7 +25,7 @@ import io.nats.client.Options;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsAuthTokenConsumerLoadTest extends NatsAuthTokenTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenProducerTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenProducerTest.java
index c087b16..de7419c 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenProducerTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenProducerTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.nats;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsAuthTokenProducerTest extends NatsAuthTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java
index 1f3b73e..ed858ab 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.nats;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.Wait;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class NatsAuthTokenTestSupport extends ContainerAwareTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerLoadTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerLoadTest.java
index 3a016b0..d539156 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerLoadTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerLoadTest.java
@@ -22,7 +22,7 @@ import io.nats.client.Options;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsConsumerLoadTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesQueueTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesQueueTest.java
index 6fa1f02..083cb94 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesQueueTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesQueueTest.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsConsumerMaxMessagesQueueTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesTest.java
index 2892757..3551212 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerMaxMessagesTest.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsConsumerMaxMessagesTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerReplyToTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerReplyToTest.java
index 1fe4ca0..8747599 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerReplyToTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerReplyToTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.nats;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsConsumerReplyToTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java
index 2954b55..049d6a9 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.nats;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsConsumerTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithConnectionLoadTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithConnectionLoadTest.java
index 1b712a3..cacb23e 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithConnectionLoadTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithConnectionLoadTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsConsumerWithConnectionLoadTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
index f6ea7b8..017da06 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsConsumerWithRedeliveryTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java
index d2ebb50..f7d94fa 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java
@@ -21,15 +21,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/*
* The keystore used in this test it's from https://github.com/nats-io/jnats/tree/master/src/test/resources, in particular
* the tls_1222.conf file. Running this test will require use the server-cert.pem and server-key.pem in your gnatsd running instance.
*/
-@Ignore("Require a running Nats server")
+@Disabled("Require a running Nats server")
public class NatsProducerTLSTest extends CamelTestSupport {
@BindToRegistry("ssl")
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTest.java
index 6f7d3f0..ff9244e 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.nats;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NatsProducerTest extends NatsTestSupport {
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestSupport.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestSupport.java
index 0c3cad7..7f26337 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestSupport.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestSupport.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.nats;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.Wait;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class NatsTestSupport extends ContainerAwareTestSupport {