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 2e5220390595335e09f73e808ef85ec7c6e7e8f2
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 11:43:17 2020 +0200
[CAMEL-11807] Upgrade camel-stax to junit5
---
components/camel-stax/pom.xml | 2 +-
.../component/stax/IssueWithWrongEncodingTest.java | 7 ++++--
.../stax/SpringStAXJAXBIteratorExpressionTest.java | 10 ++++----
.../camel/component/stax/StAXComponentRefTest.java | 10 ++++----
.../camel/component/stax/StAXComponentTest.java | 10 ++++----
.../stax/StAXJAXBIteratorExpressionTest.java | 9 +++----
.../stax/StAXXPathSplitChoicePerformanceTest.java | 28 +++++++++++++---------
7 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 12a1bce..c6f225e 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -53,7 +53,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<!-- camel-jaxb is used for XPath testing -->
diff --git
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
index 1e4c3f8..b2ea4fa 100644
---
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
+++
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
@@ -24,10 +24,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.stax.model.Product;
-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.component.stax.StAXBuilder.stax;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class IssueWithWrongEncodingTest extends CamelTestSupport {
@@ -43,6 +45,7 @@ public class IssueWithWrongEncodingTest extends
CamelTestSupport {
+ "</products>";
@Override
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/encoding");
super.setUp();
diff --git
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java
index 8ad7b37..9a0176a 100644
---
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java
+++
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java
@@ -20,12 +20,14 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.Record;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class SpringStAXJAXBIteratorExpressionTest extends
CamelSpringTestSupport {
@EndpointInject("mock:records")
@@ -36,7 +38,7 @@ public class SpringStAXJAXBIteratorExpressionTest extends
CamelSpringTestSupport
return new
ClassPathXmlApplicationContext("org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.xml");
}
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java
index ca150c99..4c22923 100644
---
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java
+++
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java
@@ -23,9 +23,11 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StAXComponentRefTest extends CamelTestSupport {
@@ -35,7 +37,7 @@ public class StAXComponentRefTest extends CamelTestSupport {
@BindToRegistry("myHandler")
private CountingHandler handler = new CountingHandler();
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java
index 26c735b..cd3de6b 100644
---
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java
+++
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java
@@ -22,16 +22,18 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StAXComponentTest extends CamelTestSupport {
@EndpointInject("mock:records")
private MockEndpoint recordsEndpoint;
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java
index 6f16693..f44bc31 100644
---
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java
+++
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java
@@ -21,17 +21,18 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.Record;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.stax.StAXBuilder.stax;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StAXJAXBIteratorExpressionTest extends CamelTestSupport {
@EndpointInject("mock:records")
private MockEndpoint recordsEndpoint;
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java
index 4c81acc..199c950 100644
---
a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java
+++
b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java
@@ -26,20 +26,25 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.stax.model.Order;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.component.stax.StAXBuilder.stax;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
-@Ignore("this is a manual test")
+@Disabled("this is a manual test")
public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
private int size = 20 * 1000;
@@ -48,9 +53,10 @@ public class StAXXPathSplitChoicePerformanceTest extends
CamelTestSupport {
private final AtomicInteger med = new AtomicInteger();
private final AtomicInteger large = new AtomicInteger();
private final StopWatch watch = new StopWatch();
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
createDataFile(log, size);
super.setUp();
@@ -73,7 +79,7 @@ public class StAXXPathSplitChoicePerformanceTest extends
CamelTestSupport {
assertEquals((size / 10) * 3, med.get());
assertEquals((size / 10) * 1, large.get());
- assertTrue("Should complete route", matches);
+ assertTrue(matches, "Should complete route");
}
@Override
@@ -94,7 +100,7 @@ public class StAXXPathSplitChoicePerformanceTest extends
CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange)
throws Exception {
String xml =
exchange.getIn().getBody(String.class);
- assertTrue(xml,
xml.contains("<amount>3</amount>"));
+
assertTrue(xml.contains("<amount>3</amount>"), xml);
int num = tiny.incrementAndGet();
if (num % 100 == 0) {
@@ -107,7 +113,7 @@ public class StAXXPathSplitChoicePerformanceTest extends
CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange)
throws Exception {
String xml =
exchange.getIn().getBody(String.class);
- assertTrue(xml,
xml.contains("<amount>44</amount>"));
+
assertTrue(xml.contains("<amount>44</amount>"), xml);
int num = small.incrementAndGet();
if (num % 100 == 0) {
@@ -120,7 +126,7 @@ public class StAXXPathSplitChoicePerformanceTest extends
CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange)
throws Exception {
String xml =
exchange.getIn().getBody(String.class);
- assertTrue(xml,
xml.contains("<amount>88</amount>"));
+
assertTrue(xml.contains("<amount>88</amount>"), xml);
int num = med.incrementAndGet();
if (num % 100 == 0) {
@@ -133,7 +139,7 @@ public class StAXXPathSplitChoicePerformanceTest extends
CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange)
throws Exception {
String xml =
exchange.getIn().getBody(String.class);
- assertTrue(xml,
xml.contains("<amount>123</amount>"));
+
assertTrue(xml.contains("<amount>123</amount>"), xml);
int num = large.incrementAndGet();
if (num % 100 == 0) {
