You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/18 11:37:56 UTC
[camel] 03/11: [CAMEL-11807] Upgrade camel-ognl to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit da45945d67a3b2a92b641be9337d21c964c1fc41
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 14:46:40 2020 +0200
[CAMEL-11807] Upgrade camel-ognl to junit5
---
components/camel-ognl/pom.xml | 6 +++---
.../org/apache/camel/language/ognl/OgnlInvokeMethodTest.java | 4 ++--
.../java/org/apache/camel/language/ognl/OgnlResourceTest.java | 4 ++--
.../src/test/java/org/apache/camel/language/ognl/OgnlTest.java | 10 +++++++---
.../org/apache/camel/language/ognl/patterns/FilterTest.java | 4 ++--
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index 05effe7..0786f5c 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -47,7 +47,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -56,8 +56,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java
index 9fc2b4f..c81f1db 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.ognl;
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;
/**
*
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java
index f079d06..473f92c 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.language.ognl;
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;
/**
*
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
index 6239f8e..072f52a 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
@@ -16,8 +16,12 @@
*/
package org.apache.camel.language.ognl;
-import org.apache.camel.test.junit4.LanguageTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.LanguageTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class OgnlTest extends LanguageTestSupport {
@@ -38,7 +42,7 @@ public class OgnlTest extends LanguageTestSupport {
assertExpression("@org.apache.camel.language.ognl.Animal1@getClassName()", "Animal");
fail("Expect exception here.");
} catch (Exception ex) {
- assertTrue("We should get the ClassNotFoundException", ex.getMessage().indexOf("ClassNotFoundException") > 0);
+ assertTrue(ex.getMessage().contains("ClassNotFoundException"), "We should get the ClassNotFoundException");
}
// setup the class resolver to load the right class for us
exchange.getContext().setClassResolver(new MyClassResolver(context));
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
index 349614d..fe968f5 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.language.ognl.patterns;
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 FilterTest extends CamelTestSupport {