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 dea7677f63984ab9361a415532e8c2319fdebdc5
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jun 11 17:15:38 2020 +0200
[CAMEL-11807] Upgrade camel-groovy to junit5
---
components/camel-groovy/pom.xml | 6 +++---
.../camel/language/groovy/GroovyExpressionTest.java | 18 +++++++++++-------
.../camel/language/groovy/GroovyInvokeMethodTest.java | 4 ++--
.../camel/language/groovy/GroovyLanguageTest.java | 4 ++--
.../camel/language/groovy/GroovyListMapTest.java | 4 ++--
.../camel/language/groovy/GroovyResourceTest.java | 4 ++--
.../language/groovy/GroovySetFixedHeaderTest.java | 4 ++--
.../camel/language/groovy/GroovySetHeaderTest.java | 4 ++--
.../camel/language/groovy/GroovyShellFactoryTest.java | 9 ++++++---
.../camel/language/groovy/LanguageGroovyRouteTest.java | 4 ++--
.../camel/processor/groovy/GroovyFilterTest.java | 4 ++--
.../groovy/GroovySetHeaderConcurrentIssueTest.java | 4 ++--
.../processor/groovy/GroovySetHeaderIssueTest.java | 4 ++--
.../camel/processor/groovy/GroovySumFilterTest.java | 4 ++--
.../processor/groovy/InlinedGroovyScriptTest.java | 4 ++--
15 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 7e57f59..0877e90 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -60,7 +60,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -69,8 +69,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-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
index deb5abb..7628e6d 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
@@ -19,13 +19,18 @@ package org.apache.camel.language.groovy;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class GroovyExpressionTest extends CamelTestSupport {
+import static org.apache.camel.test.junit5.TestSupport.assertPredicate;
+import static org.apache.camel.test.junit5.TestSupport.assertExpression;
+import static org.apache.camel.test.junit5.TestSupport.assertInMessageHeader;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class GroovyExpressionTest {
private static final Logger LOG =
LoggerFactory.getLogger(GroovyExpressionTest.class);
protected Exchange exchange;
@@ -60,12 +65,11 @@ public class GroovyExpressionTest extends CamelTestSupport {
} catch (Exception e) {
LOG.debug("Caught expected exception: " + e, e);
String message = e.getMessage();
- assertTrue("The message should include 'doesNotExist' but was: " +
message, message.contains("doesNotExist"));
+ assertTrue(message.contains("doesNotExist"), "The message should
include 'doesNotExist' but was: " + message);
}
}
- @Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
exchange = new DefaultExchange(new DefaultCamelContext());
exchange.getIn().setHeader("foo.bar", "cheese");
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java
index 884fead..dac2f35 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyInvokeMethodTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.groovy;
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 GroovyInvokeMethodTest extends CamelTestSupport {
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
index 4a1dad2..f34fe06 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.language.groovy;
-import org.apache.camel.test.junit4.LanguageTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.LanguageTestSupport;
+import org.junit.jupiter.api.Test;
public class GroovyLanguageTest extends LanguageTestSupport {
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
index 684ef76..3f71de5 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyListMapTest.java
@@ -23,8 +23,8 @@ import java.util.Map;
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-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java
index 3c72238..45721df 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyResourceTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.language.groovy;
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-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java
index e05800f..41a591f 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetFixedHeaderTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.groovy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.language.groovy.GroovyLanguage.groovy;
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java
index 05c3fce..421f789 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
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 GroovySetHeaderTest extends CamelTestSupport {
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java
index 5e09904..fc903e4 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyShellFactoryTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.customizers.ImportCustomizer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GroovyShellFactoryTest extends CamelTestSupport {
@@ -44,7 +47,7 @@ public class GroovyShellFactoryTest extends CamelTestSupport {
CamelContext camelContext = new DefaultCamelContext(registry);
- assertExpression(GroovyLanguage.groovy("dummy()"), new
DefaultExchange(camelContext), "foo");
+ TestSupport.assertExpression(GroovyLanguage.groovy("dummy()"), new
DefaultExchange(camelContext), "foo");
}
@Test
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java
index f600d8b..414a88d 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/LanguageGroovyRouteTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.language.groovy;
import java.net.URLEncoder;
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 LanguageGroovyRouteTest extends CamelTestSupport {
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java
index 94a71e0..1f8e4a0 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.processor.groovy;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java
index cf34294..7da144f 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderConcurrentIssueTest.java
@@ -20,8 +20,8 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
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 GroovySetHeaderConcurrentIssueTest extends CamelTestSupport {
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java
index bfafeb1..25ba35a 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySetHeaderIssueTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.processor.groovy;
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 GroovySetHeaderIssueTest extends CamelTestSupport {
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java
index ce7b2a4..de2597e 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovySumFilterTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.processor.groovy;
import java.util.ArrayList;
import java.util.List;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java
index 8f0221a..bbb6db3 100644
---
a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java
+++
b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/InlinedGroovyScriptTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.processor.groovy;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
