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 32168d263f60e6458c30855c14431d960b9baf90
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jun 11 14:24:39 2020 +0200
[CAMEL-11807] Upgrade camel-jaxb to junit5
---
components/camel-jaxb/pom.xml | 10 +++----
...ncurrentJaxbDataFormatSchemaValidationTest.java | 17 ++++++++----
.../jaxb/FilteringXmlStreamWriterTest.java | 16 +++++------
.../jaxb/JaxbDataFormatMultipleNamespacesTest.java | 13 +++++++--
.../jaxb/JaxbDataFormatPartClassHeaderTest.java | 12 ++++++--
.../jaxb/JaxbDataFormatPartClassTest.java | 12 ++++++--
.../JaxbDataFormatSchemaValidationSpringTest.java | 18 ++++++++++--
.../jaxb/JaxbDataFormatSchemaValidationTest.java | 15 ++++++++--
...ormatSchemaValidationWithObjectFactoryTest.java | 11 ++++++--
.../camel/converter/jaxb/JaxbDataFormatTest.java | 10 +++----
.../converter/jaxb/NonXmlCharFiltererTest.java | 27 +++++++++---------
.../converter/jaxb/NonXmlFilterReaderTest.java | 26 ++++++++----------
.../camel/example/DataFormatConcurrentTest.java | 12 +++++---
.../camel/example/DataFormatDataSetTest.java | 4 +--
.../org/apache/camel/example/DataFormatTest.java | 17 +++++++-----
.../ExplicitEncodingAndXMLCharFilteringTest.java | 11 +++++---
.../camel/example/ExplicitFileEncodingTest.java | 11 +++++---
.../org/apache/camel/example/JAXBConvertTest.java | 32 ++++++++++++----------
.../example/JaxbConcurrentDataFormatTest.java | 6 ++--
.../org/apache/camel/example/JaxbErrorLogTest.java | 4 +--
.../camel/example/RouteWithErrorHandlerTest.java | 4 +--
.../camel/example/SpringDataFormatPartialTest.java | 9 +++---
.../apache/camel/example/SpringDataFormatTest.java | 4 +--
.../example/SpringDataFormatWithEncodingTest.java | 4 +--
.../org/apache/camel/example/UnmarshalTest.java | 4 +--
.../camel/jaxb/CamelJaxbFallbackConverterTest.java | 31 ++++++++++++---------
.../camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java | 9 +++---
.../java/org/apache/camel/jaxb/CamelJaxbTest.java | 30 ++++++++++----------
.../camel/jaxb/DirectBeanToBeanPersonTypeTest.java | 4 +--
...backTypeConverterObjectFactoryDisabledTest.java | 13 +++++----
...lbackTypeConverterObjectFactoryEnabledTest.java | 4 +--
...lbackTypeConverterShouldThrowExceptionTest.java | 6 ++--
.../apache/camel/jaxb/JaxbDataFormatIssueTest.java | 4 +--
.../jaxb/JaxbDataFormatMustBeJAXBElementTest.java | 9 ++++--
.../jaxb/JaxbMarshalNamespacePrefixMapperTest.java | 12 ++++++--
.../SplitterAndExceptionRouteTwistIssueTest.java | 4 +--
.../jaxb/TimerBeanToBeanNotificationTypeTest.java | 4 +--
37 files changed, 266 insertions(+), 173 deletions(-)
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 8af6ea6..4b4e8ec 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -64,13 +64,13 @@
<!-- for testing -->
<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>
@@ -100,7 +100,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -115,7 +115,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
index 0138c27..03e09e9 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java
@@ -23,11 +23,18 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.address.Address;
import org.apache.camel.converter.jaxb.person.Person;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConcurrentJaxbDataFormatSchemaValidationTest extends
CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(ConcurrentJaxbDataFormatSchemaValidationTest.class);
+
@EndpointInject("mock:marshall")
private MockEndpoint mockMarshall;
@@ -55,10 +62,10 @@ public class ConcurrentJaxbDataFormatSchemaValidationTest
extends CamelTestSuppo
}
assertMockEndpointsSatisfied();
- log.info("Validation of {} messages took {} ms", testCount,
System.currentTimeMillis() - start);
+ LOG.info("Validation of {} messages took {} ms", testCount,
System.currentTimeMillis() - start);
String payload =
mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
- log.info(payload);
+ LOG.info(payload);
assertTrue(payload.startsWith("<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>"));
assertTrue(payload.contains("<person
xmlns=\"person.jaxb.converter.camel.apache.org\"
xmlns:ns2=\"address.jaxb.converter.camel.apache.org\">"));
@@ -92,7 +99,7 @@ public class ConcurrentJaxbDataFormatSchemaValidationTest
extends CamelTestSuppo
}
assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
- log.info("Validation of {} messages took {} ms", testCount,
System.currentTimeMillis() - start);
+ LOG.info("Validation of {} messages took {} ms", testCount,
System.currentTimeMillis() - start);
Person person =
mockUnmarshall.getExchanges().get(0).getIn().getBody(Person.class);
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java
index b003ec6..49631d6 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java
@@ -19,18 +19,19 @@ package org.apache.camel.converter.jaxb;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class FilteringXmlStreamWriterTest {
private FilteringXmlStreamWriter filteringXmlStreamWriter;
@Mock
@@ -40,12 +41,12 @@ public class FilteringXmlStreamWriterTest {
// only testing non-generated methods, those that do apply filtering
- @Before
+ @BeforeEach
public void setUp() {
filteringXmlStreamWriter = new
FilteringXmlStreamWriter(xmlStreamWriterMock);
filteringXmlStreamWriter.nonXmlCharFilterer = nonXmlCharFiltererMock;
-
when(nonXmlCharFiltererMock.filter("value")).thenReturn("filteredValue");
+
lenient().when(nonXmlCharFiltererMock.filter("value")).thenReturn("filteredValue");
}
@Test
@@ -88,7 +89,6 @@ public class FilteringXmlStreamWriterTest {
public void testWriteCharacters3Args() throws XMLStreamException {
char[] buffer = new char[] {'a', 'b', 'c'};
filteringXmlStreamWriter.writeCharacters(buffer, 2, 3);
- verify(nonXmlCharFiltererMock).filter(same(buffer), eq(2), eq(3));
verify(xmlStreamWriterMock).writeCharacters(same(buffer), eq(2),
eq(3));
}
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
index e2eff56..6f6785e 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
@@ -23,11 +23,18 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.example.Address;
import org.apache.camel.example.Order;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JaxbDataFormatMultipleNamespacesTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(JaxbDataFormatMultipleNamespacesTest.class);
+
@EndpointInject("mock:marshall")
private MockEndpoint mockMarshall;
@@ -51,7 +58,7 @@ public class JaxbDataFormatMultipleNamespacesTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
String payload =
mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
- log.info(payload);
+ LOG.info(payload);
assertTrue(payload.startsWith("<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>"));
assertTrue(payload.contains("<order:order"));
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java
index 4216ca5..412b970 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java
@@ -22,11 +22,17 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.example.Address;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JaxbDataFormatPartClassHeaderTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(JaxbDataFormatPartClassHeaderTest.class);
+
@EndpointInject("mock:marshall")
private MockEndpoint mockMarshall;
@@ -44,7 +50,7 @@ public class JaxbDataFormatPartClassHeaderTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
String payload =
mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
- log.info(payload);
+ LOG.info(payload);
assertTrue(payload.startsWith("<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>"));
assertTrue(payload.contains("<address:address"));
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java
index cc50870..ce87bdb 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java
@@ -22,11 +22,17 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.example.Address;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JaxbDataFormatPartClassTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(JaxbDataFormatPartClassTest.class);
+
@EndpointInject("mock:marshall")
private MockEndpoint mockMarshall;
@@ -44,7 +50,7 @@ public class JaxbDataFormatPartClassTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
String payload =
mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
- log.info(payload);
+ LOG.info(payload);
assertTrue(payload.startsWith("<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>"));
assertTrue(payload.contains("<address:address"));
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
index 42b02f8..bdfdda4 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
@@ -32,13 +32,24 @@ import org.apache.camel.converter.jaxb.address.Address;
import org.apache.camel.converter.jaxb.message.Message;
import org.apache.camel.converter.jaxb.message.ObjectFactory;
import org.apache.camel.converter.jaxb.person.Person;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
public class JaxbDataFormatSchemaValidationSpringTest extends
CamelSpringTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(JaxbDataFormatSchemaValidationSpringTest.class);
+
@EndpointInject("mock:marshall")
private MockEndpoint mockMarshall;
@@ -48,6 +59,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends
CamelSpringTestSup
private JAXBContext jbCtx;
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
jbCtx = JAXBContext.newInstance(Person.class, Message.class);
@@ -70,7 +82,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends
CamelSpringTestSup
assertMockEndpointsSatisfied();
String payload =
mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
- log.info(payload);
+ LOG.info(payload);
Person unmarshalledPerson = (Person)
jbCtx.createUnmarshaller().unmarshal(new InputSource(new
StringReader(payload)));
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
index 42c71dd..97bc4d7 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
@@ -24,11 +24,20 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.address.Address;
import org.apache.camel.converter.jaxb.person.Person;
-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;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(JaxbDataFormatPartClassTest.class);
+
@EndpointInject("mock:marshall")
private MockEndpoint mockMarshall;
@@ -52,7 +61,7 @@ public class JaxbDataFormatSchemaValidationTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
String payload =
mockMarshall.getExchanges().get(0).getIn().getBody(String.class);
- log.info(payload);
+ LOG.info(payload);
assertTrue(payload.startsWith("<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>"));
assertTrue(payload.contains("<person
xmlns=\"person.jaxb.converter.camel.apache.org\"
xmlns:ns2=\"address.jaxb.converter.camel.apache.org\">"));
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
index 0e5dbc0..4a37197 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
@@ -29,8 +29,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.message.Message;
import org.apache.camel.converter.jaxb.message.ObjectFactory;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class JaxbDataFormatSchemaValidationWithObjectFactoryTest extends
CamelTestSupport {
@@ -43,6 +49,7 @@ public class
JaxbDataFormatSchemaValidationWithObjectFactoryTest extends CamelTe
private JAXBContext jbCtx;
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java
index 794cbe7..6308c11 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java
@@ -20,18 +20,18 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JaxbDataFormatTest {
private JaxbDataFormat jaxbDataFormat;
private CamelContext camelContext;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
camelContext = new DefaultCamelContext();
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java
index d8b6ff6..299f549 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java
@@ -16,18 +16,18 @@
*/
package org.apache.camel.converter.jaxb;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyChar;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -37,13 +37,13 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class NonXmlCharFiltererTest {
private NonXmlCharFilterer nonXmlCharFilterer;
@Mock
private NonXmlCharFilterer nonXmlCharFiltererMock;
- @Before
+ @BeforeEach
public void setUp() {
nonXmlCharFilterer = new NonXmlCharFilterer();
}
@@ -86,7 +86,7 @@ public class NonXmlCharFiltererTest {
verify(nonXmlCharFiltererMock).filter(new char[] {'a', 'b', 'c'}, 0,
3);
- assertSame("Should have returned the same string if nothing was
filtered", string, result);
+ assertSame(string, result, "Should have returned the same string if
nothing was filtered");
}
@Test
@@ -104,7 +104,7 @@ public class NonXmlCharFiltererTest {
String result = nonXmlCharFiltererMock.filter("abc");
verify(nonXmlCharFiltererMock).filter(any(char[].class), eq(0), eq(3));
- assertEquals("Should have returned filtered string", "ioc", result);
+ assertEquals("ioc", result, "Should have returned filtered string");
}
@Test
@@ -125,8 +125,7 @@ public class NonXmlCharFiltererTest {
verify(nonXmlCharFiltererMock).isFiltered('4');
verify(nonXmlCharFiltererMock).isFiltered('5');
- assertArrayEquals("Unexpected buffer contents",
- new char[] {'1', '2', ' ', '4', ' ', '6'}, buffer);
+ assertArrayEquals(new char[] {'1', '2', ' ', '4', ' ', '6'}, buffer,
"Unexpected buffer contents");
}
@Test
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
index 668330d..b28255e 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
@@ -19,16 +19,16 @@ package org.apache.camel.converter.jaxb;
import java.io.IOException;
import java.io.Reader;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -36,7 +36,7 @@ import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class NonXmlFilterReaderTest {
private NonXmlFilterReader nonXmlFilterReader;
@Mock
@@ -44,7 +44,7 @@ public class NonXmlFilterReaderTest {
@Mock
private Reader readerMock;
- @Before
+ @BeforeEach
public void setUp() {
nonXmlFilterReader = new NonXmlFilterReader(readerMock);
nonXmlFilterReader.nonXmlCharFilterer = nonXmlCharFiltererMock;
@@ -69,9 +69,8 @@ public class NonXmlFilterReaderTest {
verify(readerMock).read(same(buffer), eq(3), eq(5));
verify(nonXmlCharFiltererMock).filter(same(buffer), eq(3), eq(3));
- assertEquals("Unexpected number of chars read", 3, result);
- assertArrayEquals("Wrong buffer contents", new char[] {0, 0, 0, 'a',
'b', 'c', 0, 0, 0, 0},
- buffer);
+ assertEquals(3, result, "Unexpected number of chars read");
+ assertArrayEquals(new char[] {0, 0, 0, 'a', 'b', 'c', 0, 0, 0, 0},
buffer, "Wrong buffer contents");
}
@Test
@@ -82,9 +81,8 @@ public class NonXmlFilterReaderTest {
int result = nonXmlFilterReader.read(buffer, 3, 5);
- assertEquals("Unexpected number of chars read", -1, result);
- assertArrayEquals("Buffer should not have been affected",
- new char[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, buffer);
+ assertEquals(-1, result, "Unexpected number of chars read");
+ assertArrayEquals(new char[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, buffer,
"Buffer should not have been affected");
}
static class ConstantReader extends Reader {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
index 5e873a1..09784ed 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
@@ -31,11 +31,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.spi.DataFormat;
-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 DataFormatConcurrentTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(DataFormatConcurrentTest.class);
+
private int size = 2000;
private int warmupCount = 100;
private int testCycleCount = 10000;
@@ -180,7 +184,7 @@ public class DataFormatConcurrentTest extends
CamelTestSupport {
latch.await();
long end = System.currentTimeMillis();
- log.info("Sending {} messages to {} took {} ms", new Object[]
{payloads.length, template.getDefaultEndpoint().getEndpointUri(), end - start});
+ LOG.info("Sending {} messages to {} took {} ms", new Object[]
{payloads.length, template.getDefaultEndpoint().getEndpointUri(), end - start});
}
public void marshal(final CountDownLatch latch) throws Exception {
@@ -205,7 +209,7 @@ public class DataFormatConcurrentTest extends
CamelTestSupport {
latch.await();
long end = System.currentTimeMillis();
- log.info("Sending {} messages to {} took {} ms", new Object[]
{payloads.length, template.getDefaultEndpoint().getEndpointUri(), end - start});
+ LOG.info("Sending {} messages to {} took {} ms", new Object[]
{payloads.length, template.getDefaultEndpoint().getEndpointUri(), end - start});
}
/**
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java
index b5e135d..53f3b7b 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatDataSetTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.component.dataset.SimpleDataSet;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Registry;
-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 DataFormatDataSetTest extends CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java
index 56e8954..fe95de8 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java
@@ -21,16 +21,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.foo.bar.PersonType;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DataFormatTest extends CamelTestSupport {
private MockEndpoint resultEndpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
resultEndpoint = resolveMandatoryEndpoint("mock:result",
MockEndpoint.class);
@@ -68,9 +71,9 @@ public class DataFormatTest extends CamelTestSupport {
int indexPerson = result.indexOf("<Person>");
int indexFirstName = result.indexOf("<firstName>");
- assertTrue("we should find the <Person>", indexPerson > 0);
- assertTrue("we should find the <firstName>", indexFirstName > 0);
- assertTrue("There should some sapce between <Person> and <firstName>",
indexFirstName - indexPerson > 8);
+ assertTrue(indexPerson > 0, "we should find the <Person>");
+ assertTrue(indexFirstName > 0, "we should find the <firstName>");
+ assertTrue(indexFirstName - indexPerson > 8, "There should some sapce
between <Person> and <firstName>");
}
@Override
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
index 3b49b97..40155ee 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
@@ -27,14 +27,17 @@ import javax.xml.bind.Unmarshaller;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/charset");
super.setUp();
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
index 6999c06..80f95a4 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
@@ -24,14 +24,17 @@ import javax.xml.bind.Unmarshaller;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ExplicitFileEncodingTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/charset");
super.setUp();
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
index a94124c..e55b242 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
@@ -22,8 +22,12 @@ import java.io.InputStream;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.StreamCache;
import org.apache.camel.TypeConversionException;
-import org.apache.camel.test.junit4.ExchangeTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.ExchangeTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class JAXBConvertTest extends ExchangeTestSupport {
@@ -32,10 +36,10 @@ public class JAXBConvertTest extends ExchangeTestSupport {
PurchaseOrder purchaseOrder =
context.getTypeConverter().convertTo(PurchaseOrder.class, exchange,
"<purchaseOrder name='foo' amount='123.45' price='2.22'/>");
- assertNotNull("Purchase order should not be null!", purchaseOrder);
- assertEquals("name", "foo", purchaseOrder.getName());
- assertEquals("amount", 123.45, purchaseOrder.getAmount(), 0);
- assertEquals("price", 2.22, purchaseOrder.getPrice(), 0);
+ assertNotNull(purchaseOrder, "Purchase order should not be null!");
+ assertEquals("foo", purchaseOrder.getName(), "name");
+ assertEquals(123.45, purchaseOrder.getAmount(), 0, "amount");
+ assertEquals(2.22, purchaseOrder.getPrice(), 0, "price");
}
@Test
@@ -43,18 +47,18 @@ public class JAXBConvertTest extends ExchangeTestSupport {
PurchaseOrder purchaseOrder =
context.getTypeConverter().convertTo(PurchaseOrder.class, exchange,
"<purchaseOrder name='foo' amount='123.45' price='2.22'/>");
- assertNotNull("Purchase order should not be null!", purchaseOrder);
- assertEquals("name", "foo", purchaseOrder.getName());
- assertEquals("amount", 123.45, purchaseOrder.getAmount(), 0);
- assertEquals("price", 2.22, purchaseOrder.getPrice(), 0);
+ assertNotNull(purchaseOrder, "Purchase order should not be null!");
+ assertEquals("foo", purchaseOrder.getName(), "name");
+ assertEquals(123.45, purchaseOrder.getAmount(), 0, "amount");
+ assertEquals(2.22, purchaseOrder.getPrice(), 0, "price");
PurchaseOrder purchaseOrder2 =
context.getTypeConverter().convertTo(PurchaseOrder.class, exchange,
"<purchaseOrder name='bar' amount='5.12' price='3.33'/>");
- assertNotNull("Purchase order should not be null!", purchaseOrder2);
- assertEquals("name", "bar", purchaseOrder2.getName());
- assertEquals("amount", 5.12, purchaseOrder2.getAmount(), 0);
- assertEquals("amount", 3.33, purchaseOrder2.getPrice(), 0);
+ assertNotNull(purchaseOrder2, "Purchase order should not be null!");
+ assertEquals("bar", purchaseOrder2.getName(), "name");
+ assertEquals(5.12, purchaseOrder2.getAmount(), 0, "amount");
+ assertEquals(3.33, purchaseOrder2.getPrice(), 0, "amount");
}
@Test
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java
index ecdcf52..43a8354 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java
@@ -23,8 +23,10 @@ import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.spi.DataFormat;
-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.test.junit5.TestSupport.body;
public class JaxbConcurrentDataFormatTest extends CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
index 052ab7d..7d3b4f5 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
@@ -21,8 +21,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Body;
import org.apache.camel.Handler;
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 JaxbErrorLogTest extends CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
index e0809aa..967b726 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/RouteWithErrorHandlerTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.spi.DataFormat;
-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 RouteWithErrorHandlerTest extends CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java
index 15e36bc9..68f70fc 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatPartialTest.java
@@ -18,10 +18,12 @@ package org.apache.camel.example;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.language.XPathExpression;
-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.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
/**
* Partial operations test.
*/
@@ -45,8 +47,7 @@ public class SpringDataFormatPartialTest extends
CamelSpringTestSupport {
mock.assertIsSatisfied();
//To make sure there is no XML declaration.
- assertFalse("There should have no XML declaration.",
-
mock.getExchanges().get(0).getIn().getBody(String.class).startsWith("<?xml
version="));
+
assertFalse(mock.getExchanges().get(0).getIn().getBody(String.class).startsWith("<?xml
version="), "There should have no XML declaration.");
}
@Test
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java
index 10d7f43..616f558 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.example;
import org.apache.camel.component.mock.MockEndpoint;
-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.ClassPathXmlApplicationContext;
public class SpringDataFormatTest extends CamelSpringTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java
index 66e2e42..d05ffa5 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringDataFormatWithEncodingTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.example;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
-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.ClassPathXmlApplicationContext;
public class SpringDataFormatWithEncodingTest extends CamelSpringTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java
index 846022f..bce7b9d 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/UnmarshalTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.spi.DataFormat;
-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 UnmarshalTest extends CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
index 100df44..ef2f82c 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbFallbackConverterTest.java
@@ -26,8 +26,13 @@ import org.apache.camel.example.Bar;
import org.apache.camel.example.Foo;
import org.apache.camel.foo.bar.PersonType;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.ExchangeTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.ExchangeTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class CamelJaxbFallbackConverterTest extends ExchangeTestSupport {
@@ -35,7 +40,7 @@ public class CamelJaxbFallbackConverterTest extends
ExchangeTestSupport {
public void testFallbackConverterWithoutObjectFactory() throws Exception {
TypeConverter converter = context.getTypeConverter();
Foo foo = converter.convertTo(Foo.class, exchange, "<foo><zot
name=\"bar1\" value=\"value\" otherValue=\"otherValue\"/></foo>");
- assertNotNull("foo should not be null", foo);
+ assertNotNull(foo, "foo should not be null");
assertEquals("value", foo.getBarRefs().get(0).getValue());
foo.getBarRefs().clear();
@@ -49,7 +54,7 @@ public class CamelJaxbFallbackConverterTest extends
ExchangeTestSupport {
String value = converter.convertTo(String.class, exchange, foo);
- assertTrue("Should get a right marshalled string", value.indexOf("<bar
name=\"myName\" value=\"myValue\"/>") > 0);
+ assertTrue(value.indexOf("<bar name=\"myName\" value=\"myValue\"/>") >
0, "Should get a right marshalled string");
}
@Test
@@ -75,14 +80,14 @@ public class CamelJaxbFallbackConverterTest extends
ExchangeTestSupport {
public void testConverter() throws Exception {
TypeConverter converter = context.getTypeConverter();
PersonType person = converter.convertTo(PersonType.class, exchange,
"<Person><firstName>FOO</firstName><lastName>BAR</lastName></Person>");
- assertNotNull("Person should not be null ", person);
- assertEquals("Get the wrong first name ", "FOO",
person.getFirstName());
- assertEquals("Get the wrong second name ", "BAR",
person.getLastName());
+ assertNotNull(person, "Person should not be null");
+ assertEquals("FOO", person.getFirstName(), "Get the wrong first name");
+ assertEquals("BAR", person.getLastName(), "Get the wrong second name");
Exchange exchange = new DefaultExchange(context);
exchange.setProperty(Exchange.CHARSET_NAME, "UTF-8");
String value = converter.convertTo(String.class, exchange, person);
- assertTrue("Should get a right marshalled string",
value.indexOf("<lastName>BAR</lastName>") > 0);
+ assertTrue(value.indexOf("<lastName>BAR</lastName>") > 0, "Should get
a right marshalled string");
byte[] buffers =
"<Person><firstName>FOO</firstName><lastName>BAR\u0008</lastName></Person>".getBytes("UTF-8");
InputStream is = new ByteArrayInputStream(buffers);
@@ -103,17 +108,17 @@ public class CamelJaxbFallbackConverterTest extends
ExchangeTestSupport {
exchange.setProperty(Exchange.FILTER_NON_XML_CHARS, true);
TypeConverter converter = context.getTypeConverter();
PersonType person = converter.convertTo(PersonType.class, exchange,
is);
- assertNotNull("Person should not be null ", person);
- assertEquals("Get the wrong first name ", "FOO",
person.getFirstName());
- assertEquals("Get the wrong second name ", "BAR ",
person.getLastName());
+ assertNotNull(person, "Person should not be null ");
+ assertEquals("FOO", person.getFirstName(), "Get the wrong first name");
+ assertEquals("BAR ", person.getLastName(), "Get the wrong second
name");
person.setLastName("BAR\u0008\uD8FF");
String value = converter.convertTo(String.class, exchange, person);
- assertTrue("Didn't filter the non-xml chars",
value.indexOf("<lastName>BAR </lastName>") > 0);
+ assertTrue(value.indexOf("<lastName>BAR </lastName>") > 0, "Didn't
filter the non-xml chars");
exchange.setProperty(Exchange.FILTER_NON_XML_CHARS, false);
value = converter.convertTo(String.class, exchange, person);
- assertTrue("Should not filter the non-xml chars",
value.indexOf("<lastName>BAR\uD8FF</lastName>") > 0);
+ assertTrue(value.indexOf("<lastName>BAR\uD8FF</lastName>") > 0,
"Should not filter the non-xml chars");
}
}
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java
index 1885432..707e6eb 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java
@@ -20,8 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.foo.bar.PersonType;
-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.assertTrue;
public class CamelJaxbNoNamespaceSchemaTest extends CamelTestSupport {
@@ -37,8 +39,7 @@ public class CamelJaxbNoNamespaceSchemaTest extends
CamelTestSupport {
resultEndpoint.assertIsSatisfied();
String body =
resultEndpoint.getReceivedExchanges().get(0).getIn().getBody(String.class);
- assertTrue("We should get the noNamespaceSchemaLocation here", body
-
.contains("noNamespaceSchemaLocation=\"person-no-namespace.xsd\""));
+
assertTrue(body.contains("noNamespaceSchemaLocation=\"person-no-namespace.xsd\""),
"We should get the noNamespaceSchemaLocation here");
}
@Override
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
index 4fb2c31..38b5340 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
@@ -24,8 +24,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.foo.bar.PersonType;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelJaxbTest extends CamelTestSupport {
@@ -43,10 +47,11 @@ public class CamelJaxbTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testUnmarshalBadCharsNoFiltering() throws Exception {
String xml =
"<Person><firstName>FOO</firstName><lastName>BAR\u0008</lastName></Person>";
- template.sendBody("direct:getJAXBElementValue", xml);
+ assertThrows(CamelExecutionException.class, () ->
+ template.sendBody("direct:getJAXBElementValue", xml));
}
@Test
@@ -75,7 +80,7 @@ public class CamelJaxbTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
String body =
resultEndpoint.getReceivedExchanges().get(0).getIn().getBody(String.class);
- assertFalse("Non-xml character wasn't replaced",
body.contains("\u0004"));
+ assertFalse(body.contains("\u0004"), "Non-xml character wasn't
replaced");
}
@Test
@@ -91,8 +96,7 @@ public class CamelJaxbTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
String body =
resultEndpoint.getReceivedExchanges().get(0).getIn().getBody(String.class);
- assertTrue("Non-xml character unexpectedly did not get into marshalled
contents", body
- .contains("\u0004"));
+ assertTrue(body.contains("\u0004"), "Non-xml character unexpectedly
did not get into marshalled contents");
}
@Test
@@ -108,8 +112,7 @@ public class CamelJaxbTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
String body =
resultEndpoint.getReceivedExchanges().get(0).getIn().getBody(String.class);
- assertTrue("We should get the schemaLocation here", body
- .contains("schemaLocation=\"person.xsd\""));
+ assertTrue(body.contains("schemaLocation=\"person.xsd\""), "We should
get the schemaLocation here");
}
@Test
@@ -137,7 +140,7 @@ public class CamelJaxbTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
String body =
resultEndpoint.getReceivedExchanges().get(0).getIn().getBody(String.class);
- assertTrue("Body did not get processed correctly by custom filter",
body.contains("-Foo"));
+ assertTrue(body.contains("-Foo"), "Body did not get processed
correctly by custom filter");
}
@Test
@@ -152,9 +155,8 @@ public class CamelJaxbTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
String body =
resultEndpoint.getReceivedExchanges().get(0).getIn().getBody(String.class);
- assertFalse("Non-xml character unexpectedly did not get into
marshalled contents", body
- .contains("\u0004"));
- assertTrue("Body did not get processed correctly by custom filter",
body.contains("-Foo"));
+ assertFalse(body.contains("\u0004"), "Non-xml character unexpectedly
did not get into marshalled contents");
+ assertTrue(body.contains("-Foo"), "Body did not get processed
correctly by custom filter");
}
@Test
@@ -173,7 +175,7 @@ public class CamelJaxbTest extends CamelTestSupport {
resultEndpoint.expectedMessageCount(1);
template.sendBody("direct:getJAXBElement", xml);
resultEndpoint.assertIsSatisfied();
- assertTrue("We should get the JAXBElement here",
resultEndpoint.getExchanges().get(0).getIn().getBody() instanceof JAXBElement);
+ assertTrue(resultEndpoint.getExchanges().get(0).getIn().getBody()
instanceof JAXBElement, "We should get the JAXBElement here");
resultEndpoint.reset();
resultEndpoint.expectedMessageCount(1);
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java
index d883f60..ac72fd3 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DirectBeanToBeanPersonTypeTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.jaxb;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.foo.bar.PersonType;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* PersonType has a ObjectFactory so JAXB can convert to it, but we should
still route it as is
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
index 4571381..9559884 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
@@ -20,19 +20,20 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxb.FallbackTypeConverter;
import org.apache.camel.converter.jaxb.message.Message;
-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.assertThrows;
public class FallbackTypeConverterObjectFactoryDisabledTest extends
CamelTestSupport {
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testObjectFactoryFalse() throws Exception {
Message in = new Message("Hello World");
getMockEndpoint("mock:a").expectedBodiesReceived(in);
- template.sendBody("direct:a", in);
-
- assertMockEndpointsSatisfied();
+ assertThrows(CamelExecutionException.class, () ->
+ template.sendBody("direct:a", in));
}
@Override
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
index adc36ac..be40292 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.jaxb;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxb.FallbackTypeConverter;
import org.apache.camel.converter.jaxb.message.Message;
-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 FallbackTypeConverterObjectFactoryEnabledTest extends
CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java
index 587ae9d..35480cb 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterShouldThrowExceptionTest.java
@@ -25,8 +25,10 @@ import org.apache.camel.TypeConversionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.example.Bar;
import org.apache.camel.example.Foo;
-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 FallbackTypeConverterShouldThrowExceptionTest extends
CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
index fc0e081..830cb1f 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
@@ -22,8 +22,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
-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-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
index dddf62f..d63090b 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
@@ -25,8 +25,13 @@ import org.apache.camel.InvalidPayloadException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
-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.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class JaxbDataFormatMustBeJAXBElementTest extends CamelTestSupport {
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
index c4118e9..11cbd10 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbMarshalNamespacePrefixMapperTest.java
@@ -25,14 +25,20 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.example.Address;
import org.apache.camel.example.Order;
import org.apache.camel.model.dataformat.JaxbDataFormat;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
public class JaxbMarshalNamespacePrefixMapperTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(JaxbMarshalNamespacePrefixMapperTest.class);
+
@BindToRegistry("myPrefix")
public Map<String, String> addMap() throws Exception {
Map<String, String> map = new HashMap<>();
@@ -61,7 +67,7 @@ public class JaxbMarshalNamespacePrefixMapperTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
String xml = mock.getExchanges().get(0).getIn().getBody(String.class);
- log.info(xml);
+ LOG.info(xml);
assertTrue(xml.contains("xmlns:a=\"http://www.camel.apache.org/jaxb/example/address/1\"";));
assertTrue(xml.contains("xmlns:o=\"http://www.camel.apache.org/jaxb/example/order/1\"";));
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
index bcae935..3bd190b 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
@@ -34,8 +34,8 @@ 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.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
*
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java
index 1c4826c..8c5e325 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/TimerBeanToBeanNotificationTypeTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.jaxb;
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;
/**
*
