You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2020/03/14 09:23:54 UTC
[camel] branch master updated (bc5d106 -> 03c24cc)
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bc5d106 CAMEL-14716: @BeanConfigInject add support for Map
new 2b43469 CAMEL-11807: Migrated camel-as* tests to JUnit 5
new 03c24cc Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-asn1/pom.xml | 4 +--
...1DataFormatWithStreamIteratorByteArrayTest.java | 18 ++++++-----
.../ASN1DataFormatWithStreamIteratorClassTest.java | 28 +++++++++--------
.../asn1/ASN1DataFormatWithStreamTest.java | 18 ++++++-----
.../asn1/SpringASN1DataFormatRouteTest.java | 8 +++--
components/camel-asterisk/pom.xml | 7 +----
.../component/asterisk/AsteriskConfigTest.java | 11 ++++---
.../component/asterisk/AsteriskConsumerTest.java | 14 ++++-----
.../component/asterisk/AsteriskProducerTest.java | 12 ++++----
components/camel-atmosphere-websocket/pom.xml | 7 +----
.../websocket/MemoryWebSocketStoreTest.java | 11 ++++---
.../websocket/WebsocketCamelRouterTestSupport.java | 10 +++----
...bsocketCamelRouterWithInitParamTestSupport.java | 10 +++----
.../atmosphere/websocket/WebsocketRouteTest.java | 30 +++++++++++--------
.../websocket/WebsocketRouteWithInitParamTest.java | 35 ++++++++++++----------
components/camel-atom/pom.xml | 7 +----
.../camel/component/atom/AtomEndpointTest.java | 2 +-
.../atom/AtomEntryPollingConsumerTest.java | 14 ++++-----
.../AtomEntryPollingConsumerWithBasicAuthTest.java | 16 +++++-----
.../camel/component/atom/AtomEntrySortTest.java | 14 ++++-----
.../camel/component/atom/AtomGoodBlogsTest.java | 11 ++++---
.../camel/component/atom/AtomHttpConsumerTest.java | 14 ++++-----
.../atom/AtomHttpNoCamelParametersTest.java | 11 ++++---
.../atom/AtomPollingConsumerIdleMessageTest.java | 12 ++++----
.../component/atom/AtomPollingConsumerTest.java | 18 ++++++-----
.../atom/AtomPollingConsumerWithBasicAuthTest.java | 16 +++++-----
.../component/atom/AtomPollingLowDelayTest.java | 10 +++----
.../component/atom/AtomPollingUnthrottledTest.java | 10 +++----
.../camel/component/atom/AtomProducerTest.java | 8 +++--
.../apache/camel/component/atom/AtomRouteTest.java | 17 ++++++-----
.../camel/component/atom/JettyTestServer.java | 2 +-
.../component/atom/UpdatedDateFilterTest.java | 14 +++++----
.../camel/component/sql/DefaultSqlEndpoint.java | 3 +-
33 files changed, 222 insertions(+), 200 deletions(-)
[camel] 02/02: Fixed CS
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 03c24ccd9c34c8fb648233b455a639093e34ef5e
Author: aldettinger <al...@gmail.com>
AuthorDate: Sat Mar 14 10:20:23 2020 +0100
Fixed CS
---
.../main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
index 73e1b24..7efad90 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
@@ -109,7 +109,8 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint {
+ " in the message body, any existing content in the message body is discarded. If outputHeader is set, the value is used as the name of the header"
+ " to store the query result and the original message body is preserved.")
private String outputHeader;
- @UriParam(label = "producer", description = "Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used. Note that query parameters in the message body are represented by a question mark instead of a <tt>#</tt> symbol.")
+ @UriParam(label = "producer", description = "Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used."
+ + "Note that query parameters in the message body are represented by a question mark instead of a <tt>#</tt> symbol.")
private boolean useMessageBodyForSql;
@UriParam(label = "advanced", defaultValue = "#", description = "Specifies a character that will be replaced to ? in SQL query."
+ " Notice, that it is simple String.replaceAll() operation and no SQL parsing is involved (quoted strings will also change).")
[camel] 01/02: CAMEL-11807: Migrated camel-as* tests to JUnit 5
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2b434691216199091bcfe102f4deb4248235a28a
Author: aldettinger <al...@gmail.com>
AuthorDate: Sat Mar 14 09:41:38 2020 +0100
CAMEL-11807: Migrated camel-as* tests to JUnit 5
---
components/camel-asn1/pom.xml | 4 +--
...1DataFormatWithStreamIteratorByteArrayTest.java | 18 ++++++-----
.../ASN1DataFormatWithStreamIteratorClassTest.java | 28 +++++++++--------
.../asn1/ASN1DataFormatWithStreamTest.java | 18 ++++++-----
.../asn1/SpringASN1DataFormatRouteTest.java | 8 +++--
components/camel-asterisk/pom.xml | 7 +----
.../component/asterisk/AsteriskConfigTest.java | 11 ++++---
.../component/asterisk/AsteriskConsumerTest.java | 14 ++++-----
.../component/asterisk/AsteriskProducerTest.java | 12 ++++----
components/camel-atmosphere-websocket/pom.xml | 7 +----
.../websocket/MemoryWebSocketStoreTest.java | 11 ++++---
.../websocket/WebsocketCamelRouterTestSupport.java | 10 +++----
...bsocketCamelRouterWithInitParamTestSupport.java | 10 +++----
.../atmosphere/websocket/WebsocketRouteTest.java | 30 +++++++++++--------
.../websocket/WebsocketRouteWithInitParamTest.java | 35 ++++++++++++----------
components/camel-atom/pom.xml | 7 +----
.../camel/component/atom/AtomEndpointTest.java | 2 +-
.../atom/AtomEntryPollingConsumerTest.java | 14 ++++-----
.../AtomEntryPollingConsumerWithBasicAuthTest.java | 16 +++++-----
.../camel/component/atom/AtomEntrySortTest.java | 14 ++++-----
.../camel/component/atom/AtomGoodBlogsTest.java | 11 ++++---
.../camel/component/atom/AtomHttpConsumerTest.java | 14 ++++-----
.../atom/AtomHttpNoCamelParametersTest.java | 11 ++++---
.../atom/AtomPollingConsumerIdleMessageTest.java | 12 ++++----
.../component/atom/AtomPollingConsumerTest.java | 18 ++++++-----
.../atom/AtomPollingConsumerWithBasicAuthTest.java | 16 +++++-----
.../component/atom/AtomPollingLowDelayTest.java | 10 +++----
.../component/atom/AtomPollingUnthrottledTest.java | 10 +++----
.../camel/component/atom/AtomProducerTest.java | 8 +++--
.../apache/camel/component/atom/AtomRouteTest.java | 17 ++++++-----
.../camel/component/atom/JettyTestServer.java | 2 +-
.../component/atom/UpdatedDateFilterTest.java | 14 +++++----
32 files changed, 220 insertions(+), 199 deletions(-)
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index 052b582..b8f5ec1 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -53,7 +53,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
index d8a45d9..8815c44 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorByteArrayTest.java
@@ -24,10 +24,12 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.io.FileUtils;
import org.bouncycastle.asn1.ASN1Primitive;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ASN1DataFormatWithStreamIteratorByteArrayTest extends CamelTestSupport {
@@ -55,30 +57,30 @@ public class ASN1DataFormatWithStreamIteratorByteArrayTest extends CamelTestSupp
}
@Test
- public void testUnmarshalReturnByteArray() throws Exception {
+ void testUnmarshalReturnByteArray() throws Exception {
baseASN1DataFormatWithStreamIteratorByteArrayTest("mock:unmarshal", "direct:unmarshal");
}
@Test
- public void testUnmarshalReturnByteArrayDsl() throws Exception {
+ void testUnmarshalReturnByteArrayDsl() throws Exception {
baseASN1DataFormatWithStreamIteratorByteArrayTest("mock:unmarshaldsl", "direct:unmarshaldsl");
}
@Test
- public void testUnmarshalMarshalReturnOutputStream() throws Exception {
+ void testUnmarshalMarshalReturnOutputStream() throws Exception {
baseASN1DataFormatWithStreamIteratorByteArrayTest("mock:marshal", "direct:unmarshalthenmarshal");
}
@Test
- public void testUnmarshalMarshalReturnOutputStreamDsl() throws Exception {
+ void testUnmarshalMarshalReturnOutputStreamDsl() throws Exception {
baseASN1DataFormatWithStreamIteratorByteArrayTest("mock:marshaldsl", "direct:unmarshalthenmarshaldsl");
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
asn1 = new ASN1DataFormat();
asn1.setUsingIterator(true);
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
index 4dceedf..ec367c0 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
@@ -24,9 +24,11 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport {
@@ -52,12 +54,12 @@ public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport
}
@Test
- public void testUnmarshalReturnClassObject() throws Exception {
+ void testUnmarshalReturnClassObject() throws Exception {
baseUnmarshalReturnClassObjectTest("mock:unmarshal", "direct:unmarshal");
}
@Test
- public void testUnmarshalReturnClassObjectDsl() throws Exception {
+ void testUnmarshalReturnClassObjectDsl() throws Exception {
baseUnmarshalReturnClassObjectTest("mock:unmarshaldsl", "direct:unmarshaldsl");
}
@@ -88,18 +90,18 @@ public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport
}
@Test
- public void testUnmarshalMarshalReturnOutputStream() throws Exception {
+ void testUnmarshalMarshalReturnOutputStream() throws Exception {
baseUnmarshalMarshalReturnOutputStreamTest("mock:marshal", "direct:unmarshalthenmarshal");
}
@Test
- public void testUnmarshalMarshalReturnOutputStreamDsl() throws Exception {
+ void testUnmarshalMarshalReturnOutputStreamDsl() throws Exception {
baseUnmarshalMarshalReturnOutputStreamTest("mock:marshaldsl", "direct:unmarshalthenmarshaldsl");
}
@Test
- @Ignore
- public void testUnmarshalReturnClassObjectAfterUnmarshalMarshalReturnOutputStream() throws Exception {
+ @Disabled
+ void testUnmarshalReturnClassObjectAfterUnmarshalMarshalReturnOutputStream() throws Exception {
getMockEndpoint("mock:unmarshal").expectedMessageCount(1);
File testFile = new File("src/test/resources/after_unmarshal_marshal_SMS_SINGLE.tt");
@@ -152,20 +154,20 @@ public class ASN1DataFormatWithStreamIteratorClassTest extends CamelTestSupport
}
@Test
- public void testDoubleUnmarshal() throws Exception {
+ void testDoubleUnmarshal() throws Exception {
baseDoubleUnmarshalTest("mock:firstunmarshal", "mock:secondunmarshal", "direct:doubleunmarshal");
}
@Test
- public void testDoubleUnmarshalDsl() throws Exception {
+ void testDoubleUnmarshalDsl() throws Exception {
baseDoubleUnmarshalTest("mock:firstunmarshaldsldsl", "mock:secondunmarshaldsl", "direct:doubleunmarshaldsl");
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
asn1 = new ASN1DataFormat(SmsCdr.class);
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
index cbffa2f..2028eb9 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamTest.java
@@ -23,9 +23,11 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ASN1DataFormatWithStreamTest extends CamelTestSupport {
@@ -52,30 +54,30 @@ public class ASN1DataFormatWithStreamTest extends CamelTestSupport {
}
@Test
- public void testUnmarshalReturnOutputStream() throws Exception {
+ void testUnmarshalReturnOutputStream() throws Exception {
baseASN1DataFormatWithStreamTest("mock:unmarshal", "direct:unmarshal");
}
@Test
- public void testUnmarshalReturnOutputStreamDsl() throws Exception {
+ void testUnmarshalReturnOutputStreamDsl() throws Exception {
baseASN1DataFormatWithStreamTest("mock:unmarshaldsl", "direct:unmarshaldsl");
}
@Test
- public void testUnmarshalMarshalReturnOutputStream() throws Exception {
+ void testUnmarshalMarshalReturnOutputStream() throws Exception {
baseASN1DataFormatWithStreamTest("mock:marshal", "direct:unmarshalthenmarshal");
}
@Test
- public void testUnmarshalMarshalReturnOutputStreamDsl() throws Exception {
+ void testUnmarshalMarshalReturnOutputStreamDsl() throws Exception {
baseASN1DataFormatWithStreamTest("mock:marshaldsl", "direct:unmarshalthenmarshaldsl");
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
asn1 = new ASN1DataFormat();
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
index 80b1e09..c1dbbb2 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
@@ -22,11 +22,13 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SpringASN1DataFormatRouteTest extends CamelSpringTestSupport {
private String fileName = "src/test/resources/asn1_data/SMS_SINGLE.tt";
@@ -50,7 +52,7 @@ public class SpringASN1DataFormatRouteTest extends CamelSpringTestSupport {
}
@Test
- public void testUnmarshalReturnClassObject() throws Exception {
+ void testUnmarshalReturnClassObject() throws Exception {
baseUnmarshalReturnClassObjectTest("mock:unmarshal", "direct:unmarshal");
}
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 8d0bb28..f3c12fd 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -70,13 +70,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java
index 592d25f..da47f70 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConfigTest.java
@@ -17,8 +17,11 @@
package org.apache.camel.component.asterisk;
import org.apache.camel.Endpoint;
-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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AsteriskConfigTest extends CamelTestSupport {
@@ -28,9 +31,9 @@ public class AsteriskConfigTest extends CamelTestSupport {
private String action = "QUEUE_STATUS";
@Test
- public void asteriskEndpointData() throws Exception {
+ void asteriskEndpointData() {
Endpoint endpoint = context.getEndpoint("asterisk://myVoIP?hostname=" + hostname + "&username=" + username + "&password=" + password + "&action=" + action);
- assertTrue("Endpoint not an AsteriskEndpoint: " + endpoint, endpoint instanceof AsteriskEndpoint);
+ assertTrue(endpoint instanceof AsteriskEndpoint, "Endpoint not an AsteriskEndpoint: " + endpoint);
AsteriskEndpoint asteriskEndpoint = (AsteriskEndpoint)endpoint;
assertEquals(hostname, asteriskEndpoint.getHostname());
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
index 2741c81..afad8c3 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore("CAMEL-10321: Set host, username and password test asterisk consumer.")
+@Disabled("CAMEL-10321: Set host, username and password test asterisk consumer.")
public class AsteriskConsumerTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AsteriskConsumerTest.class);
@@ -35,9 +35,9 @@ public class AsteriskConsumerTest extends CamelTestSupport {
private String username = "username";
private String password = "password";
- @Ignore
+ @Disabled
@Test
- public void testReceiveTraps() throws Exception {
+ void testReceiveTraps() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
mock.assertIsSatisfied();
@@ -50,7 +50,7 @@ public class AsteriskConsumerTest extends CamelTestSupport {
}
@Test
- public void testStartRoute() throws Exception {
+ void testStartRoute() {
// do nothing here , just make sure the camel route can started.
}
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
index 87c17a6..246bcbf 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskProducerTest.java
@@ -20,11 +20,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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;
-@Ignore("CAMEL-10321: Set host, username and password test asterisk producer.")
+@Disabled("CAMEL-10321: Set host, username and password test asterisk producer.")
public class AsteriskProducerTest extends CamelTestSupport {
private String hostname = "192.168.0.254";
@@ -33,7 +33,7 @@ public class AsteriskProducerTest extends CamelTestSupport {
private String action = AsteriskAction.EXTENSION_STATE.name();
@Test
- public void testSnmpProducer() throws Exception {
+ void testSnmpProducer() throws Exception {
template.sendBody("direct:in", "");
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -43,7 +43,7 @@ public class AsteriskProducerTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:in").to("asterisk://myVoIP?hostname=" + hostname + "&username=" + username + "&password=" + password + "&action=" + action).log("${body}")
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index a283cf6..a71b138 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -75,12 +75,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java
index e4042e2..0465f04 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java
@@ -19,14 +19,17 @@ package org.apache.camel.component.atmosphere.websocket;
import java.util.UUID;
import org.atmosphere.websocket.WebSocket;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-public class MemoryWebSocketStoreTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class MemoryWebSocketStoreTest {
@Test
- public void testAddAndRemove() throws Exception {
+ void testAddAndRemove() {
MemoryWebSocketStore store = new MemoryWebSocketStore();
WebSocket webSocket1 = Mockito.mock(WebSocket.class);
WebSocket webSocket2 = Mockito.mock(WebSocket.class);
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
index 95dedef..08d5abe 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.atmosphere.websocket;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
public class WebsocketCamelRouterTestSupport extends CamelTestSupport {
public static final String CONTEXT = "/mycontext";
@@ -35,7 +35,7 @@ public class WebsocketCamelRouterTestSupport extends CamelTestSupport {
protected ServletHolder servletHolder;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
server = new Server(PORT);
@@ -55,7 +55,7 @@ public class WebsocketCamelRouterTestSupport extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (startCamelContext) {
super.tearDown();
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
index ff59fb7..59f5e66 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.atmosphere.websocket;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
public class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSupport {
public static final String CONTEXT = "/mycontext";
@@ -35,7 +35,7 @@ public class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSuppo
protected ServletHolder servletHolder;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
server = new Server(PORT);
@@ -56,7 +56,7 @@ public class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSuppo
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (startCamelContext) {
super.tearDown();
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java
index 136fcea..f0c35e5 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java
@@ -26,14 +26,18 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
private static final String RESPONSE_GREETING = "Hola ";
private static final byte[] RESPONSE_GREETING_BYTES = {0x48, 0x6f, 0x6c, 0x61, 0x20};
@Test
- public void testWebsocketSingleClient() throws Exception {
+ void testWebsocketSingleClient() throws Exception {
TestClient wsclient = new TestClient("ws://localhost:" + PORT + "/hola");
wsclient.connect();
@@ -47,7 +51,7 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
}
@Test
- public void testWebsocketSingleClientForBytes() throws Exception {
+ void testWebsocketSingleClientForBytes() throws Exception {
TestClient wsclient = new TestClient("ws://localhost:" + PORT + "/hola");
wsclient.connect();
@@ -61,7 +65,7 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
}
@Test
- public void testWebsocketSingleClientForReader() throws Exception {
+ void testWebsocketSingleClientForReader() throws Exception {
TestClient wsclient = new TestClient("ws://localhost:" + PORT + "/hola3");
wsclient.connect();
@@ -75,7 +79,7 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
}
@Test
- public void testWebsocketSingleClientForInputStream() throws Exception {
+ void testWebsocketSingleClientForInputStream() throws Exception {
TestClient wsclient = new TestClient("ws://localhost:" + PORT + "/hola3");
wsclient.connect();
@@ -89,7 +93,7 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
}
@Test
- public void testWebsocketBroadcastClient() throws Exception {
+ void testWebsocketBroadcastClient() throws Exception {
TestClient wsclient1 = new TestClient("ws://localhost:" + PORT + "/hola2", 2);
TestClient wsclient2 = new TestClient("ws://localhost:" + PORT + "/hola2", 2);
wsclient1.connect();
@@ -117,7 +121,7 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
}
@Test
- public void testWebsocketEventsResendingDisabled() throws Exception {
+ void testWebsocketEventsResendingDisabled() throws Exception {
TestClient wsclient = new TestClient("ws://localhost:" + PORT + "/hola4");
wsclient.connect();
assertFalse(wsclient.await(10));
@@ -131,28 +135,28 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
public void configure() {
// route for a single line
from("atmosphere-websocket:///hola").to("log:info").process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
createResponse(exchange, false);
}
}).to("atmosphere-websocket:///hola");
// route for a broadcast line
from("atmosphere-websocket:///hola2").to("log:info").process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
createResponse(exchange, false);
}
}).to("atmosphere-websocket:///hola2?sendToAll=true");
// route for a single stream line
from("atmosphere-websocket:///hola3?useStreaming=true").to("log:info").process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
createResponse(exchange, true);
}
}).to("atmosphere-websocket:///hola3");
// route for events resending disabled
from("atmosphere-websocket:///hola4").to("log:info").process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
checkEventsResendingDisabled(exchange);
}
}).to("atmosphere-websocket:///hola4");
@@ -163,9 +167,9 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
private static void createResponse(Exchange exchange, boolean streaming) {
Object msg = exchange.getIn().getBody();
if (streaming) {
- assertTrue("Expects Reader or InputStream", msg instanceof Reader || msg instanceof InputStream);
+ assertTrue(msg instanceof Reader || msg instanceof InputStream, "Expects Reader or InputStream");
} else {
- assertTrue("Expects String or byte[]", msg instanceof String || msg instanceof byte[]);
+ assertTrue(msg instanceof String || msg instanceof byte[], "Expects String or byte[]");
}
if (msg instanceof String) {
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
index acb4ecf..497fc3d 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
@@ -24,7 +24,10 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithInitParamTestSupport {
@@ -33,21 +36,21 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
private static Map<String, String> connectionKeyUserMap = new HashMap<>();
@Test
- public void testWebsocketEventsResendingEnabled() throws Exception {
+ void testWebsocketEventsResendingEnabled() throws Exception {
TestClient wsclient = new TestClient("ws://localhost:" + PORT + "/hola");
wsclient.connect();
wsclient.close();
}
@Test
- public void testPassParametersWebsocketOnOpen() throws Exception {
+ void testPassParametersWebsocketOnOpen() throws Exception {
TestClient wsclient = new TestClient("ws://localhost:" + PORT + "/hola1?param1=value1¶m2=value2");
wsclient.connect();
wsclient.close();
}
@Test
- public void testWebsocketSingleClientBroadcastMultipleClients() throws Exception {
+ void testWebsocketSingleClientBroadcastMultipleClients() throws Exception {
final int awaitTime = 5;
connectionKeyUserMap.clear();
@@ -94,7 +97,7 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
}
@Test
- public void testWebsocketSingleClientBroadcastMultipleClientsGuaranteeDelivery() throws Exception {
+ void testWebsocketSingleClientBroadcastMultipleClientsGuaranteeDelivery() throws Exception {
final int awaitTime = 5;
connectionKeyUserMap.clear();
@@ -146,14 +149,14 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
public void configure() {
// route for events resending enabled
from("atmosphere-websocket:///hola").to("log:info").process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
checkEventsResendingEnabled(exchange);
}
});
// route for events resending enabled
from("atmosphere-websocket:///hola1").to("log:info").process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
checkPassedParameters(exchange);
}
});
@@ -163,25 +166,25 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
.choice()
.when(header(WebsocketConstants.EVENT_TYPE).isEqualTo(WebsocketConstants.ONOPEN_EVENT_TYPE))
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
createExternalConnectionRegister(exchange);
}
})
.when(header(WebsocketConstants.EVENT_TYPE).isEqualTo(WebsocketConstants.ONCLOSE_EVENT_TYPE))
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
removeExternalConnectionRegister(exchange);
}
})
.when(header(WebsocketConstants.EVENT_TYPE).isEqualTo(WebsocketConstants.ONERROR_EVENT_TYPE))
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
removeExternalConnectionRegister(exchange);
}
})
.otherwise()
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
createBroadcastMultipleClientsResponse(exchange);
}
}).to("atmosphere-websocket:///hola2");
@@ -191,31 +194,31 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
.choice()
.when(header(WebsocketConstants.EVENT_TYPE).isEqualTo(WebsocketConstants.ONOPEN_EVENT_TYPE))
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
createExternalConnectionRegister(exchange);
}
})
.when(header(WebsocketConstants.EVENT_TYPE).isEqualTo(WebsocketConstants.ONCLOSE_EVENT_TYPE))
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
removeExternalConnectionRegister(exchange);
}
})
.when(header(WebsocketConstants.EVENT_TYPE).isEqualTo(WebsocketConstants.ONERROR_EVENT_TYPE))
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
removeExternalConnectionRegister(exchange);
}
})
.when(header(WebsocketConstants.ERROR_TYPE).isEqualTo(WebsocketConstants.MESSAGE_NOT_SENT_ERROR_TYPE))
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
handleNotDeliveredMessage(exchange);
}
})
.otherwise()
.process(new Processor() {
- public void process(final Exchange exchange) throws Exception {
+ public void process(final Exchange exchange) {
createBroadcastMultipleClientsResponse(exchange);
}
}).to("atmosphere-websocket:///hola3");
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 4298d10..e5a609f 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -172,7 +172,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -191,11 +191,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
index cf96c44..4d09cdb 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
public class AtomEndpointTest extends AtomPollingConsumerTest {
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() throws Exception {
AtomEndpoint atom = new AtomEndpoint();
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
index 9020638..7ebe16f 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
@@ -21,8 +21,8 @@ import java.text.SimpleDateFormat;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for AtomEntryPollingConsumer
@@ -30,21 +30,21 @@ import org.junit.Test;
public class AtomEntryPollingConsumerTest extends CamelTestSupport {
@Test
- public void testResult() throws Exception {
+ void testResult() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result1");
mock.expectedMessageCount(7);
mock.assertIsSatisfied();
}
@Test
- public void testResult2() throws Exception {
+ void testResult2() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result2");
mock.expectedMessageCount(7);
mock.assertIsSatisfied();
}
@Test
- public void testResult3() throws Exception {
+ void testResult3() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result3");
mock.expectedMessageCount(4);
mock.assertIsSatisfied();
@@ -57,9 +57,9 @@ public class AtomEntryPollingConsumerTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:file:src/test/data/feed.atom?splitEntries=true&delay=500").to("mock:result1");
from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=false&delay=500").to("mock:result2");
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
index 27d3633..c87c0d3 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
@@ -17,16 +17,16 @@
package org.apache.camel.component.atom;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class AtomEntryPollingConsumerWithBasicAuthTest extends AtomEntryPollingConsumerTest {
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&delay=500&username=camel&password=camelPass")
.to("mock:result1");
@@ -39,13 +39,13 @@ public class AtomEntryPollingConsumerWithBasicAuthTest extends AtomEntryPollingC
};
}
- @BeforeClass
- public static void startServer() {
+ @BeforeAll
+ static void startServer() {
JettyTestServer.getInstance().startServer();
}
- @AfterClass
- public static void stopServer() {
+ @AfterAll
+ static void stopServer() {
JettyTestServer.getInstance().stopServer();
}
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
index bdd9646..8fdee63 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
@@ -24,13 +24,13 @@ import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class AtomEntrySortTest extends CamelTestSupport {
@Test
- public void testSortedEntries() throws Exception {
+ void testSortedEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:sorted");
mock.expectsAscending(ExpressionBuilder.beanExpression("myBean?method=getPubDate"));
mock.expectedMessageCount(10);
@@ -39,7 +39,7 @@ public class AtomEntrySortTest extends CamelTestSupport {
}
@Test
- public void testUnSortedEntries() throws Exception {
+ void testUnSortedEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:unsorted");
mock.expectsAscending(ExpressionBuilder.beanExpression("myBean?method=getPubDate"));
mock.expectedMessageCount(10);
@@ -48,14 +48,14 @@ public class AtomEntrySortTest extends CamelTestSupport {
}
@Override
- protected void bindToRegistry(Registry registry) throws Exception {
+ protected void bindToRegistry(Registry registry) {
registry.bind("myBean", new MyBean());
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:file:src/test/data/unsortedfeed.atom?splitEntries=true&sortEntries=true&delay=50").to("mock:sorted");
from("atom:file:src/test/data/unsortedfeed.atom?splitEntries=true&sortEntries=false&delay=50").to("mock:unsorted");
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
index 13c99a7..1105c04 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
@@ -23,13 +23,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Example for wiki documentation
*/
-public class AtomGoodBlogsTest extends TestSupport {
+public class AtomGoodBlogsTest {
// START SNIPPET: e1
@@ -54,9 +53,9 @@ public class AtomGoodBlogsTest extends TestSupport {
/**
* This is the route builder where we create our routes using the Camel DSL
*/
- protected RouteBuilder createMyRoutes() throws Exception {
+ protected RouteBuilder createMyRoutes() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
// We pool the atom feeds from the source for further processing in the seda queue
// we set the delay to 1 second for each pool as this is a unit test also and we can
// not wait the default poll interval of 60 seconds.
@@ -83,7 +82,7 @@ public class AtomGoodBlogsTest extends TestSupport {
* This is the actual junit test method that does the assertion that our routes is working as expected
*/
@Test
- public void testFiltering() throws Exception {
+ void testFiltering() throws Exception {
// create and start Camel
context = createCamelContext();
context.start();
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
index 29313a2..c0bc1cd 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
@@ -18,27 +18,27 @@ package org.apache.camel.component.atom;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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;
/**
* Unit test for consuming from a http feed
*/
public class AtomHttpConsumerTest extends CamelTestSupport {
- @Ignore("requires to be online for testing")
+ @Disabled("requires to be online for testing")
@Test
- public void testHttpConsumer() throws Exception {
+ void testHttpConsumer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.assertIsSatisfied();
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:http://feeds2.feedburner.com/ApacheCamel.atom?splitEntries=false").to("mock:result");
}
};
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java
index faf3e37..d72c4a5 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.camel.component.atom;
-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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class AtomHttpNoCamelParametersTest extends CamelTestSupport {
@Test
- public void testAtomHttpNoCamelParameters() throws Exception {
+ void testAtomHttpNoCamelParameters() {
AtomEndpoint atom = context.getEndpoint("atom://http://www.iafrica.com/pls/cms/grapevine.xml?sortEntries=true&feedHeader=true", AtomEndpoint.class);
assertNotNull(atom);
@@ -32,7 +35,7 @@ public class AtomHttpNoCamelParametersTest extends CamelTestSupport {
}
@Test
- public void testAtomHttpNoCamelParametersAndOneFeedParameter() throws Exception {
+ void testAtomHttpNoCamelParametersAndOneFeedParameter() {
AtomEndpoint atom = context.getEndpoint("atom://http://www.iafrica.com/pls/cms/grapevine.xml?sortEntries=true&feedHeader=true&foo=bar", AtomEndpoint.class);
assertNotNull(atom);
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
index fc013e1..e831953 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.atom;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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 static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
@@ -28,7 +30,7 @@ import org.junit.Test;
public class AtomPollingConsumerIdleMessageTest extends CamelTestSupport {
@Test
- public void testConsumeIdleMessages() throws Exception {
+ void testConsumeIdleMessages() throws Exception {
Thread.sleep(110);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
@@ -38,9 +40,9 @@ public class AtomPollingConsumerIdleMessageTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:file:src/test/data/empty-feed.atom?splitEntries=true&delay=50&initialDelay=0"
+ "&feedHeader=false&sendEmptyMessageWhenIdle=true")
.to("mock:result");
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
index 93376fb..70d2041 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
@@ -23,8 +23,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test for AtomPollingConsumer
@@ -32,7 +36,7 @@ import org.junit.Test;
public class AtomPollingConsumerTest extends CamelTestSupport {
@Test
- public void testNoSplitEntries() throws Exception {
+ void testNoSplitEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.assertIsSatisfied();
@@ -51,22 +55,22 @@ public class AtomPollingConsumerTest extends CamelTestSupport {
}
@Test
- public void testUsingAtomUriParameter() throws Exception {
+ void testUsingAtomUriParameter() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result2");
mock.expectedMessageCount(1);
mock.assertIsSatisfied();
}
@Test
- public void testNoCamelParametersInFeedUri() throws Exception {
+ void testNoCamelParametersInFeedUri() {
AtomEndpoint endpoint = context.getEndpoint("atom:file:src/test/data/feed.atom?splitEntries=false", AtomEndpoint.class);
assertEquals("file:src/test/data/feed.atom", endpoint.getFeedUri());
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:file:src/test/data/feed.atom?splitEntries=false").to("mock:result");
// this is a bit weird syntax that normally is not used using the feedUri parameter
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java
index 9edbe71..ec59dd4 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java
@@ -17,16 +17,16 @@
package org.apache.camel.component.atom;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class AtomPollingConsumerWithBasicAuthTest extends AtomPollingConsumerTest {
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=false&username=camel&password=camelPass")
.to("mock:result");
@@ -37,13 +37,13 @@ public class AtomPollingConsumerWithBasicAuthTest extends AtomPollingConsumerTes
};
}
- @BeforeClass
- public static void startServer() {
+ @BeforeAll
+ static void startServer() {
JettyTestServer.getInstance().startServer();
}
- @AfterClass
- public static void stopServer() {
+ @AfterAll
+ static void stopServer() {
JettyTestServer.getInstance().stopServer();
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
index 960a7f7..9579ea0 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.atom;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for fast polling using a low delay
@@ -27,7 +27,7 @@ import org.junit.Test;
public class AtomPollingLowDelayTest extends CamelTestSupport {
@Test
- public void testLowDelay() throws Exception {
+ void testLowDelay() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(7);
mock.setResultWaitTime(3000L);
@@ -35,9 +35,9 @@ public class AtomPollingLowDelayTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:file:src/test/data/feed.atom?splitEntries=true&delay=100&initialDelay=0").to("mock:result");
}
};
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
index 1996603..4d509b7 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.atom;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class AtomPollingUnthrottledTest extends CamelTestSupport {
@Test
- public void testLowDelay() throws Exception {
+ void testLowDelay() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(7);
mock.setResultWaitTime(3000L);
@@ -33,9 +33,9 @@ public class AtomPollingUnthrottledTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:file:src/test/data/feed.atom?splitEntries=true&throttleEntries=false&initialDelay=0").to("mock:result");
}
};
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
index f1c4d33..1f0d659 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.atom;
-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 static org.junit.jupiter.api.Assertions.fail;
/**
* Unit test for AtomProducer.
@@ -25,7 +27,7 @@ import org.junit.Test;
public class AtomProducerTest extends CamelTestSupport {
@Test
- public void testNotYetImplemented() throws Exception {
+ void testNotYetImplemented() throws Exception {
try {
context.getEndpoint("atom:file://target/out.atom").createProducer();
fail("Should have thrown an UnsupportedOperationException");
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
index 3cd5d3f..d7b7380 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
@@ -22,16 +22,19 @@ import org.apache.abdera.model.Entry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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 AtomRouteTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(AtomRouteTest.class);
@Test
- public void testFeedGetsUpdatedEvents() throws Exception {
+ void testFeedGetsUpdatedEvents() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount(7);
@@ -48,11 +51,11 @@ public class AtomRouteTest extends CamelTestSupport {
int counter = 0;
for (Exchange exchange : list) {
Entry entry = exchange.getIn().getBody(Entry.class);
- assertNotNull("No entry found for exchange: " + exchange);
+ assertNotNull(entry, "No entry found for exchange: " + exchange);
String expectedTitle = expectedTitles[counter];
String title = entry.getTitle();
- assertEquals("Title of message " + counter, expectedTitle, title);
+ assertEquals(expectedTitle, title, "Title of message " + counter);
LOG.debug("<<<< {}", entry);
@@ -61,9 +64,9 @@ public class AtomRouteTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("atom:file:src/test/data/feed.atom?delay=500").to("mock:results");
}
};
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java
index 810b5ab..920fe93 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java
@@ -41,7 +41,7 @@ import org.eclipse.jetty.util.security.Credential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
public final class JettyTestServer {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
index cd53496..7e86ae9 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
@@ -24,16 +24,18 @@ import org.apache.abdera.model.Document;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.camel.component.feed.EntryFilter;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Unit test for UpdatedDateFilter
*/
-public class UpdatedDateFilterTest extends Assert {
+public class UpdatedDateFilterTest {
@Test
- public void testFilter() throws Exception {
+ void testFilter() throws Exception {
Document<Feed> doc = AtomUtils.parseDocument("file:src/test/data/feed.atom");
assertNotNull(doc);
@@ -51,9 +53,9 @@ public class UpdatedDateFilterTest extends Assert {
boolean valid = filter.isValidEntry(null, doc, entry);
// only the 3 last should be true
if (i > 3) {
- assertEquals("not valid", false, valid);
+ assertEquals(false, valid, "not valid");
} else {
- assertEquals("valid", true, valid);
+ assertEquals(true, valid, "valid");
}
}
}