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 578d8667da6310e87f42451af8d52e8d0bca2c79
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jun 17 15:24:14 2020 +0200
[CAMEL-11807] Upgrade camel-spring-javaconfig to junit5
---
components/camel-spring-javaconfig/pom.xml | 6 ++---
.../spring/javaconfig/BeanJavaConfigTest.java | 11 ++++-----
.../apache/camel/spring/javaconfig/MainTest.java | 4 ++--
.../autowire/AutodetectNoRoutesConfigTest.java | 17 ++++++--------
.../autowire/AutodetectingConfigTest.java | 16 +++++--------
.../autowire/LoadingRawCamelConfigurationTest.java | 10 ++++-----
.../spring/javaconfig/patterns/FilterTest.java | 15 +++++--------
...CamelSpringDelegatingTestContextLoaderTest.java | 10 ++++-----
.../test/JavaConfigWithNestedConfigClassTest.java | 26 ++++++++++++----------
.../test/JavaConfigWithPostProcessorTest.java | 25 +++++++++++----------
10 files changed, 64 insertions(+), 76 deletions(-)
diff --git a/components/camel-spring-javaconfig/pom.xml
b/components/camel-spring-javaconfig/pom.xml
index e8f2404..5b002c1 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -55,13 +55,13 @@
<!-- test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
index accaadf..65b381e 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
@@ -22,19 +22,16 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
-import org.apache.camel.test.spring.CamelSpringRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(classes = {BeanJavaConfigTest.ContextConfig.class},
loader = CamelSpringDelegatingTestContextLoader.class)
+@CamelSpringTest
+@ContextConfiguration(classes = BeanJavaConfigTest.ContextConfig.class)
public class BeanJavaConfigTest extends AbstractJUnit4SpringContextTests {
@EndpointInject("mock:end")
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
index d5fcf03..4c0a553 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.spring.javaconfig;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationContext;
public class MainTest {
@@ -32,7 +32,7 @@ public class MainTest {
context.stop();
}
- @Test
+ @org.junit.jupiter.api.Test
public void testOptionBP() throws Exception {
CamelContext context = createCamelContext(new String[]{"-bp",
"org.apache.camel.spring.javaconfig.config"});
context.start();
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
index 93c3d75..9184503 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
@@ -18,21 +18,18 @@ package org.apache.camel.spring.javaconfig.autowire;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.javaconfig.CamelConfiguration;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
-import org.apache.camel.test.spring.CamelSpringRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(classes = {NoRoutesConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
-public class AutodetectNoRoutesConfigTest extends
AbstractJUnit4SpringContextTests {
+
+@CamelSpringTest
+@ContextConfiguration(classes = NoRoutesConfig.class)
+public class AutodetectNoRoutesConfigTest {
@Autowired
CamelContext camelContext;
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
index 0943f3d..f1f17b8 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
@@ -20,17 +20,13 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
-import org.apache.camel.test.spring.CamelSpringRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(classes = {AutowiringContextConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
-public class AutodetectingConfigTest extends AbstractJUnit4SpringContextTests {
+@CamelSpringTest
+@ContextConfiguration(classes = AutowiringContextConfig.class)
+public class AutodetectingConfigTest {
@EndpointInject("mock:autowire")
MockEndpoint autowireMockEndpoint;
@@ -56,7 +52,7 @@ public class AutodetectingConfigTest extends
AbstractJUnit4SpringContextTests {
autowireMockEndpoint.assertIsSatisfied();
}
- @Test
+ @org.junit.jupiter.api.Test
public void shouldWireRouteBuildersFromModule() throws
InterruptedException {
// Given
moduleMockEndpoint.expectedMessageCount(1);
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
index 9f828ea..dc34848 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
@@ -20,17 +20,17 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.CamelConfiguration;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+@CamelSpringTest
@ContextConfiguration(classes = { CamelConfiguration.class,
AdditionalRouteConfiguration.class })
-public class LoadingRawCamelConfigurationTest extends
AbstractJUnit4SpringContextTests {
+public class LoadingRawCamelConfigurationTest {
@EndpointInject("mock:rawConfigTest")
MockEndpoint moduleMockEndpoint;
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java
index 7dde0d9..180ebf6 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java
@@ -22,24 +22,21 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
* Tests filtering using Spring Test and Java Config
*/
// START SNIPPET: example
// tag::example[]
-@RunWith(CamelSpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {FilterTest.ContextConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
-public class FilterTest extends AbstractJUnit4SpringContextTests {
+@CamelSpringTest
+@ContextConfiguration(classes = FilterTest.ContextConfig.class)
+public class FilterTest {
@EndpointInject("mock:result")
protected MockEndpoint resultEndpoint;
@@ -48,7 +45,7 @@ public class FilterTest extends
AbstractJUnit4SpringContextTests {
protected ProducerTemplate template;
@DirtiesContext
- @Test
+ @org.junit.jupiter.api.Test
public void testSendMatchingMessage() throws Exception {
String expectedBody = "<matched/>";
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
index 748ce38..e60fc33 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
@@ -22,11 +22,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringRunner;
-import org.apache.camel.test.spring.MockEndpoints;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.apache.camel.test.spring.junit5.MockEndpoints;
+import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
@@ -36,7 +34,7 @@ import org.springframework.test.context.ContextConfiguration;
*/
//START SNIPPET: example
// tag::example[]
-@RunWith(CamelSpringRunner.class)
+@CamelSpringTest
@ContextConfiguration(classes =
CamelSpringDelegatingTestContextLoaderTest.TestConfig.class)
@MockEndpoints
public class CamelSpringDelegatingTestContextLoaderTest {
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
index c917892..a55f042 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
@@ -16,33 +16,35 @@
*/
package org.apache.camel.spring.javaconfig.test;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
-import org.apache.camel.test.spring.CamelSpringRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(classes =
{JavaConfigWithNestedConfigClassTest.ContextConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
+
+@CamelSpringTest
+@ContextConfiguration(classes =
JavaConfigWithNestedConfigClassTest.ContextConfig.class)
@Component
-public class JavaConfigWithNestedConfigClassTest extends
AbstractJUnit4SpringContextTests implements Cheese {
+public class JavaConfigWithNestedConfigClassTest implements Cheese {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(JavaConfigWithPostProcessorTest.class);
+
private boolean doCheeseCalled;
@Test
public void testPostProcessorInjectsMe() throws Exception {
- assertEquals("doCheese() should be called", true, doCheeseCalled);
+ assertTrue(doCheeseCalled, "doCheese() should be called");
}
@Override
public void doCheese() {
- logger.info("doCheese called!");
+ LOGGER.info("doCheese called!");
doCheeseCalled = true;
}
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
index 7dee3f4..ce2491d 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
@@ -16,31 +16,32 @@
*/
package org.apache.camel.spring.javaconfig.test;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
-import org.apache.camel.test.spring.CamelSpringRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(classes = {MyConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
+@CamelSpringTest
+@ContextConfiguration(classes = MyConfig.class)
@Component
-public class JavaConfigWithPostProcessorTest extends
AbstractJUnit4SpringContextTests implements Cheese {
+public class JavaConfigWithPostProcessorTest implements Cheese {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(JavaConfigWithPostProcessorTest.class);
+
private boolean doCheeseCalled;
@Test
public void testPostProcessorInjectsMe() throws Exception {
- assertEquals("doCheese() should be called", true, doCheeseCalled);
+ assertTrue(doCheeseCalled, "doCheese() should be called");
}
@Override
public void doCheese() {
- logger.info("doCheese called!");
+ LOGGER.info("doCheese called!");
doCheeseCalled = true;
}
}
