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/03/23 16:59:53 UTC
[camel] branch master updated (104c186 -> 446e825)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 104c186 Changed conditional test execution
new ea78642 Fix CS
new 446e825 Make camel-saxon tests run in parallel
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...ttyUseSharedWorkerThreadPoolManyRoutesTest.java | 2 +-
.../netty/NettyUseSharedWorkerThreadPoolTest.java | 8 ++---
.../netty/UnsharableCodecsConflictsTest.java | 4 +--
components/camel-saxon/pom.xml | 15 ++--------
.../saxon/SpringXQueryTransformIssueTest.java | 3 +-
.../saxon/XPathAnnotationResultTypeTest.java | 3 ++
.../saxon/XPathSplitChoicePerformanceTest.java | 11 +++----
.../org/apache/camel/builder/saxon/XPathTest.java | 3 ++
.../xquery/XQueryComponentConfigurationTest.java | 6 ++--
.../xquery/XQueryEndpointConfigurationTest.java | 6 ++--
.../camel/component/xquery/XQueryEndpointTest.java | 6 ++--
.../camel/component/xquery/XQueryExampleTest.java | 6 ++--
.../xquery/XQueryFromFileExceptionTest.java | 35 ++++++----------------
.../camel/component/xquery/XQueryFromFileTest.java | 13 ++------
.../xquery/XQueryLanguageFromFileTest.java | 16 ++--------
.../component/xquery/XQueryNullHeaderTest.java | 6 ++--
.../xquery/XQueryWithExplicitTypeTest.java | 6 ++--
.../xslt/SaxonXsltComponentConfigurationTest.java | 6 ++--
.../xslt/SaxonXsltEndpointConfigurationTest.java | 6 ++--
.../apache/camel/component/xslt/SaxonXsltTest.java | 3 +-
.../SaxonSpringExtensionFunctionsTest.java | 3 +-
.../language/xpath/XPathHeaderEnableSaxonTest.java | 3 +-
.../camel/language/xpath/XPathHeaderTest.java | 3 +-
.../xpath/XPathLanguageDefaultSettingsTest.java | 6 ++--
.../camel/language/xpath/XPathLanguageTest.java | 6 ++--
25 files changed, 70 insertions(+), 115 deletions(-)
[camel] 02/02: Make camel-saxon tests run in parallel
Posted by gn...@apache.org.
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 446e8254685fd556da4b247b584694889eaf2ed4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 23 17:59:23 2021 +0100
Make camel-saxon tests run in parallel
---
components/camel-saxon/pom.xml | 15 ++--------
.../saxon/SpringXQueryTransformIssueTest.java | 3 +-
.../saxon/XPathAnnotationResultTypeTest.java | 3 ++
.../saxon/XPathSplitChoicePerformanceTest.java | 11 +++----
.../org/apache/camel/builder/saxon/XPathTest.java | 3 ++
.../xquery/XQueryComponentConfigurationTest.java | 6 ++--
.../xquery/XQueryEndpointConfigurationTest.java | 6 ++--
.../camel/component/xquery/XQueryEndpointTest.java | 6 ++--
.../camel/component/xquery/XQueryExampleTest.java | 6 ++--
.../xquery/XQueryFromFileExceptionTest.java | 35 ++++++----------------
.../camel/component/xquery/XQueryFromFileTest.java | 13 ++------
.../xquery/XQueryLanguageFromFileTest.java | 16 ++--------
.../component/xquery/XQueryNullHeaderTest.java | 6 ++--
.../xquery/XQueryWithExplicitTypeTest.java | 6 ++--
.../xslt/SaxonXsltComponentConfigurationTest.java | 6 ++--
.../xslt/SaxonXsltEndpointConfigurationTest.java | 6 ++--
.../apache/camel/component/xslt/SaxonXsltTest.java | 3 +-
.../SaxonSpringExtensionFunctionsTest.java | 3 +-
.../language/xpath/XPathHeaderEnableSaxonTest.java | 3 +-
.../camel/language/xpath/XPathHeaderTest.java | 3 +-
.../xpath/XPathLanguageDefaultSettingsTest.java | 6 ++--
.../camel/language/xpath/XPathLanguageTest.java | 6 ++--
22 files changed, 63 insertions(+), 108 deletions(-)
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 74ddcca..64e85d0 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -35,6 +35,8 @@
<camel.osgi.import.additional>
net.sf.saxon.*;version="[9.9.0,10)"
</camel.osgi.import.additional>
+
+ <camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
<dependencies>
@@ -71,17 +73,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java
index e0446d3..17b25d1 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringXQueryTransformIssueTest extends CamelSpringTestSupport {
@@ -39,6 +38,6 @@ public class SpringXQueryTransformIssueTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.xml");
+ return newAppContext("SpringXQueryTransformIssueTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
index e94628e..05e77a0 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
@@ -24,9 +24,12 @@ import org.apache.camel.language.xpath.XPath;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class XPathAnnotationResultTypeTest extends CamelTestSupport {
protected MyBean myBean = new MyBean();
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java
index ff8f9ab..a22adc7 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java
@@ -34,8 +34,6 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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;
@@ -86,7 +84,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/data?noop=true")
+ from(fileUri("?noop=true"))
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
log.info("Starting to process file");
@@ -153,13 +151,12 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport {
};
}
- public static void createDataFile(Logger log, int size) throws Exception {
- deleteDirectory("target/data");
- createDirectory("target/data");
+ public void createDataFile(Logger log, int size) throws Exception {
+ deleteTestDirectory();
log.info("Creating data file ...");
- File file = new File("target/data/data.xml");
+ File file = testDirectory(true).resolve("data.xml").toFile();
FileOutputStream fos = new FileOutputStream(file, true);
fos.write("<orders>\n".getBytes());
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java
index e772721..137b7d0 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java
@@ -23,9 +23,12 @@ import org.apache.camel.language.xpath.XPathBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class XPathTest extends CamelTestSupport {
@Test
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java
index 98f4573..74cb7ea 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.xquery;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -38,7 +38,7 @@ public class XQueryComponentConfigurationTest extends CamelSpringTestSupport {
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xquery/XQueryComponentConfigurationTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("XQueryComponentConfigurationTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java
index a51625b..24c0ce2 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java
@@ -22,7 +22,7 @@ import net.sf.saxon.Configuration;
import org.apache.camel.Endpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -58,7 +58,7 @@ public class XQueryEndpointConfigurationTest extends CamelSpringTestSupport {
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("XQueryEndpointConfigurationTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
index 0b2f61d..f5d59c4 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -52,7 +52,7 @@ public class XQueryEndpointTest extends CamelSpringTestSupport {
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xquery/camelContext.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("camelContext.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
index 20b9abc..ad6271d 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.xquery;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
public class XQueryExampleTest extends CamelSpringTestSupport {
@@ -36,7 +36,7 @@ public class XQueryExampleTest extends CamelSpringTestSupport {
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xquery/xqueryExampleTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("xqueryExampleTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java
index 1908200..db52866 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java
@@ -16,30 +16,19 @@
*/
package org.apache.camel.component.xquery;
-import java.io.File;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
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.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists;
/**
*
*/
public class XQueryFromFileExceptionTest extends CamelTestSupport {
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/xquery");
- super.setUp();
- }
-
@Test
public void testXQueryFromFileExceptionOk() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
@@ -47,17 +36,14 @@ public class XQueryFromFileExceptionTest extends CamelTestSupport {
String body = "<person user='James'><firstName>James</firstName>"
+ "<lastName>Strachan</lastName><city>London</city></person>";
- template.sendBodyAndHeader("file:target/xquery", body, Exchange.FILE_NAME, "hello.xml");
+ template.sendBodyAndHeader(fileUri(), body, Exchange.FILE_NAME, "hello.xml");
assertMockEndpointsSatisfied();
Thread.sleep(500);
- File file = new File("target/xquery/hello.xml");
- assertFalse(file.exists(), "File should not exists " + file);
-
- file = new File("target/xquery/ok/hello.xml");
- assertTrue(file.exists(), "File should exists " + file);
+ assertFileNotExists(testFile("hello.xml"));
+ assertFileExists(testFile("ok/hello.xml"));
}
@Test
@@ -68,17 +54,14 @@ public class XQueryFromFileExceptionTest extends CamelTestSupport {
// the last tag is not ended properly
String body = "<person user='James'><firstName>James</firstName>"
+ "<lastName>Strachan</lastName><city>London</city></person";
- template.sendBodyAndHeader("file:target/xquery", body, Exchange.FILE_NAME, "hello2.xml");
+ template.sendBodyAndHeader(fileUri(), body, Exchange.FILE_NAME, "hello2.xml");
assertMockEndpointsSatisfied();
Thread.sleep(500);
- File file = new File("target/xquery/hello2.xml");
- assertFalse(file.exists(), "File should not exists " + file);
-
- file = new File("target/xquery/error/hello2.xml");
- assertTrue(file.exists(), "File should exists " + file);
+ assertFileNotExists(testFile("hello2.xml"));
+ assertFileExists(testFile("error/hello2.xml"));
}
@Override
@@ -86,7 +69,7 @@ public class XQueryFromFileExceptionTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/xquery?moveFailed=error&move=ok")
+ from(fileUri("?moveFailed=error&move=ok"))
.onException(Exception.class)
.to("mock:error")
.end()
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java
index 3e37396..f5f2aa3 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java
@@ -22,10 +22,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
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;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -39,7 +37,7 @@ public class XQueryFromFileTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBodyAndHeader("file:target/xquery", "<mail><subject>Hey</subject><body>Hello world!</body></mail>",
+ template.sendBodyAndHeader(fileUri(), "<mail><subject>Hey</subject><body>Hello world!</body></mail>",
Exchange.FILE_NAME, "body.xml");
assertMockEndpointsSatisfied();
@@ -54,18 +52,11 @@ public class XQueryFromFileTest extends CamelTestSupport {
}
@Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/xquery");
- super.setUp();
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/xquery")
+ from(fileUri())
.to("xquery:org/apache/camel/component/xquery/transform.xquery")
.to("mock:result");
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java
index 9453d1d..e6e4e69 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java
@@ -20,11 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
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;
-
/**
*
*/
@@ -40,11 +37,11 @@ public class XQueryLanguageFromFileTest extends CamelTestSupport {
other.expectedMessageCount(1);
other.message(0).body(String.class).contains("Bye World");
- template.sendBodyAndHeader("file:target/xquery",
+ template.sendBodyAndHeader(fileUri(),
"<mail from=\"davsclaus@apache.org\"><subject>Hey</subject><body>Hello World!</body></mail>",
Exchange.FILE_NAME, "claus.xml");
- template.sendBodyAndHeader("file:target/xquery",
+ template.sendBodyAndHeader(fileUri(),
"<mail from=\"janstey@apache.org\"><subject>Hey</subject><body>Bye World!</body></mail>",
Exchange.FILE_NAME, "janstey.xml");
@@ -52,18 +49,11 @@ public class XQueryLanguageFromFileTest extends CamelTestSupport {
}
@Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/xquery");
- super.setUp();
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file:target/xquery")
+ from(fileUri())
.choice()
.when().xquery("/mail/@from = 'davsclaus@apache.org'")
.convertBodyTo(String.class)
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java
index 238db77..cd5936e 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.xquery;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
public class XQueryNullHeaderTest extends CamelSpringTestSupport {
@@ -50,7 +50,7 @@ public class XQueryNullHeaderTest extends CamelSpringTestSupport {
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xquery/xqueryExampleTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("xqueryExampleTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
index 5aaa470..ab05435 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
public class XQueryWithExplicitTypeTest extends CamelSpringTestSupport {
protected MockEndpoint raleighEndpoint;
@@ -46,7 +46,7 @@ public class XQueryWithExplicitTypeTest extends CamelSpringTestSupport {
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xquery/xqueryWithExplicitTypeContext.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("xqueryWithExplicitTypeContext.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java
index 54bbd78..9acae42 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.component.xslt.saxon.XsltSaxonComponent;
import org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -41,7 +41,7 @@ public class SaxonXsltComponentConfigurationTest extends CamelSpringTestSupport
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("SaxonXsltComponentConfigurationTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java
index 654e224..6ed42b1 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.xslt.saxon.XsltSaxonComponent;
import org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -60,7 +60,7 @@ public class SaxonXsltEndpointConfigurationTest extends CamelSpringTestSupport {
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return newAppContext("SaxonXsltEndpointConfigurationTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java
index 4185631..b9b2b6a 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
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.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -32,7 +31,7 @@ public class SaxonXsltTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xslt/camelXsltContext.xml");
+ return newAppContext("camelXsltContext.xml");
}
@Test
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java
index faeaed5..ef3d8e5 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.xslt.extensions;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
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;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -30,7 +29,7 @@ public class SaxonSpringExtensionFunctionsTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/xslt/extensions/camelXsltContext.xml");
+ return newAppContext("camelXsltContext.xml");
}
@Test
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonTest.java
index ee75338..9ff47ba 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonTest.java
@@ -17,13 +17,12 @@
package org.apache.camel.language.xpath;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class XPathHeaderEnableSaxonTest extends XPathHeaderTest {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/language/xpath/XPathHeaderEnableSaxonTest.xml");
+ return newAppContext("XPathHeaderEnableSaxonTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java
index 8df3917..23c3743 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class XPathHeaderTest extends CamelSpringTestSupport {
@@ -57,7 +56,7 @@ public class XPathHeaderTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/language/xpath/XPathHeaderTest.xml");
+ return newAppContext("XPathHeaderTest.xml");
}
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
index 65ac405..95cd2eb 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
@@ -23,8 +23,9 @@ import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
@@ -32,6 +33,7 @@ import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
* Tests that verify the usage of default settings in the XPath language by declaring a bean called xpath in the
* registry
*/
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class XPathLanguageDefaultSettingsTest extends CamelSpringTestSupport {
private static final String KEY = XPathFactory.DEFAULT_PROPERTY_NAME + ":" + "http://java.sun.com/jaxp/xpath/dom";
@@ -64,7 +66,7 @@ public class XPathLanguageDefaultSettingsTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.xml");
+ return newAppContext("XPathLanguageDefaultSettingsTest.xml");
}
@Test
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
index 9d4cb93..12cb98d 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
@@ -25,8 +25,9 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
*/
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class XPathLanguageTest extends CamelSpringTestSupport {
private static final String KEY = XPathFactory.DEFAULT_PROPERTY_NAME + ":" + "http://java.sun.com/jaxp/xpath/dom";
@@ -66,7 +68,7 @@ public class XPathLanguageTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/language/xpath/XPathLanguageTest.xml");
+ return newAppContext("XPathLanguageTest.xml");
}
@Test
[camel] 01/02: Fix CS
Posted by gn...@apache.org.
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 ea78642395d17d247a7faa96c0d485f17a6d32b4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 23 17:58:19 2021 +0100
Fix CS
---
.../netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java | 2 +-
.../camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java | 8 ++++----
.../camel/component/netty/UnsharableCodecsConflictsTest.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
index 6c81982..73347fd 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
@@ -37,7 +37,7 @@ public class NettyUseSharedWorkerThreadPoolManyRoutesTest extends BaseNettyTest
@BindToRegistry("sharedBoss")
private EventLoopGroup sharedWorkerGroup = new NettyServerBossPoolBuilder().withBossCount(20).build();
private int before;
- protected AvailablePortFinder.Port[] ports;
+ private AvailablePortFinder.Port[] ports;
@Override
protected boolean useJmx() {
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java
index 8266abc..1cd4441 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java
@@ -27,16 +27,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class NettyUseSharedWorkerThreadPoolTest extends BaseNettyTest {
+ @RegisterExtension
+ protected AvailablePortFinder.Port port2 = AvailablePortFinder.find();
+ @RegisterExtension
+ protected AvailablePortFinder.Port port3 = AvailablePortFinder.find();
@BindToRegistry("sharedServerPool")
private EventLoopGroup sharedWorkerServerGroup
= new NettyWorkerPoolBuilder().withWorkerCount(2).withName("NettyServer").build();
@BindToRegistry("sharedClientPool")
private EventLoopGroup sharedWorkerClientGroup
= new NettyWorkerPoolBuilder().withWorkerCount(3).withName("NettyClient").build();
- @RegisterExtension
- protected AvailablePortFinder.Port port2 = AvailablePortFinder.find();
- @RegisterExtension
- protected AvailablePortFinder.Port port3 = AvailablePortFinder.find();
@Override
protected boolean useJmx() {
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java
index 884fbae..1455466 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java
@@ -42,11 +42,11 @@ public class UnsharableCodecsConflictsTest extends BaseNettyTest {
private static final Logger LOG = LoggerFactory.getLogger(UnsharableCodecsConflictsTest.class);
- private Processor processor = new P();
-
@RegisterExtension
protected AvailablePortFinder.Port port2 = AvailablePortFinder.find();
+ private Processor processor = new P();
+
@BindToRegistry("length-decoder")
private ChannelHandlerFactory decoder = ChannelHandlerFactories.newLengthFieldBasedFrameDecoder(1048576, 0, 4, 0, 4);