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 16f3e573f5ed261aa429eec9b71386f05752ac23
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jun 19 20:49:44 2020 +0200
Regen
---
.../components/modules/ROOT/pages/servlet-component.adoc | 6 +++---
.../camel/spring/javaconfig/patterns/FilterTest.java | 15 ++++++---------
.../test/CamelSpringDelegatingTestContextLoaderTest.java | 16 +++++-----------
3 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/servlet-component.adoc
b/docs/components/modules/ROOT/pages/servlet-component.adoc
index acf9ab6..eac8075 100644
--- a/docs/components/modules/ROOT/pages/servlet-component.adoc
+++ b/docs/components/modules/ROOT/pages/servlet-component.adoc
@@ -247,12 +247,12 @@ from("servlet:hello?matchOnUriPrefix=true").process(new
Processor() {
String path = exchange.getIn().getHeader(Exchange.HTTP_URI,
String.class);
path = path.substring(path.lastIndexOf("/"));
- assertEquals("Get a wrong content type", CONTENT_TYPE, contentType);
+ assertEquals(CONTENT_TYPE, contentType, "Get a wrong content type");
// assert camel http header
String charsetEncoding =
exchange.getIn().getHeader(Exchange.HTTP_CHARACTER_ENCODING, String.class);
- assertEquals("Get a wrong charset name from the message heaer",
"UTF-8", charsetEncoding);
+ assertEquals(charsetEncoding, "Get a wrong charset name from the
message heaer", "UTF-8");
// assert exchange charset
- assertEquals("Get a wrong charset naem from the exchange property",
"UTF-8", exchange.getProperty(Exchange.CHARSET_NAME));
+ assertEquals(exchange.getProperty(Exchange.CHARSET_NAME), "Get a wrong
charset naem from the exchange property", "UTF-8");
exchange.getOut().setHeader(Exchange.CONTENT_TYPE, contentType + ";
charset=UTF-8");
exchange.getOut().setHeader("PATH", path);
exchange.getOut().setBody("<b>Hello World</b>");
diff --git
a/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java
b/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java
index 7dde0d9..180ebf6 100644
---
a/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java
+++
b/docs/user-manual/modules/ROOT/examples/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/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
b/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
index 9fe6e40..e60fc33 100644
---
a/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
+++
b/docs/user-manual/modules/ROOT/examples/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,12 +34,8 @@ import org.springframework.test.context.ContextConfiguration;
*/
//START SNIPPET: example
// tag::example[]
-@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(
- classes =
{CamelSpringDelegatingTestContextLoaderTest.TestConfig.class},
- // Since Camel 2.11.0
- loader = CamelSpringDelegatingTestContextLoader.class
- )
+@CamelSpringTest
+@ContextConfiguration(classes =
CamelSpringDelegatingTestContextLoaderTest.TestConfig.class)
@MockEndpoints
public class CamelSpringDelegatingTestContextLoaderTest {
@EndpointInject("mock:direct:end")
