You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2021/04/09 11:35:09 UTC
[camel] 02/04: Make camel-jaxb tests faster
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 3c4b48cdbd215e291e8d44442b575f6447eed064
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Apr 6 11:33:29 2021 +0200
Make camel-jaxb tests faster
---
components/camel-jaxb/pom.xml | 1 +
.../ExplicitEncodingAndXMLCharFilteringTest.java | 18 +++++-------------
.../apache/camel/example/ExplicitFileEncodingTest.java | 17 +++--------------
3 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 677463c..bb0dc06 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -38,6 +38,7 @@
javax.xml.bind*;version="[2.2,3.0)",
*
</camel.osgi.import>
+ <camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
<dependencies>
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 40155ee..9fc89cf 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
@@ -20,6 +20,7 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
@@ -28,21 +29,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.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
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/charset");
- super.setUp();
- }
-
@Test
public void testIsoAndCharacterFiltering() throws Exception {
PurchaseOrder order = new PurchaseOrder();
@@ -54,15 +46,15 @@ public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport {
order.setPrice(2.22);
MockEndpoint result = getMockEndpoint("mock:file");
- result.expectedFileExists("target/charset/output.xml");
+ result.expectedFileExists(testFile("output.xml"));
template.sendBody("direct:start", order);
assertMockEndpointsSatisfied();
JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.camel.example");
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- InputStream inputStream = new FileInputStream("target/charset/output.xml");
- Reader reader = new InputStreamReader(inputStream, "ISO-8859-1");
+ InputStream inputStream = new FileInputStream(testFile("output.xml").toFile());
+ Reader reader = new InputStreamReader(inputStream, StandardCharsets.ISO_8859_1);
PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(reader);
assertEquals(expected, obj.getName());
}
@@ -78,7 +70,7 @@ public class ExplicitEncodingAndXMLCharFilteringTest extends CamelTestSupport {
from("direct:start")
.marshal(jaxb)
- .to("file:target/charset/?fileName=output.xml&charset=iso-8859-1");
+ .to(fileUri("?fileName=output.xml&charset=iso-8859-1"));
}
};
}
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 ea74866..772b63a 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
@@ -16,8 +16,6 @@
*/
package org.apache.camel.example;
-import java.io.File;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
@@ -25,21 +23,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.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
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/charset");
- super.setUp();
- }
-
@Test
public void testISOFileEncoding() throws Exception {
PurchaseOrder order = new PurchaseOrder();
@@ -50,14 +39,14 @@ public class ExplicitFileEncodingTest extends CamelTestSupport {
order.setPrice(2.22);
MockEndpoint result = getMockEndpoint("mock:file");
- result.expectedFileExists("target/charset/output.txt");
+ result.expectedFileExists(testFile("output.txt"));
template.sendBody("direct:start", order);
assertMockEndpointsSatisfied();
JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.camel.example");
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(new File("target/charset/output.txt"));
+ PurchaseOrder obj = (PurchaseOrder) unmarshaller.unmarshal(testFile("output.txt").toFile());
assertEquals(obj.getName(), name);
}
@@ -71,7 +60,7 @@ public class ExplicitFileEncodingTest extends CamelTestSupport {
from("direct:start")
.marshal(jaxb)
- .to("file:target/charset/?fileName=output.txt&charset=iso-8859-1");
+ .to(fileUri("?fileName=output.txt&charset=iso-8859-1"));
}
};
}