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 979d3326e0aabed27effc8f1bb3bcc1d12131099
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 11:43:56 2020 +0200
[CAMEL-11807] Upgrade camel-stomp to junit5
---
components/camel-stomp/pom.xml | 6 +++---
.../org/apache/camel/component/stomp/StompBaseTest.java | 13 ++++++++-----
.../stomp/StompConsumerHeaderFilterStrategyTest.java | 2 +-
.../org/apache/camel/component/stomp/StompConsumerTest.java | 2 +-
.../apache/camel/component/stomp/StompConsumerUriTest.java | 2 +-
.../camel/component/stomp/StompCustomHeadersTest.java | 4 +++-
.../org/apache/camel/component/stomp/StompProducerTest.java | 7 ++++---
7 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml
index ad28423..6b9dd7b 100644
--- a/components/camel-stomp/pom.xml
+++ b/components/camel-stomp/pom.xml
@@ -49,7 +49,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -64,8 +64,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
index 1c22bd8..0dc99a4 100644
---
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
+++
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
@@ -27,13 +27,16 @@ import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.fusesource.stomp.client.Stomp;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class StompBaseTest extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
protected BrokerService brokerService;
protected int numberOfMessages = 100;
protected int port;
@@ -74,7 +77,7 @@ public abstract class StompBaseTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
@@ -105,7 +108,7 @@ public abstract class StompBaseTest extends
CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
if (brokerService != null) {
diff --git
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java
index e3aa9ae..f511906 100644
---
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java
+++
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.hawtbuf.UTF8Buffer.utf8;
import static org.fusesource.stomp.client.Constants.DESTINATION;
diff --git
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
index 7d19a20..dc8cec0 100644
---
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
+++
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.hawtbuf.UTF8Buffer.utf8;
import static org.fusesource.stomp.client.Constants.DESTINATION;
diff --git
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
index de97b47..2bf9900 100644
---
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
+++
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.hawtbuf.UTF8Buffer.utf8;
import static org.fusesource.stomp.client.Constants.DESTINATION;
diff --git
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java
index 05e093f..7b949fb 100644
---
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java
+++
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java
@@ -20,7 +20,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class StompCustomHeadersTest extends StompBaseTest {
diff --git
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java
index 92b9173..dcbd5b6 100644
---
a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java
+++
b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java
@@ -27,11 +27,13 @@ import org.fusesource.hawtbuf.AsciiBuffer;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.stomp.client.Constants.DESTINATION;
import static org.fusesource.stomp.client.Constants.ID;
import static org.fusesource.stomp.client.Constants.SUBSCRIBE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class StompProducerTest extends StompBaseTest {
@@ -62,7 +64,6 @@ public class StompProducerTest extends StompBaseTest {
for (int i = 0; i < numberOfMessages; i++) {
try {
StompFrame frame = subscribeConnection.receive();
- frame.contentAsString().startsWith("test message ");
assertTrue(frame.contentAsString().startsWith("test
message "));
assertTrue(frame.getHeader(new
AsciiBuffer(HEADER)).ascii().toString().startsWith(HEADER_VALUE));
latch.countDown();
@@ -85,7 +86,7 @@ public class StompProducerTest extends StompBaseTest {
}
latch.await(20, TimeUnit.SECONDS);
- assertTrue("Messages not consumed = " + latch.getCount(),
latch.getCount() == 0);
+ assertEquals(0, latch.getCount(), "Messages not consumed = " +
latch.getCount());
}
@Override
