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/07/06 08:25:43 UTC
[camel] branch master updated: CAMEL-11807: Migrated
camel-itest-standalone/route-parser to JUnit 5
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
The following commit(s) were added to refs/heads/master by this push:
new 24e7866 CAMEL-11807: Migrated camel-itest-standalone/route-parser to JUnit 5
24e7866 is described below
commit 24e7866263cd18104a8027e57bae99933095d979
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Jul 6 09:34:29 2020 +0200
CAMEL-11807: Migrated camel-itest-standalone/route-parser to JUnit 5
---
catalog/camel-route-parser/pom.xml | 13 +++--
.../camel/parser/java/MyCdiConcatRouteBuilder.java | 2 +-
.../camel/parser/java/MyCdiRouteBuilder.java | 2 +-
.../camel/parser/java/MyChoiceRouteBuilder.java | 2 +-
.../parser/java/MyConcatFieldRouteBuilder.java | 2 +-
.../parser/java/MyFieldMethodCallRouteBuilder.java | 2 +-
.../camel/parser/java/MyFieldRouteBuilder.java | 2 +-
.../camel/parser/java/MyJavaDslRouteBuilder.java | 2 +-
.../parser/java/MyLocalAddRouteBuilderTest.java | 12 +++--
.../parser/java/MyMethodCallRouteBuilder.java | 2 +-
.../org/apache/camel/parser/java/MyNettyTest.java | 14 +++---
.../parser/java/MyNewLineConstRouteBuilder.java | 2 +-
.../camel/parser/java/MyNewLineRouteBuilder.java | 2 +-
.../camel/parser/java/MyRestDslRouteBuilder.java | 2 +-
.../apache/camel/parser/java/MyRouteBuilder.java | 2 +-
.../camel/parser/java/MyRouteDuplicateIdTest.java | 10 ++--
.../camel/parser/java/MyRouteEmptyUriTest.java | 14 +++---
.../org/apache/camel/parser/java/MyRouteTest.java | 10 ++--
.../camel/parser/java/MySedaRouteBuilder.java | 2 +-
.../camel/parser/java/MySimpleRouteBuilder.java | 2 +-
.../apache/camel/parser/java/MySimpleToDRoute.java | 2 +-
.../apache/camel/parser/java/MySimpleToFRoute.java | 2 +-
.../RoasterCdiConcatRouteBuilderConfigureTest.java | 13 ++---
.../java/RoasterCdiRouteBuilderConfigureTest.java | 13 ++---
.../RoasterChoiceRouteBuilderConfigureTest.java | 9 ++--
...oasterConcatFieldRouteBuilderConfigureTest.java | 11 +++--
.../parser/java/RoasterEndpointInjectTest.java | 55 +++++++++++-----------
.../RoasterFieldRouteBuilderConfigureTest.java | 13 ++---
.../camel/parser/java/RoasterJavaDslTest.java | 11 +++--
.../parser/java/RoasterJavaDslTwoRoutesTest.java | 11 +++--
.../camel/parser/java/RoasterJavaRestDslTest.java | 11 +++--
...RoasterMethodCallRouteBuilderConfigureTest.java | 13 ++---
...MyFieldMethodCallRouteBuilderConfigureTest.java | 17 +++----
.../java/RoasterMyLocalAddRouteBuilderTest.java | 12 +++--
.../camel/parser/java/RoasterMyNettyTest.java | 17 +++----
.../parser/java/RoasterMySedaRouteBuilderTest.java | 27 ++++++-----
...asterNewLineConstRouteBuilderConfigureTest.java | 13 ++---
.../RoasterNewLineRouteBuilderConfigureTest.java | 13 ++---
.../RoasterRouteBuilderCamelTestSupportTest.java | 11 +++--
.../java/RoasterRouteBuilderConfigureTest.java | 15 +++---
.../java/RoasterRouteBuilderEmptyUriTest.java | 14 +++---
...uteDuplicateIdBuilderDCamelTestSupportTest.java | 17 +++----
.../parser/java/RoasterSimpleProcessorTest.java | 15 +++---
.../RoasterSimpleRouteBuilderConfigureTest.java | 19 ++++----
.../camel/parser/java/RoasterSimpleToDTest.java | 33 ++++++-------
.../camel/parser/java/RoasterSimpleToFTest.java | 21 +++++----
.../parser/java/RoasterSplitTokenizeTest.java | 37 ++++++++-------
.../camel/parser/java/SimpleProcessorTest.java | 14 +++---
.../camel/parser/java/SplitTokenizeTest.java | 22 ++++-----
.../camel/parser/java/TwoRoutesRouteBuilder.java | 2 +-
.../camel/parser/java/XmlLineNumberParserTest.java | 6 +--
.../camel/parser/xml/DuplicateRouteIdsTest.java | 15 +++---
.../camel/parser/xml/FindElementInRoutesTest.java | 8 ++--
.../camel/parser/xml/XmlFilterRouteTest.java | 17 ++++---
.../camel/parser/xml/XmlOnExceptionRouteTest.java | 17 +++----
.../apache/camel/parser/xml/XmlParseTreeTest.java | 8 ++--
.../apache/camel/parser/xml/XmlRestDslTest.java | 10 ++--
.../org/apache/camel/parser/xml/XmlRouteTest.java | 17 +++----
tests/camel-itest-standalone/pom.xml | 9 +++-
.../standalone/CamelContextStandaloneTest.java | 38 +++++++--------
60 files changed, 394 insertions(+), 335 deletions(-)
diff --git a/catalog/camel-route-parser/pom.xml b/catalog/camel-route-parser/pom.xml
index 8c07e13..9b81601 100644
--- a/catalog/camel-route-parser/pom.xml
+++ b/catalog/camel-route-parser/pom.xml
@@ -88,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -96,12 +96,19 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-cdi</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <!-- Make MyCdi*RouteBuilder compile while cutting the useless dependency to JUnit 4 -->
+ <exclusion>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
index 7e50225..8d43ac9 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
@@ -40,7 +40,7 @@ public class MyCdiConcatRouteBuilder extends RouteBuilder {
private Endpoint mynetty;
@Override
- public void configure() throws Exception {
+ public void configure() {
from(inputEndpoint)
.log("I was here")
.to(loga)
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
index bb033e1..1dec0ac 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
@@ -37,7 +37,7 @@ public class MyCdiRouteBuilder extends RouteBuilder {
private Endpoint mynetty;
@Override
- public void configure() throws Exception {
+ public void configure() {
from(inputEndpoint)
.log("I was here")
.to(loga)
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyChoiceRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyChoiceRouteBuilder.java
index 8435c46..9461974 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyChoiceRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyChoiceRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MyChoiceRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:foo")
.choice()
.when(header("foo"))
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyConcatFieldRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyConcatFieldRouteBuilder.java
index bca0e92..3a79ed2 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyConcatFieldRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyConcatFieldRouteBuilder.java
@@ -24,7 +24,7 @@ public class MyConcatFieldRouteBuilder extends RouteBuilder {
private String ftp = "ftp:localhost:" + ftpPort + "/myapp?password=admin&username=admin";
@Override
- public void configure() throws Exception {
+ public void configure() {
from(ftp)
.to("log:b");
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldMethodCallRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldMethodCallRouteBuilder.java
index 1c43696..738ae0d 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldMethodCallRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldMethodCallRouteBuilder.java
@@ -19,7 +19,7 @@ package org.apache.camel.parser.java;
public class MyFieldMethodCallRouteBuilder extends MyBasePortRouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
int port2 = getNextPort();
from("netty-http:http://0.0.0.0:{{port}}/foo")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldRouteBuilder.java
index 42dc6c0..cba4d61 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyFieldRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MyFieldRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
String exists = "Override";
from("timer:foo")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java
index 08b7e09..57104a8 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MyJavaDslRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
// setProperty is also a model name but this should not be parsed as part of a Camel route
System.setProperty("ENV", "src/test/resources/");
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
index 8824cec..b6dacd3 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java
@@ -17,11 +17,15 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-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;
public class MyLocalAddRouteBuilderTest extends CamelTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(MyLocalAddRouteBuilderTest.class);
+
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -29,11 +33,11 @@ public class MyLocalAddRouteBuilderTest extends CamelTestSupport {
@Test
public void testFoo() throws Exception {
- log.info("Adding a route locally");
+ LOG.info("Adding a route locally");
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start")
.to("mock:foo");
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyMethodCallRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyMethodCallRouteBuilder.java
index 2840c16..97f4400 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyMethodCallRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyMethodCallRouteBuilder.java
@@ -25,7 +25,7 @@ public class MyMethodCallRouteBuilder extends RouteBuilder {
}
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:foo")
.to("file:output?fileExist=" + whatToDoWhenExists())
.to("log:b");
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java
index 535a4da..4f1f9ce 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNettyTest.java
@@ -17,11 +17,11 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-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 // on purpose to ignore
+@Disabled // on purpose to ignore
public class MyNettyTest extends CamelTestSupport {
public int getNextPort() {
@@ -29,17 +29,17 @@ public class MyNettyTest extends CamelTestSupport {
}
@Test
- public void testFoo() throws Exception {
+ void testFoo() {
// noop
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
int port2 = getNextPort();
@Override
- public void configure() throws Exception {
+ public void configure() {
from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input1")
.to("netty-http:http://0.0.0.0:" + port2 + "/bar");
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineConstRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineConstRouteBuilder.java
index 3729aec..c36fb87 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineConstRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineConstRouteBuilder.java
@@ -24,7 +24,7 @@ public class MyNewLineConstRouteBuilder extends RouteBuilder {
private static final int MOD = 770;
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:foo")
.toD("file:output?fileExist=" + EXISTS
+ "&chmod=" + (MOD + 6 + 1)
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineRouteBuilder.java
index e20a91e..c028719 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyNewLineRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MyNewLineRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:foo")
.toD("file:output?fileExist=Append"
+ "&chmod=777"
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java
index 5f8c34b..604b98c 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java
@@ -23,7 +23,7 @@ import org.apache.camel.model.rest.RestHostNameResolver;
public class MyRestDslRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
restConfiguration()
.contextPath("myapi").port(1234)
.component("jetty")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteBuilder.java
index c8ccd8f..9ae039f 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MyRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:foo")
.log("I was here")
.toD("log:a")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
index 0b95fd8..c45d5ab 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-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 MyRouteDuplicateIdTest extends CamelTestSupport {
@@ -28,15 +28,15 @@ public class MyRouteDuplicateIdTest extends CamelTestSupport {
}
@Test
- public void testFoo() throws Exception {
+ void testFoo() throws Exception {
// noop
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:foo").routeId("foo")
.to("mock:foo");
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java
index 9b4a116..e94876c 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java
@@ -17,23 +17,23 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-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 // on purpose to ignore
+@Disabled // on purpose to ignore
public class MyRouteEmptyUriTest extends CamelTestSupport {
@Test
- public void testFoo() throws Exception {
+ void testFoo() {
// noop
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:foo")
.to(""); // is empty on purpose
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java
index de8f612..f2fc460 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteTest.java
@@ -17,21 +17,21 @@
package org.apache.camel.parser.java;
import org.apache.camel.builder.RouteBuilder;
-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 MyRouteTest extends CamelTestSupport {
@Test
- public void testFoo() throws Exception {
+ void testFoo() {
// noop
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:foo")
.to("mock:foo");
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java
index e434751..df4b025 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MySedaRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:hello?period={{timer.period}}").routeId("hello").routeGroup("hello-group")
.transform().method("myBean", "saySomething")
.filter(simple("${body} contains 'foo'"))
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleRouteBuilder.java
index b6494c0..0de9d2a 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MySimpleRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:foo")
.filter(simple("${body} > 100"))
.toD("log:a")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToDRoute.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToDRoute.java
index fb949b8..d60c197 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToDRoute.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToDRoute.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MySimpleToDRoute extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
String uri = "log:c";
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToFRoute.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToFRoute.java
index 03b3076..fc57a43 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToFRoute.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MySimpleToFRoute.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MySimpleToFRoute extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start")
.toF("log:a?level=%s", "info");
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java
index 424e3f5..6731a6a 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterCdiConcatRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterCdiConcatRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,14 +43,14 @@ public class RoasterCdiConcatRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo?period=4999", list.get(0).getElement());
+ assertEquals("timer:foo?period=4999", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("log:a", list.get(0).getElement());
- Assert.assertEquals("netty-http:http:someserver:80/hello", list.get(1).getElement());
+ assertEquals("log:a", list.get(0).getElement());
+ assertEquals("netty-http:http:someserver:80/hello", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java
index b47a43f..2b74fb2 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterCdiRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterCdiRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,14 +43,14 @@ public class RoasterCdiRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo?period=4999", list.get(0).getElement());
+ assertEquals("timer:foo?period=4999", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("log:a", list.get(0).getElement());
- Assert.assertEquals("netty-http:http:someserver:80/hello", list.get(1).getElement());
+ assertEquals("log:a", list.get(0).getElement());
+ assertEquals("netty-http:http:someserver:80/hello", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterChoiceRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterChoiceRouteBuilderConfigureTest.java
index b93f4e1..c77a3f7 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterChoiceRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterChoiceRouteBuilderConfigureTest.java
@@ -24,18 +24,19 @@ import org.apache.camel.parser.model.CamelNodeDetails;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RoasterChoiceRouteBuilderConfigureTest {
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyChoiceRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
List<CamelNodeDetails> list = new CamelJavaTreeParserHelper().parseCamelRouteTree(clazz, ".", "src/test/java/org/apache/camel/parser/java/MyChoiceRouteBuilder.java", method);
- Assert.assertNotNull(list);
+ assertNotNull(list);
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java
index ddf99d6..b14d98f 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterConcatFieldRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterConcatFieldRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyConcatFieldRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,13 +43,13 @@ public class RoasterConcatFieldRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("ftp:localhost:{{ftpPort}}/myapp?password=admin&username=admin", list.get(0).getElement());
+ assertEquals("ftp:localhost:{{ftpPort}}/myapp?password=admin&username=admin", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("log:b", list.get(0).getElement());
+ assertEquals("log:b", list.get(0).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
index 0e06268..148837d 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
@@ -27,17 +27,18 @@ import org.apache.camel.parser.model.CamelEndpointDetails;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterEndpointInjectTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterEndpointInjectTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -45,45 +46,45 @@ public class RoasterEndpointInjectTest {
RouteBuilderParser.parseRouteBuilderEndpoints(clazz, ".", "src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java", details);
LOG.info("{}", details);
- Assert.assertEquals("timer:foo?period=4999", details.get(0).getEndpointUri());
- Assert.assertEquals("28", details.get(0).getLineNumber());
- Assert.assertEquals("28", details.get(0).getLineNumberEnd());
- Assert.assertEquals(1061, details.get(0).getAbsolutePosition());
- Assert.assertEquals(10, details.get(0).getLinePosition());
+ assertEquals("timer:foo?period=4999", details.get(0).getEndpointUri());
+ assertEquals("28", details.get(0).getLineNumber());
+ assertEquals("28", details.get(0).getLineNumberEnd());
+ assertEquals(1061, details.get(0).getAbsolutePosition());
+ assertEquals(10, details.get(0).getLinePosition());
- Assert.assertEquals("log:a", details.get(1).getEndpointUri());
- Assert.assertEquals("32", details.get(1).getLineNumber());
- Assert.assertEquals("32", details.get(1).getLineNumberEnd());
- Assert.assertEquals(1144, details.get(1).getAbsolutePosition());
- Assert.assertEquals(10, details.get(1).getLinePosition());
+ assertEquals("log:a", details.get(1).getEndpointUri());
+ assertEquals("32", details.get(1).getLineNumber());
+ assertEquals("32", details.get(1).getLineNumberEnd());
+ assertEquals(1144, details.get(1).getAbsolutePosition());
+ assertEquals(10, details.get(1).getLinePosition());
- Assert.assertEquals("netty-http:http:someserver:80/hello", details.get(2).getEndpointUri());
- Assert.assertEquals("36", details.get(2).getLineNumber());
- Assert.assertEquals("36", details.get(2).getLineNumberEnd());
- Assert.assertEquals(1202, details.get(2).getAbsolutePosition());
- Assert.assertEquals(10, details.get(2).getLinePosition());
+ assertEquals("netty-http:http:someserver:80/hello", details.get(2).getEndpointUri());
+ assertEquals("36", details.get(2).getLineNumber());
+ assertEquals("36", details.get(2).getLineNumberEnd());
+ assertEquals(1202, details.get(2).getAbsolutePosition());
+ assertEquals(10, details.get(2).getLinePosition());
// spans 2 lines
- Assert.assertEquals("mock:foo?retainFirst=1", details.get(6).getEndpointUri());
- Assert.assertEquals("45", details.get(6).getLineNumber());
- Assert.assertEquals("46", details.get(6).getLineNumberEnd());
- Assert.assertEquals(1455, details.get(6).getAbsolutePosition());
- Assert.assertEquals(17, details.get(6).getLinePosition());
+ assertEquals("mock:foo?retainFirst=1", details.get(6).getEndpointUri());
+ assertEquals("45", details.get(6).getLineNumber());
+ assertEquals("46", details.get(6).getLineNumberEnd());
+ assertEquals(1438, details.get(6).getAbsolutePosition());
+ assertEquals(17, details.get(6).getLinePosition());
List<ParserResult> list = CamelJavaParserHelper.parseCamelConsumerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo?period=4999", list.get(0).getElement());
+ assertEquals("timer:foo?period=4999", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals(3, list.size());
+ assertEquals(3, list.size());
- Assert.assertEquals(7, details.size());
- Assert.assertEquals("log:a", details.get(4).getEndpointUri());
+ assertEquals(7, details.size());
+ assertEquals("log:a", details.get(4).getEndpointUri());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java
index 73631f5..be47fa1 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterFieldRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterFieldRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyFieldRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,14 +43,14 @@ public class RoasterFieldRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo", list.get(0).getElement());
+ assertEquals("timer:foo", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("file:output?fileExist=Override", list.get(0).getElement());
- Assert.assertEquals("log:b", list.get(1).getElement());
+ assertEquals("file:output?fileExist=Override", list.get(0).getElement());
+ assertEquals("log:b", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
index cbf084d..ce62c6d 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
@@ -21,13 +21,16 @@ import java.util.List;
import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelNodeDetails;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
-import org.junit.Test;
+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.assertTrue;
+
public class RoasterJavaDslTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(RoasterJavaDslTest.class);
@@ -38,7 +41,7 @@ public class RoasterJavaDslTest extends CamelTestSupport {
}
@Test
- public void parseTree() throws Exception {
+ void parseTree() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java"));
List<CamelNodeDetails> list = RouteBuilderParser.parseRouteBuilderTree(clazz, ".",
@@ -67,7 +70,7 @@ public class RoasterJavaDslTest extends CamelTestSupport {
}
@Test
- public void testRouteCoverage() throws Exception {
+ void testRouteCoverage() throws Exception {
context.addRoutes(new MyJavaDslRouteBuilder());
getMockEndpoint("mock:result").expectedMessageCount(1);
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
index 3702a1a..cf9e989 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
@@ -21,13 +21,16 @@ import java.util.List;
import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelNodeDetails;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
-import org.junit.Test;
+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.assertTrue;
+
public class RoasterJavaDslTwoRoutesTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(RoasterJavaDslTwoRoutesTest.class);
@@ -38,7 +41,7 @@ public class RoasterJavaDslTwoRoutesTest extends CamelTestSupport {
}
@Test
- public void parseTree() throws Exception {
+ void parseTree() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java"));
List<CamelNodeDetails> list = RouteBuilderParser.parseRouteBuilderTree(clazz, ".",
@@ -73,7 +76,7 @@ public class RoasterJavaDslTwoRoutesTest extends CamelTestSupport {
}
@Test
- public void testRouteCoverage() throws Exception {
+ void testRouteCoverage() throws Exception {
context.addRoutes(new TwoRoutesRouteBuilder());
getMockEndpoint("mock:foo").expectedMessageCount(1);
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
index 8000030..a5bcd94 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
@@ -22,10 +22,13 @@ import java.util.List;
import org.apache.camel.parser.RestDslParser;
import org.apache.camel.parser.model.RestConfigurationDetails;
import org.apache.camel.parser.model.RestServiceDetails;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
-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.assertNull;
public class RoasterJavaRestDslTest extends CamelTestSupport {
@@ -35,7 +38,7 @@ public class RoasterJavaRestDslTest extends CamelTestSupport {
}
@Test
- public void parseRestConfiguration() throws Exception {
+ void parseRestConfiguration() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java"));
List<RestConfigurationDetails> list = RestDslParser.parseRestConfiguration(clazz, ".",
@@ -70,7 +73,7 @@ public class RoasterJavaRestDslTest extends CamelTestSupport {
}
@Test
- public void parseRestService() throws Exception {
+ void parseRestService() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java"));
List<RestServiceDetails> list = RestDslParser.parseRestService(clazz, ".",
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java
index fc0523f..064427d 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterMethodCallRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterMethodCallRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyMethodCallRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,14 +43,14 @@ public class RoasterMethodCallRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo", list.get(0).getElement());
+ assertEquals("timer:foo", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("file:output?fileExist={{whatToDoWhenExists}}", list.get(0).getElement());
- Assert.assertEquals("log:b", list.get(1).getElement());
+ assertEquals("file:output?fileExist={{whatToDoWhenExists}}", list.get(0).getElement());
+ assertEquals("log:b", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java
index 1ba7aa9..4cb8df4 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterMyFieldMethodCallRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterMyFieldMethodCallRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyFieldMethodCallRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,16 +43,16 @@ public class RoasterMyFieldMethodCallRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("netty-http:http://0.0.0.0:{{port}}/foo", list.get(0).getElement());
- Assert.assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
+ assertEquals("netty-http:http://0.0.0.0:{{port}}/foo", list.get(0).getElement());
+ assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("mock:input1", list.get(0).getElement());
- Assert.assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
- Assert.assertEquals("mock:input2", list.get(2).getElement());
+ assertEquals("mock:input1", list.get(0).getElement());
+ assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
+ assertEquals("mock:input2", list.get(2).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java
index ca2f4e3..eb2816b 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java
@@ -24,23 +24,25 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+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.assertNull;
+
public class RoasterMyLocalAddRouteBuilderTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterMyLocalAddRouteBuilderTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
- Assert.assertNull(method);
+ assertNull(method);
List<MethodSource<JavaClassSource>> methods = CamelJavaParserHelper.findInlinedConfigureMethods(clazz);
- Assert.assertEquals(1, methods.size());
+ assertEquals(1, methods.size());
method = methods.get(0);
List<ParserResult> list = CamelJavaParserHelper.parseCamelConsumerUris(method, true, true);
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java
index 90ec3b7..2430d78 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterMyNettyTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterMyNettyTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyNettyTest.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -42,16 +43,16 @@ public class RoasterMyNettyTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("netty-http:http://0.0.0.0:{{port}}/foo", list.get(0).getElement());
- Assert.assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
+ assertEquals("netty-http:http://0.0.0.0:{{port}}/foo", list.get(0).getElement());
+ assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("mock:input1", list.get(0).getElement());
- Assert.assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
- Assert.assertEquals("mock:input2", list.get(2).getElement());
+ assertEquals("mock:input1", list.get(0).getElement());
+ assertEquals("netty-http:http://0.0.0.0:{{getNextPort}}/bar", list.get(1).getElement());
+ assertEquals("mock:input2", list.get(2).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
index c5d50c3..46045c9 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
@@ -24,32 +24,35 @@ import org.apache.camel.parser.RouteBuilderParser;
import org.apache.camel.parser.model.CamelEndpointDetails;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
-import org.junit.Assert;
-import org.junit.Test;
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class RoasterMySedaRouteBuilderTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterMySedaRouteBuilderTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java"));
List<CamelEndpointDetails> details = new ArrayList<>();
RouteBuilderParser.parseRouteBuilderEndpoints(clazz, ".", "src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java", details);
LOG.info("{}", details);
- Assert.assertEquals(7, details.size());
- Assert.assertEquals("32", details.get(1).getLineNumber());
- Assert.assertEquals("seda:foo", details.get(1).getEndpointUri());
- Assert.assertTrue(details.get(1).isConsumerOnly());
- Assert.assertFalse(details.get(1).isProducerOnly());
- Assert.assertEquals("35", details.get(2).getLineNumber());
- Assert.assertEquals("seda:bar", details.get(2).getEndpointUri());
- Assert.assertTrue(details.get(2).isConsumerOnly());
- Assert.assertFalse(details.get(2).isProducerOnly());
+ assertEquals(7, details.size());
+ assertEquals("32", details.get(1).getLineNumber());
+ assertEquals("seda:foo", details.get(1).getEndpointUri());
+ assertTrue(details.get(1).isConsumerOnly());
+ assertFalse(details.get(1).isProducerOnly());
+ assertEquals("35", details.get(2).getLineNumber());
+ assertEquals("seda:bar", details.get(2).getEndpointUri());
+ assertTrue(details.get(2).isConsumerOnly());
+ assertFalse(details.get(2).isProducerOnly());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java
index 35f9568..d919e89 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterNewLineConstRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterNewLineConstRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyNewLineConstRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,14 +43,14 @@ public class RoasterNewLineConstRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo", list.get(0).getElement());
+ assertEquals("timer:foo", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, false);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("file:output?fileExist=Append&chmod=777&allowNullBody=true", list.get(0).getElement());
- Assert.assertEquals("log:b", list.get(1).getElement());
+ assertEquals("file:output?fileExist=Append&chmod=777&allowNullBody=true", list.get(0).getElement());
+ assertEquals("log:b", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java
index 0c841a7..b83712d 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterNewLineRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterNewLineRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyNewLineRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,14 +43,14 @@ public class RoasterNewLineRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo", list.get(0).getElement());
+ assertEquals("timer:foo", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, false);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("file:output?fileExist=Append&chmod=777&allowNullBody=true", list.get(0).getElement());
- Assert.assertEquals("log:b", list.get(1).getElement());
+ assertEquals("file:output?fileExist=Append&chmod=777&allowNullBody=true", list.get(0).getElement());
+ assertEquals("log:b", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java
index 785e7a7..78c5677 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterRouteBuilderCamelTestSupportTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterRouteBuilderCamelTestSupportTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyRouteTest.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -42,13 +43,13 @@ public class RoasterRouteBuilderCamelTestSupportTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("direct:foo", list.get(0).getElement());
+ assertEquals("direct:foo", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, false);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("mock:foo", list.get(0).getElement());
+ assertEquals("mock:foo", list.get(0).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java
index b1760d2..8cc6dfa 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -42,15 +43,15 @@ public class RoasterRouteBuilderConfigureTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("timer:foo", list.get(0).getElement());
+ assertEquals("timer:foo", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, false);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("log:a", list.get(0).getElement());
- Assert.assertEquals("mock:tap", list.get(1).getElement());
- Assert.assertEquals("log:b", list.get(2).getElement());
+ assertEquals("log:a", list.get(0).getElement());
+ assertEquals("mock:tap", list.get(1).getElement());
+ assertEquals("log:b", list.get(2).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java
index 27c096e..15db695 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java
@@ -24,17 +24,19 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+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.assertFalse;
+
public class RoasterRouteBuilderEmptyUriTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterRouteBuilderEmptyUriTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -42,13 +44,13 @@ public class RoasterRouteBuilderEmptyUriTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("direct:foo", list.get(0).getElement());
+ assertEquals("direct:foo", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, false);
- Assert.assertEquals(1, list.size());
+ assertEquals(1, list.size());
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
- Assert.assertFalse("Should be invalid", result.isParsed());
+ assertFalse(result.isParsed(), "Should be invalid");
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java
index a81199b..a8f3524 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java
@@ -24,17 +24,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterRouteDuplicateIdBuilderDCamelTestSupportTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -42,16 +43,16 @@ public class RoasterRouteDuplicateIdBuilderDCamelTestSupportTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals(3, list.size());
+ assertEquals(3, list.size());
list = CamelJavaParserHelper.parseCamelRouteIds(method);
for (ParserResult result : list) {
LOG.info("Route id: " + result.getElement());
}
- Assert.assertEquals(3, list.size());
- Assert.assertEquals("foo", list.get(0).getElement());
- Assert.assertEquals("bar", list.get(1).getElement());
- Assert.assertEquals("foo", list.get(2).getElement());
+ assertEquals(3, list.size());
+ assertEquals("foo", list.get(0).getElement());
+ assertEquals("bar", list.get(1).getElement());
+ assertEquals("foo", list.get(2).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java
index 280d10d..97612e9 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java
@@ -27,17 +27,18 @@ import org.apache.camel.parser.model.CamelEndpointDetails;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterSimpleProcessorTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterSimpleProcessorTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -49,16 +50,16 @@ public class RoasterSimpleProcessorTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("direct:start", list.get(0).getElement());
+ assertEquals("direct:start", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals(0, list.size());
+ assertEquals(0, list.size());
- Assert.assertEquals(1, details.size());
- Assert.assertEquals("direct:start", details.get(0).getEndpointUri());
+ assertEquals(1, details.size());
+ assertEquals("direct:start", details.get(0).getEndpointUri());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleRouteBuilderConfigureTest.java
index ca40ab0..2c1b831 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleRouteBuilderConfigureTest.java
@@ -26,17 +26,18 @@ import org.apache.camel.parser.helper.CamelJavaParserHelper;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterSimpleRouteBuilderConfigureTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterSimpleRouteBuilderConfigureTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MySimpleRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
@@ -45,12 +46,12 @@ public class RoasterSimpleRouteBuilderConfigureTest {
LOG.info("Simple: " + simple.getElement());
LOG.info(" Line: " + findLineNumber(simple.getPosition()));
}
- Assert.assertEquals("${body} > 100", list.get(0).getElement());
- Assert.assertEquals(true, list.get(0).getPredicate());
- Assert.assertEquals(27, findLineNumber(list.get(0).getPosition()));
- Assert.assertEquals("${body} > 200", list.get(1).getElement());
- Assert.assertEquals(true, list.get(1).getPredicate());
- Assert.assertEquals(30, findLineNumber(list.get(1).getPosition()));
+ assertEquals("${body} > 100", list.get(0).getElement());
+ assertEquals(true, list.get(0).getPredicate());
+ assertEquals(27, findLineNumber(list.get(0).getPosition()));
+ assertEquals("${body} > 200", list.get(1).getElement());
+ assertEquals(true, list.get(1).getPredicate());
+ assertEquals(30, findLineNumber(list.get(1).getPosition()));
}
public static int findLineNumber(int pos) throws Exception {
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java
index 7de9ccf..163c1f1 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java
@@ -27,17 +27,18 @@ import org.apache.camel.parser.model.CamelEndpointDetails;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterSimpleToDTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterSimpleToDTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MySimpleToDRoute.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -49,25 +50,25 @@ public class RoasterSimpleToDTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("direct:start", list.get(0).getElement());
+ assertEquals("direct:start", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("toD", list.get(0).getNode());
- Assert.assertEquals("log:a", list.get(0).getElement());
- Assert.assertEquals("to", list.get(1).getNode());
- Assert.assertEquals("log:b", list.get(1).getElement());
- Assert.assertEquals("to", list.get(2).getNode());
- Assert.assertEquals("log:c", list.get(2).getElement());
- Assert.assertEquals(3, list.size());
+ assertEquals("toD", list.get(0).getNode());
+ assertEquals("log:a", list.get(0).getElement());
+ assertEquals("to", list.get(1).getNode());
+ assertEquals("log:b", list.get(1).getElement());
+ assertEquals("to", list.get(2).getNode());
+ assertEquals("log:c", list.get(2).getElement());
+ assertEquals(3, list.size());
- Assert.assertEquals(4, details.size());
- Assert.assertEquals("direct:start", details.get(0).getEndpointUri());
- Assert.assertEquals("log:a", details.get(1).getEndpointUri());
- Assert.assertEquals("log:b", details.get(2).getEndpointUri());
- Assert.assertEquals("log:c", details.get(3).getEndpointUri());
+ assertEquals(4, details.size());
+ assertEquals("direct:start", details.get(0).getEndpointUri());
+ assertEquals("log:a", details.get(1).getEndpointUri());
+ assertEquals("log:b", details.get(2).getEndpointUri());
+ assertEquals("log:c", details.get(3).getEndpointUri());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java
index 18711db..42fb678 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java
@@ -27,17 +27,18 @@ import org.apache.camel.parser.model.CamelEndpointDetails;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterSimpleToFTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterSimpleToFTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MySimpleToFRoute.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -49,19 +50,19 @@ public class RoasterSimpleToFTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("direct:start", list.get(0).getElement());
+ assertEquals("direct:start", list.get(0).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("toF", list.get(0).getNode());
- Assert.assertEquals("log:a?level={{%s}}", list.get(0).getElement());
- Assert.assertEquals(1, list.size());
+ assertEquals("toF", list.get(0).getNode());
+ assertEquals("log:a?level={{%s}}", list.get(0).getElement());
+ assertEquals(1, list.size());
- Assert.assertEquals(2, details.size());
- Assert.assertEquals("direct:start", details.get(0).getEndpointUri());
- Assert.assertEquals("log:a?level={{%s}}", details.get(1).getEndpointUri());
+ assertEquals(2, details.size());
+ assertEquals("direct:start", details.get(0).getEndpointUri());
+ assertEquals("log:a?level={{%s}}", details.get(1).getEndpointUri());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java
index c995626..722f234 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java
@@ -27,17 +27,18 @@ import org.apache.camel.parser.model.CamelEndpointDetails;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RoasterSplitTokenizeTest {
private static final Logger LOG = LoggerFactory.getLogger(RoasterSplitTokenizeTest.class);
@Test
- public void parse() throws Exception {
+ void parse() throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java"));
MethodSource<JavaClassSource> method = CamelJavaParserHelper.findConfigureMethod(clazz);
@@ -49,27 +50,27 @@ public class RoasterSplitTokenizeTest {
for (ParserResult result : list) {
LOG.info("Consumer: " + result.getElement());
}
- Assert.assertEquals("direct:a", list.get(0).getElement());
- Assert.assertEquals("direct:b", list.get(1).getElement());
- Assert.assertEquals("direct:c", list.get(2).getElement());
- Assert.assertEquals("direct:d", list.get(3).getElement());
- Assert.assertEquals("direct:e", list.get(4).getElement());
- Assert.assertEquals("direct:f", list.get(5).getElement());
+ assertEquals("direct:a", list.get(0).getElement());
+ assertEquals("direct:b", list.get(1).getElement());
+ assertEquals("direct:c", list.get(2).getElement());
+ assertEquals("direct:d", list.get(3).getElement());
+ assertEquals("direct:e", list.get(4).getElement());
+ assertEquals("direct:f", list.get(5).getElement());
list = CamelJavaParserHelper.parseCamelProducerUris(method, true, true);
for (ParserResult result : list) {
LOG.info("Producer: " + result.getElement());
}
- Assert.assertEquals("mock:split", list.get(0).getElement());
- Assert.assertEquals("mock:split", list.get(1).getElement());
- Assert.assertEquals("mock:split", list.get(2).getElement());
- Assert.assertEquals("mock:split", list.get(3).getElement());
- Assert.assertEquals("mock:split", list.get(4).getElement());
- Assert.assertEquals("mock:split", list.get(5).getElement());
+ assertEquals("mock:split", list.get(0).getElement());
+ assertEquals("mock:split", list.get(1).getElement());
+ assertEquals("mock:split", list.get(2).getElement());
+ assertEquals("mock:split", list.get(3).getElement());
+ assertEquals("mock:split", list.get(4).getElement());
+ assertEquals("mock:split", list.get(5).getElement());
- Assert.assertEquals(12, details.size());
- Assert.assertEquals("direct:a", details.get(0).getEndpointUri());
- Assert.assertEquals("mock:split", details.get(11).getEndpointUri());
+ assertEquals(12, details.size());
+ assertEquals("direct:a", details.get(0).getEndpointUri());
+ assertEquals("mock:split", details.get(11).getEndpointUri());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
index 371273e..c488dd4 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
@@ -19,25 +19,27 @@ package org.apache.camel.parser.java;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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;
public class SimpleProcessorTest extends CamelTestSupport {
@Test
- public void testProcess() throws Exception {
+ void testProcess() {
String out = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", out);
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").routeId("myRoute").process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
}
});
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
index 1a2d312..2e0f7fb 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.parser.java;
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 SplitTokenizeTest extends CamelTestSupport {
@Test
- public void testSplitTokenizerA() throws Exception {
+ void testSplitTokenizerA() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceived("Claus", "James", "Willem");
@@ -34,7 +34,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
}
@Test
- public void testSplitTokenizerB() throws Exception {
+ void testSplitTokenizerB() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceived("Claus", "James", "Willem");
@@ -44,7 +44,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
}
@Test
- public void testSplitTokenizerC() throws Exception {
+ void testSplitTokenizerC() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceived("Claus", "James", "Willem");
@@ -54,7 +54,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
}
@Test
- public void testSplitTokenizerD() throws Exception {
+ void testSplitTokenizerD() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceived("[Claus]", "[James]", "[Willem]");
@@ -64,7 +64,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
}
@Test
- public void testSplitTokenizerE() throws Exception {
+ void testSplitTokenizerE() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceived("<person>Claus</person>", "<person>James</person>", "<person>Willem</person>");
@@ -75,7 +75,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
}
@Test
- public void testSplitTokenizerEWithSlash() throws Exception {
+ void testSplitTokenizerEWithSlash() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
String xml = "<persons><person attr='/' /></persons>";
mock.expectedBodiesReceived("<person attr='/' />");
@@ -85,7 +85,7 @@ public class SplitTokenizeTest extends CamelTestSupport {
}
@Test
- public void testSplitTokenizerF() throws Exception {
+ void testSplitTokenizerF() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceived("<person name=\"Claus\"/>", "<person>James</person>", "<person>Willem</person>");
@@ -96,10 +96,10 @@ public class SplitTokenizeTest extends CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:a")
.split().tokenize(",")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java
index f6187af..2e608ef 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class TwoRoutesRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:foo").routeId("foo")
.log("I was here")
.to("mock:foo");
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/XmlLineNumberParserTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/XmlLineNumberParserTest.java
index 8b385f8..3a19454 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/XmlLineNumberParserTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/XmlLineNumberParserTest.java
@@ -23,14 +23,14 @@ import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.apache.camel.parser.helper.XmlLineNumberParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class XmlLineNumberParserTest {
@Test
- public void testRespectNamespace() throws Exception {
+ void testRespectNamespace() throws Exception {
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/mycamel.xml");
Document parsedXml = XmlLineNumberParser.parseXml(is);
NodeList fromCamelWithNamespace = parsedXml.getElementsByTagNameNS("http://camel.apache.org/schema/spring", "from");
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/DuplicateRouteIdsTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/DuplicateRouteIdsTest.java
index 2dbe394..907bd1e 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/DuplicateRouteIdsTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/DuplicateRouteIdsTest.java
@@ -23,17 +23,18 @@ import java.util.List;
import org.apache.camel.parser.XmlRouteParser;
import org.apache.camel.parser.model.CamelRouteDetails;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class DuplicateRouteIdsTest {
private static final Logger LOG = LoggerFactory.getLogger(DuplicateRouteIdsTest.class);
@Test
- public void testXml() throws Exception {
+ void testXml() throws Exception {
List<CamelRouteDetails> list = new ArrayList<>();
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/myduplicateroutes.xml");
@@ -45,10 +46,10 @@ public class DuplicateRouteIdsTest {
LOG.info(detail.getRouteId());
}
- Assert.assertEquals(3, list.size());
- Assert.assertEquals("foo", list.get(0).getRouteId());
- Assert.assertEquals("bar", list.get(1).getRouteId());
- Assert.assertEquals("foo", list.get(2).getRouteId());
+ assertEquals(3, list.size());
+ assertEquals("foo", list.get(0).getRouteId());
+ assertEquals("bar", list.get(1).getRouteId());
+ assertEquals("foo", list.get(2).getRouteId());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/FindElementInRoutesTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/FindElementInRoutesTest.java
index f8c826a..92260a3 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/FindElementInRoutesTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/FindElementInRoutesTest.java
@@ -22,22 +22,22 @@ import java.io.InputStream;
import org.w3c.dom.Element;
import org.apache.camel.parser.helper.CamelXmlHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class FindElementInRoutesTest {
private static final Logger LOG = LoggerFactory.getLogger(FindElementInRoutesTest.class);
@Test
- public void testXml() throws Exception {
+ void testXml() throws Exception {
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/myroutes.xml");
String key = "_camelContext1/cbr-route/_from1";
Element element = CamelXmlHelper.getSelectedCamelElementNode(key, is);
- assertNotNull("Could not find Element for key " + key, element);
+ assertNotNull(element, "Could not find Element for key " + key);
LOG.info("Found element " + element.getTagName());
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlFilterRouteTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlFilterRouteTest.java
index c0c1644..d0f94b9 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlFilterRouteTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlFilterRouteTest.java
@@ -23,17 +23,20 @@ import java.util.List;
import org.apache.camel.parser.XmlRouteParser;
import org.apache.camel.parser.model.CamelSimpleExpressionDetails;
-import org.junit.Assert;
-import org.junit.Test;
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class XmlFilterRouteTest {
private static final Logger LOG = LoggerFactory.getLogger(XmlFilterRouteTest.class);
@Test
- public void testXml() throws Exception {
+ void testXml() throws Exception {
List<CamelSimpleExpressionDetails> list = new ArrayList<>();
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/myfiltercamel.xml");
@@ -45,10 +48,10 @@ public class XmlFilterRouteTest {
LOG.info(detail.getSimple());
}
- Assert.assertEquals(1, list.size());
- Assert.assertEquals("${body} == 'Camel'", list.get(0).getSimple());
- Assert.assertTrue(list.get(0).isPredicate());
- Assert.assertFalse(list.get(0).isExpression());
+ assertEquals(1, list.size());
+ assertEquals("${body} == 'Camel'", list.get(0).getSimple());
+ assertTrue(list.get(0).isPredicate());
+ assertFalse(list.get(0).isExpression());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlOnExceptionRouteTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlOnExceptionRouteTest.java
index e9623a2..7999c03 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlOnExceptionRouteTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlOnExceptionRouteTest.java
@@ -23,17 +23,18 @@ import java.util.List;
import org.apache.camel.parser.XmlRouteParser;
import org.apache.camel.parser.model.CamelEndpointDetails;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class XmlOnExceptionRouteTest {
private static final Logger LOG = LoggerFactory.getLogger(XmlOnExceptionRouteTest.class);
@Test
- public void testXml() throws Exception {
+ void testXml() throws Exception {
List<CamelEndpointDetails> endpoints = new ArrayList<>();
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/mycamel-onexception.xml");
@@ -45,11 +46,11 @@ public class XmlOnExceptionRouteTest {
LOG.info(detail.getEndpointUri());
}
- Assert.assertEquals("log:all", endpoints.get(0).getEndpointUri());
- Assert.assertEquals("mock:dead", endpoints.get(1).getEndpointUri());
- Assert.assertEquals("log:done", endpoints.get(2).getEndpointUri());
- Assert.assertEquals("stream:in?promptMessage=Enter something:", endpoints.get(3).getEndpointUri());
- Assert.assertEquals("stream:out", endpoints.get(4).getEndpointUri());
+ assertEquals("log:all", endpoints.get(0).getEndpointUri());
+ assertEquals("mock:dead", endpoints.get(1).getEndpointUri());
+ assertEquals("log:done", endpoints.get(2).getEndpointUri());
+ assertEquals("stream:in?promptMessage=Enter something:", endpoints.get(3).getEndpointUri());
+ assertEquals("stream:out", endpoints.get(4).getEndpointUri());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java
index 94d5078..904e4d1 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java
@@ -22,19 +22,19 @@ import java.util.List;
import org.apache.camel.parser.XmlRouteParser;
import org.apache.camel.parser.model.CamelNodeDetails;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class XmlParseTreeTest {
private static final Logger LOG = LoggerFactory.getLogger(XmlParseTreeTest.class);
@Test
- public void testXmlTree() throws Exception {
+ void testXmlTree() throws Exception {
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/mycamel.xml");
String fqn = "src/test/resources/org/apache/camel/camel/parser/xml/mycamel.xml";
String baseDir = "src/test/resources";
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java
index 926056e..854f012 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java
@@ -23,15 +23,15 @@ import java.util.List;
import org.apache.camel.parser.XmlRestDslParser;
import org.apache.camel.parser.model.RestConfigurationDetails;
import org.apache.camel.parser.model.RestServiceDetails;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class XmlRestDslTest {
@Test
- public void testXmlTree() throws Exception {
+ void testXmlTree() throws Exception {
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/myrest.xml");
String fqn = "src/test/resources/org/apache/camel/camel/parser/xml/myrest.xml";
String baseDir = "src/test/resources";
@@ -68,7 +68,7 @@ public class XmlRestDslTest {
}
@Test
- public void parseRestService() throws Exception {
+ void parseRestService() throws Exception {
InputStream is = new FileInputStream("src/test/resources/org/apache/camel/parser/xml/myrest.xml");
String fqn = "src/test/resources/org/apache/camel/camel/parser/xml/myrest.xml";
String baseDir = "src/test/resources";
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRouteTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRouteTest.java
index 90ee20c..0c56b7b 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRouteTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRouteTest.java
@@ -23,22 +23,23 @@ import java.util.List;
import org.apache.camel.parser.XmlRouteParser;
import org.apache.camel.parser.model.CamelEndpointDetails;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class XmlRouteTest {
private static final Logger LOG = LoggerFactory.getLogger(XmlRouteTest.class);
@Test
- public void testXml() throws Exception {
+ void testXml() throws Exception {
test("mycamel", 29);
}
@Test
- public void testXmlWithNamespacePrefix() throws Exception {
+ void testXmlWithNamespacePrefix() throws Exception {
test("mycamel-withNamespacePrefix", 51);
}
@@ -53,10 +54,10 @@ public class XmlRouteTest {
for (CamelEndpointDetails detail : endpoints) {
LOG.info(detail.getEndpointUri());
}
- Assert.assertEquals("stream:in?promptMessage=Enter something:", endpoints.get(0).getEndpointUri());
- Assert.assertEquals("stream:out", endpoints.get(1).getEndpointUri());
- Assert.assertEquals("39", endpoints.get(1).getLineNumber());
- Assert.assertEquals(pos, endpoints.get(1).getLinePosition());
+ assertEquals("stream:in?promptMessage=Enter something:", endpoints.get(0).getEndpointUri());
+ assertEquals("stream:out", endpoints.get(1).getEndpointUri());
+ assertEquals("39", endpoints.get(1).getLineNumber());
+ assertEquals(pos, endpoints.get(1).getLinePosition());
}
}
diff --git a/tests/camel-itest-standalone/pom.xml b/tests/camel-itest-standalone/pom.xml
index 7fcf3e5..a87af97 100644
--- a/tests/camel-itest-standalone/pom.xml
+++ b/tests/camel-itest-standalone/pom.xml
@@ -38,8 +38,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
diff --git a/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java b/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java
index a5c1abc..74d88bb 100644
--- a/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java
+++ b/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java
@@ -21,31 +21,31 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class CamelContextStandaloneTest extends Assert {
+public class CamelContextStandaloneTest {
@Test
- public void testStandalone() throws Exception {
- CamelContext context = new DefaultCamelContext();
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").to("mock:result");
- }
- });
- context.start();
+ void testStandalone() throws Exception {
+ try (CamelContext context = new DefaultCamelContext()) {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:start").to("mock:result");
+ }
+ });
+ context.start();
- MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
- mock.expectedMessageCount(1);
+ MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
+ mock.expectedMessageCount(1);
- ProducerTemplate template = context.createProducerTemplate();
- template.sendBody("direct:start", "Hello World");
+ ProducerTemplate template = context.createProducerTemplate();
+ template.sendBody("direct:start", "Hello World");
- mock.assertIsSatisfied();
+ mock.assertIsSatisfied();
- template.stop();
- context.stop();
+ template.stop();
+ context.stop();
+ }
}
}