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 260a867b79c390dc18c14694af723710595539b9
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Mar 12 20:17:43 2021 +0100
Enable concurrent testing in camel-spring-xml
---
components/camel-spring-xml/pom.xml | 32 +++++++++++++-
.../properties/SpringPropertiesComponentTest.java | 4 +-
.../apache/camel/spring/DefaultJMXAgentTest.java | 51 ++--------------------
.../apache/camel/spring/DisableJmxAgentTest.java | 12 ++++-
.../spring/SendMessageOnRouteStartAndStopTest.java | 12 +----
.../org/apache/camel/spring/SpringTestSupport.java | 42 ++++++++++++++++++
.../camel/spring/StartAndStopEventNotifier.java | 8 +++-
.../camel/spring/example/PojoVmConsumerTest.java | 2 +
.../SpringFileAntPathMatcherFileFilterTest.java | 7 ---
.../file/SpringFileConsumerPreMoveIssueTest.java | 4 ++
.../spring/file/SpringFileConsumerPreMoveTest.java | 3 ++
.../spring/file/SpringFileLanguageCBRTest.java | 14 ++----
.../camel/spring/file/SpringFileRouteTest.java | 11 +----
.../file/SpringSimpleFileNameWithQuoteTest.java | 9 +---
...urceTransactedWithFileLocalOnExceptionTest.java | 4 +-
...ataSourceTransactedWithFileOnExceptionTest.java | 10 ++---
...onalClientDataSourceTransactedWithFileTest.java | 16 ++-----
.../issues/FileWireTapWithXMLPayloadIssueTest.java | 6 +--
...ngPropertyPlaceholderFileEndpointIssueTest.java | 4 +-
.../issues/SpringRenameFileOnCommitIssueTest.java | 12 +----
...ualCamelContextManagedAutoAssignedNameTest.java | 4 +-
.../management/DualCamelContextManagedTest.java | 4 +-
.../ManagedEndpointInjectRefEndpointTest.java | 11 ++---
.../spring/management/ManagedRefEndpointTest.java | 11 ++---
.../SpringJmxDumpCBRRoutesAsXmlTest.java | 6 +--
...pringJmxDumpRoutesAsXmlIncludeHostNameTest.java | 4 +-
.../management/SpringJmxDumpRoutesAsXmlTest.java | 2 +-
.../SpringJmxEndpointInjectBeanRefTest.java | 6 ++-
.../SpringJmxEndpointInjectBeanRefTwoTest.java | 6 ++-
.../SpringJmxEndpointInjectBeanTest.java | 6 ++-
.../SpringJmxRecipientListRegisterAlwaysTest.java | 12 ++---
.../management/SpringJmxRecipientListTest.java | 12 ++---
.../management/SpringManagedCamelContextTest.java | 29 +++---------
.../SpringManagedCustomProcessorTest.java | 3 +-
.../SpringManagedNamePatternFixedTest.java | 5 ---
.../management/SpringManagedNamePatternTest.java | 5 ---
.../management/SpringManagedResourceTest.java | 5 ---
...edRouteRemoveContextScopedErrorHandlerTest.java | 5 ---
...emoveRouteAndContextScopedErrorHandlerTest.java | 5 ---
...agedRouteRemoveRouteScopedErrorHandlerTest.java | 5 ---
.../management/SpringManagedSanitizeTest.java | 5 ---
.../management/SpringManagedSedaEndpointTest.java | 3 +-
.../SpringManagedStatisticsLevelOffTest.java | 5 ---
...SpringManagedStatisticsLevelRoutesOnlyTest.java | 5 ---
...uageWithSpringPropertyPlaceholderRouteTest.java | 13 ++----
.../FileConsumerSpringSchedulerTest.java | 10 +----
.../DualSpringManagedThreadsThreadPoolTest.java | 6 ++-
.../SpringManagedThreadsThreadPoolTest.java | 3 +-
.../camel/spring/processor/SpringSagaTest.java | 2 +
.../processor/SpringSamplingThrottlerTest.java | 28 ++++++++++++
.../SpringShutdownCompleteAllTasksTest.java | 8 +++-
.../processor/SpringSplitSubUnitOfWorkTest.java | 5 ++-
.../camel/spring/processor/SpringTestHelper.java | 22 +++++++++-
.../FileConsumerIdempotentLoadStoreTest.java | 34 ++++++---------
.../idempotent/FileConsumerIdempotentTest.java | 10 ++---
.../properties/SpringPropertiesComponentTest.xml | 2 +-
.../SpringTokenXMLPairNamespaceSplitTest.xml | 2 +-
.../camel/language/SpringXMLTokenSplitTest.xml | 2 +-
...ingFileAntPathMatcherFileFilterTest-context.xml | 2 +-
.../file/SpringFileConsumerPreMoveIssueTest.xml | 4 +-
.../spring/file/SpringFileConsumerPreMoveTest.xml | 4 +-
.../spring/file/SpringFileLanguageCBRTest.xml | 2 +-
.../spring/file/SpringFileRouteTest-context.xml | 2 +-
.../SpringSimpleFileNameWithQuoteTest-context.xml | 2 +-
.../CamelContextModelErrorHandlerIssueTest.xml | 4 +-
.../camel/spring/issues/CustomIdIssueTest.xml | 4 +-
.../issues/FileWireTapWithXMLPayloadIssueTest.xml | 2 +-
.../issues/SpringRenameFileOnCommitIssueTest.xml | 2 +-
.../apache/camel/spring/issues/myprop.properties | 2 +-
.../management/SpringJmxDumpCBRRouteAsXmlTest.xml | 4 +-
...dualCamelContextManagedAutoAssignedNameTest.xml | 4 +-
.../management/dualCamelContextManagedTest.xml | 4 +-
.../spring/placeholder/bundle-context.properties | 4 +-
.../FileConsumerSpringSchedulerTest.xml | 2 +-
.../processor/ShutdownCompleteAllTasksTest.xml | 4 +-
.../ShutdownCompleteCurrentTaskOnlyTest.xml | 2 +-
...etterChannelUseOriginalExchangeWithFileTest.xml | 2 +-
.../processor/SpringSplitSubUnitOfWorkTest.xml | 2 -
...xml => FileConsumerIdempotentLoadStoreTest.xml} | 4 +-
.../idempotent/fileConsumerIdempotentTest.xml | 4 +-
.../processor/interceptSendToEndpointDynamic.xml | 2 +-
81 files changed, 310 insertions(+), 332 deletions(-)
diff --git a/components/camel-spring-xml/pom.xml
b/components/camel-spring-xml/pom.xml
index f4c0242..f6b3bf3 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -40,6 +40,10 @@
javax.xml.bind*;version="[2.2,3.0)",
*
</camel.osgi.import>
+
+ <camel.surefire.forkCount>4</camel.surefire.forkCount>
+ <camel.surefire.parallel>false</camel.surefire.parallel>
+ <camel.surefire.forkTimeout>1800</camel.surefire.forkTimeout>
</properties>
<dependencies>
@@ -321,9 +325,35 @@
<configuration>
<excludes>
<exclude>${platform.skip.tests}</exclude>
+ <exclude>**/*IntegrationTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <reuseForks>true</reuseForks>
+ <systemPropertyVariables>
+
<visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>${platform.skip.tests}</exclude>
</excludes>
-
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+ <includes>
+ <include>**/*IntegrationTest.java</include>
+ </includes>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<!-- unpack sources which are needed for the scheme generator -->
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
index 12bce9a..1b6e843 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/component/properties/SpringPropertiesComponentTest.java
@@ -27,12 +27,12 @@ public class SpringPropertiesComponentTest extends
BaseSpringPropertiesComponent
@Test
public void testResolutionOfPlaceholdersOnFactoryBean() {
- final CamelContextFactoryBean factoryBean =
applicationContext.getBean("&camel-1",
+ final CamelContextFactoryBean factoryBean =
applicationContext.getBean("&myCamelContext",
CamelContextFactoryBean.class);
assertEquals("{{autoStartup}}", factoryBean.getAutoStartup());
- final CamelContext context = applicationContext.getBean("camel-1",
CamelContext.class);
+ final CamelContext context =
applicationContext.getBean("myCamelContext", CamelContext.class);
assertTrue(context.isAutoStartup());
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
index 1cc2f15..3508528 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
@@ -16,22 +16,13 @@
*/
package org.apache.camel.spring;
-import java.lang.management.ManagementFactory;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import javax.management.MBeanServer;
import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -39,53 +30,20 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class DefaultJMXAgentTest extends SpringTestSupport {
- protected MBeanServerConnection mbsc;
-
@Override
protected boolean useJmx() {
return true;
}
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- releaseMBeanServers();
- super.setUp();
-
- await().atMost(3, TimeUnit.SECONDS).ignoreExceptions().until(() -> {
- mbsc = getMBeanConnection();
- return true;
- });
- }
-
- @Override
- @AfterEach
- public void tearDown() throws Exception {
- try {
- releaseMBeanServers();
- } finally {
- mbsc = null;
- super.tearDown();
- }
- }
-
- protected void releaseMBeanServers() {
- List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
-
- for (MBeanServer server : servers) {
- MBeanServerFactory.releaseMBeanServer(server);
- }
- }
-
@Test
public void testQueryMbeans() throws Exception {
// whats the numbers before, because the JVM can have left overs when
unit testing
- int before = mbsc.queryNames(new ObjectName("org.apache.camel" +
":type=consumers,*"), null).size();
+ int before = getMBeanConnection().queryNames(new
ObjectName("org.apache.camel" + ":type=consumers,*"), null).size();
// start route should enlist the consumer to JMX
context.getRouteController().startRoute("foo");
- int after = mbsc.queryNames(new ObjectName("org.apache.camel" +
":type=consumers,*"), null).size();
+ int after = getMBeanConnection().queryNames(new
ObjectName("org.apache.camel" + ":type=consumers,*"), null).size();
assertTrue(after > before, "Should have added consumer to JMX, before:
" + before + ", after: " + after);
}
@@ -96,10 +54,7 @@ public class DefaultJMXAgentTest extends SpringTestSupport {
}
protected MBeanServerConnection getMBeanConnection() throws Exception {
- if (mbsc == null) {
- mbsc = ManagementFactory.getPlatformMBeanServer();
- }
- return mbsc;
+ return
context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
index 759471c..8d4bbd5 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.spring;
+import java.lang.management.ManagementFactory;
+
import javax.management.ObjectName;
import org.junit.jupiter.api.Test;
@@ -23,6 +25,7 @@ import
org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Test that verifies JMX can be disabled via Spring.
@@ -39,14 +42,19 @@ public class DisableJmxAgentTest extends
DefaultJMXAgentTest {
@Override
@Test
public void testQueryMbeans() throws Exception {
+ assertThrows(NullPointerException.class, () -> getMBeanConnection());
+
// whats the numbers before, because the JVM can have left overs when
unit testing
- int before = mbsc.queryNames(new ObjectName("org.apache.camel" +
":type=consumers,*"), null).size();
+ int before = ManagementFactory.getPlatformMBeanServer()
+ .queryNames(new ObjectName("org.apache.camel" +
":type=consumers,*"), null).size();
// start route should enlist the consumer to JMX if JMX was enabled
context.getRouteController().startRoute("foo");
- int after = mbsc.queryNames(new ObjectName("org.apache.camel" +
":type=consumers,*"), null).size();
+ assertThrows(NullPointerException.class, () -> getMBeanConnection());
+ int after = ManagementFactory.getPlatformMBeanServer()
+ .queryNames(new ObjectName("org.apache.camel" +
":type=consumers,*"), null).size();
assertEquals(before, after, "Should not have added consumer to JMX");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
index f975192..8206663 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.spring;
-import java.io.File;
-
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -25,8 +23,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
*
*/
@@ -34,8 +30,6 @@ public class SendMessageOnRouteStartAndStopTest extends
SpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- deleteDirectory("target/startandstop");
-
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/SendMessageOnRouteStartAndStopTest.xml");
}
@@ -46,8 +40,7 @@ public class SendMessageOnRouteStartAndStopTest extends
SpringTestSupport {
// the event notifier should have send a message to the file endpoint
// so the start file is created on startup
- File start = new File("target/startandstop/start.txt");
- assertTrue(start.exists(), "Start file should exist on startup");
+ assertFileExists(testFile("start.txt"));
}
@Override
@@ -57,8 +50,7 @@ public class SendMessageOnRouteStartAndStopTest extends
SpringTestSupport {
// the event notifier should have send a message to the file endpoint
// so the stop file is created on shutdown
- File start = new File("target/startandstop/stop.txt");
- assertTrue(start.exists(), "Stop file should exist on shutdown");
+ assertFileExists(testFile("stop.txt"));
}
@Test
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringTestSupport.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringTestSupport.java
index 0eb9e42..03829e6 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringTestSupport.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringTestSupport.java
@@ -23,6 +23,9 @@ import java.util.List;
import java.util.Set;
import java.util.StringJoiner;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.impl.DefaultCamelContext;
@@ -37,6 +40,17 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
+import static
org.apache.camel.management.DefaultManagementAgent.DEFAULT_DOMAIN;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.KEY_CONTEXT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.KEY_NAME;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.KEY_TYPE;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_COMPONENT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_CONTEXT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ROUTE;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_STEP;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_THREAD_POOL;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public abstract class SpringTestSupport extends ContextTestSupport {
@@ -47,6 +61,8 @@ public abstract class SpringTestSupport extends
ContextTestSupport {
@BeforeEach
@Override
public void setUp() throws Exception {
+ deleteTestDirectory();
+
// we want SpringTestSupport to startup faster and not use JMX by
default and should stop seda quicker
System.setProperty("CamelSedaPollTimeout", "10");
DefaultCamelContext.setDisableJmx(!useJmx());
@@ -151,4 +167,30 @@ public abstract class SpringTestSupport extends
ContextTestSupport {
return context;
}
+ public ObjectName getContextObjectName() throws
MalformedObjectNameException {
+ return getCamelObjectName(TYPE_CONTEXT, context.getName());
+ }
+
+ public ObjectName getCamelObjectName(String type, String name) throws
MalformedObjectNameException {
+ String quote;
+ switch (type) {
+ case TYPE_CONTEXT:
+ case TYPE_COMPONENT:
+ case TYPE_ENDPOINT:
+ case TYPE_PROCESSOR:
+ case TYPE_ROUTE:
+ case TYPE_THREAD_POOL:
+ case TYPE_STEP:
+ quote = "\"";
+ break;
+ default:
+ quote = "";
+ break;
+ }
+ String on = DEFAULT_DOMAIN + ":"
+ + KEY_CONTEXT + "=" + context.getManagementName() + ","
+ + KEY_TYPE + "=" + type + ","
+ + KEY_NAME + "=" + quote + name + quote;
+ return ObjectName.getInstance(on);
+ }
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
index 162d116..172d871 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java
@@ -16,9 +16,12 @@
*/
package org.apache.camel.spring;
+import java.nio.file.Path;
+
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.TestSupport;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.Type;
import org.apache.camel.support.EventNotifierSupport;
@@ -50,14 +53,15 @@ public class StartAndStopEventNotifier extends
EventNotifierSupport implements C
// Note: there is also a CamelContextStartingEvent which is send first
// and then Camel is starting. And when all that is done this event
// (CamelContextStartedEvent) is send
+ Path directory =
TestSupport.testDirectory(SendMessageOnRouteStartAndStopTest.class, false);
if (event.getType() == Type.CamelContextStarted) {
LOG.info("Sending a message on startup...");
- template.sendBody("file:target/startandstop/start.txt",
"Starting");
+ template.sendBody("file:" + directory + "?fileName=start.txt",
"Starting");
} else if (event.getType() == Type.CamelContextStopping) {
// Note: there is also a CamelContextStoppedEvent which is send
// afterwards, when Camel has been fully stopped.
LOG.info("Sending a message on stopping...");
- template.sendBody("file:target/startandstop/stop.txt", "Stopping");
+ template.sendBody("file:" + directory + "?fileName=stop.txt",
"Stopping");
}
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
index c7b8ad9..e4ca624 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
@@ -20,9 +20,11 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+@ResourceLock("VmComponent")
public class PojoVmConsumerTest extends SpringTestSupport {
protected MockEndpoint resultEndpoint;
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
index 692c0e4..23efde1 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringRunWithTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -50,10 +49,4 @@ public class SpringFileAntPathMatcherFileFilterTest extends
SpringRunWithTestSup
result.assertIsSatisfied();
}
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/antpathmatcher");
- super.setUp();
- }
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java
index 9c51a16..6d4c660 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.java
@@ -28,4 +28,8 @@ public class SpringFileConsumerPreMoveIssueTest extends
FileConsumerPreMoveIssue
return createSpringCamelContext(this,
"org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml");
}
+ static class MyPreMoveCheckerProcessor extends
FileConsumerPreMoveIssueTest.MyPreMoveCheckerProcessor {
+
+ }
+
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java
index 3fd87e5..3cb9964 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.java
@@ -28,4 +28,7 @@ public class SpringFileConsumerPreMoveTest extends
FileConsumerPreMoveTest {
return createSpringCamelContext(this,
"org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml");
}
+ public static class MyPreMoveCheckerProcessor extends
FileConsumerPreMoveTest.MyPreMoveCheckerProcessor {
+ }
+
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
index 8b678c3..31f1277 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileLanguageCBRTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring.file;
import org.apache.camel.Exchange;
import org.apache.camel.spring.SpringTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,20 +29,13 @@ public class SpringFileLanguageCBRTest extends
SpringTestSupport {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml");
}
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/cbr");
- super.setUp();
- }
-
@Test
public void testTxt() throws Exception {
getMockEndpoint("mock:txt").expectedMessageCount(1);
getMockEndpoint("mock:dat").expectedMessageCount(0);
getMockEndpoint("mock:other").expectedMessageCount(0);
- template.sendBodyAndHeader("file://target/cbr", "Hello World",
Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World",
Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -54,7 +46,7 @@ public class SpringFileLanguageCBRTest extends
SpringTestSupport {
getMockEndpoint("mock:dat").expectedMessageCount(1);
getMockEndpoint("mock:other").expectedMessageCount(0);
- template.sendBodyAndHeader("file://target/cbr", "Bye World",
Exchange.FILE_NAME, "bye.dat");
+ template.sendBodyAndHeader(fileUri(), "Bye World", Exchange.FILE_NAME,
"bye.dat");
assertMockEndpointsSatisfied();
}
@@ -65,7 +57,7 @@ public class SpringFileLanguageCBRTest extends
SpringTestSupport {
getMockEndpoint("mock:dat").expectedMessageCount(0);
getMockEndpoint("mock:other").expectedMessageCount(1);
- template.sendBodyAndHeader("file://target/cbr", "Hi World",
Exchange.FILE_NAME, "hi.foo");
+ template.sendBodyAndHeader(fileUri(), "Hi World", Exchange.FILE_NAME,
"hi.foo");
assertMockEndpointsSatisfied();
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
index aac8acc..bed77dd 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.spring.file;
-import java.io.File;
-
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -25,7 +23,6 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.file.FileEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringRunWithTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -46,7 +43,7 @@ public class SpringFileRouteTest extends
SpringRunWithTestSupport {
public void testMocksAreValid() throws Exception {
// lets check that our injected endpoint is valid
FileEndpoint fileEndpoint = assertIsInstanceOf(FileEndpoint.class,
inputFile);
- assertEquals(new File("target/test-default-inbox"),
fileEndpoint.getFile(), "File");
+ assertEquals(testDirectory().toFile(), fileEndpoint.getFile(), "File");
result.expectedBodiesReceived(expectedBody);
result.setResultWaitTime(5000);
@@ -56,10 +53,4 @@ public class SpringFileRouteTest extends
SpringRunWithTestSupport {
result.assertIsSatisfied();
}
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/test-default-inbox");
- super.setUp();
- }
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
index 6b60c11..e7670f8 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringRunWithTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -39,15 +38,9 @@ public class SpringSimpleFileNameWithQuoteTest extends
SpringRunWithTestSupport
result.expectedBodiesReceived(expectedBody);
result.expectedHeaderReceived("foo", "\"hello.txt\" abc");
- template.sendBodyAndHeader("file:target/foo", expectedBody,
Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri(), expectedBody,
Exchange.FILE_NAME, "hello.txt");
result.assertIsSatisfied();
}
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/foo");
- super.setUp();
- }
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
index 02162de..176150e 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest.java
@@ -27,12 +27,12 @@ public class
TransactionalClientDataSourceTransactedWithFileLocalOnExceptionTest
return new SpringRouteBuilder() {
public void configure() throws Exception {
- from("file://target/transacted/okay?initialDelay=0&delay=10")
+ from(fileUri("okay?initialDelay=0&delay=10"))
.transacted()
.setBody(constant("Tiger in
Action")).bean("bookService")
.setBody(constant("Elephant in
Action")).bean("bookService");
-
from("file://target/transacted/fail?initialDelay=0&delay=10&moveFailed=../failed")
+
from(fileUri("fail?initialDelay=0&delay=10&moveFailed=../failed"))
.onException(IllegalArgumentException.class)
.handled(false)
.to("mock:error")
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
index dbee11f..b6136f4 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileOnExceptionTest.java
@@ -31,7 +31,7 @@ public class
TransactionalClientDataSourceTransactedWithFileOnExceptionTest exte
@Test
public void testTransactionSuccess() throws Exception {
- template.sendBodyAndHeader("file://target/transacted/okay", "Hello
World", Exchange.FILE_NAME, "okay.txt");
+ template.sendBodyAndHeader(fileUri("okay"), "Hello World",
Exchange.FILE_NAME, "okay.txt");
await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
// wait for route to complete
@@ -46,9 +46,9 @@ public class
TransactionalClientDataSourceTransactedWithFileOnExceptionTest exte
error.expectedMessageCount(1);
error.message(0).header(Exchange.EXCEPTION_CAUGHT).isNotNull();
error.message(0).header(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class);
- error.expectedFileExists("target/transacted/failed/fail.txt");
+ error.expectedFileExists(testFile("failed/fail.txt"));
- template.sendBodyAndHeader("file://target/transacted/fail", "Hello
World", Exchange.FILE_NAME, "fail.txt");
+ template.sendBodyAndHeader(fileUri("fail"), "Hello World",
Exchange.FILE_NAME, "fail.txt");
// wait for route to complete
await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
@@ -66,12 +66,12 @@ public class
TransactionalClientDataSourceTransactedWithFileOnExceptionTest exte
public void configure() throws Exception {
onException(IllegalArgumentException.class).handled(false).to("mock:error");
- from("file://target/transacted/okay?initialDelay=0&delay=10")
+ from(fileUri("okay?initialDelay=0&delay=10"))
.transacted()
.setBody(constant("Tiger in
Action")).bean("bookService")
.setBody(constant("Elephant in
Action")).bean("bookService");
-
from("file://target/transacted/fail?initialDelay=0&delay=10&moveFailed=../failed")
+
from(fileUri("fail?initialDelay=0&delay=10&moveFailed=../failed"))
.transacted()
.setBody(constant("Tiger in
Action")).bean("bookService")
.setBody(constant("Donkey in
Action")).bean("bookService");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
index e6fb771..f330819 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTransactedWithFileTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.awaitility.Awaitility.await;
@@ -29,16 +28,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class TransactionalClientDataSourceTransactedWithFileTest extends
TransactionClientDataSourceSupport {
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/transacted");
- super.setUp();
- }
-
@Test
public void testTransactionSuccess() throws Exception {
- template.sendBodyAndHeader("file://target/transacted/okay", "Hello
World", Exchange.FILE_NAME, "okay.txt");
+ template.sendBodyAndHeader(fileUri("okay"), "Hello World",
Exchange.FILE_NAME, "okay.txt");
await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
// wait for route to complete
@@ -49,7 +41,7 @@ public class
TransactionalClientDataSourceTransactedWithFileTest extends Transac
@Test
public void testTransactionRollback() throws Exception {
- template.sendBodyAndHeader("file://target/transacted/fail", "Hello
World", Exchange.FILE_NAME, "fail.txt");
+ template.sendBodyAndHeader(fileUri("fail"), "Hello World",
Exchange.FILE_NAME, "fail.txt");
await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
// should not be able to process the file so we still got 1 book
as we did from the start
@@ -62,12 +54,12 @@ public class
TransactionalClientDataSourceTransactedWithFileTest extends Transac
protected RouteBuilder createRouteBuilder() throws Exception {
return new SpringRouteBuilder() {
public void configure() throws Exception {
- from("file://target/transacted/okay?initialDelay=0&delay=10")
+ from(fileUri("okay?initialDelay=0&delay=10"))
.transacted()
.setBody(constant("Tiger in
Action")).bean("bookService")
.setBody(constant("Elephant in
Action")).bean("bookService");
- from("file://target/transacted/fail?initialDelay=0&delay=10")
+ from(fileUri("fail?initialDelay=0&delay=10"))
.transacted()
.setBody(constant("Tiger in
Action")).bean("bookService")
.setBody(constant("Donkey in
Action")).bean("bookService");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
index f6cdf8b..ff5cd78 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.java
@@ -31,12 +31,10 @@ public class FileWireTapWithXMLPayloadIssueTest extends
SpringTestSupport {
@Override
@BeforeEach
public void setUp() throws Exception {
- deleteDirectory("target/xmldata");
super.setUp();
-
- template.sendBodyAndHeader("file://target/xmldata",
+ template.sendBodyAndHeader(fileUri(),
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- +
"<sample>\n<test>Helloooo</test>\n</sample>",
+ +
"<sample>\n<test>Helloooo</test>\n</sample>",
Exchange.FILE_NAME, "hello.xml");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
index 54d52a6..5c1d5b3 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringPropertyPlaceholderFileEndpointIssueTest.java
@@ -31,11 +31,9 @@ public class SpringPropertyPlaceholderFileEndpointIssueTest
extends SpringTestSu
@Test
public void testSpring() throws Exception {
- deleteDirectory("target/issue");
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.expectedFileExists("target/issue/foo.txt");
+ mock.expectedFileExists(testFile("foo.txt"));
template.sendBodyAndHeader("direct:start", "Hello World", "foo",
"foo.txt");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
index f3e2d05..18d48ad 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.java
@@ -19,30 +19,22 @@ package org.apache.camel.spring.issues;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringRenameFileOnCommitIssueTest extends SpringTestSupport {
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/renameissue");
- super.setUp();
- }
-
@Test
public void testFileRenameFileOnCommitIssue() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.expectedFileExists("target/renameissue/.camel/hello.xml");
+ mock.expectedFileExists(testFile(".camel/hello.xml"));
String body
= "<?xml version=\"1.0\"?><persons
xmlns=\"http://foo.com/bar\";><person name=\"James\"/><person
name=\"Claus\"/></persons>";
- template.sendBodyAndHeader("file://target/renameissue", body,
Exchange.FILE_NAME, "hello.xml");
+ template.sendBodyAndHeader(fileUri(), body, Exchange.FILE_NAME,
"hello.xml");
assertMockEndpointsSatisfied();
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
index 0172c5b..c0e643d 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
@@ -73,10 +73,10 @@ public class DualCamelContextManagedAutoAssignedNameTest
extends DualCamelContex
} else if (name.contains("mock://mock2")) {
String id = (String) mbeanServer.getAttribute(on, "CamelId");
ids2.add(id);
- } else if (name.contains("file://target/route1")) {
+ } else if
(name.contains("file://target/data/DualCamelContextManagedAutoAssignedNameTest/route1"))
{
String id = (String) mbeanServer.getAttribute(on, "CamelId");
ids1.add(id);
- } else if (name.contains("file://target/route2")) {
+ } else if
(name.contains("file://target/data/DualCamelContextManagedAutoAssignedNameTest/route2"))
{
String id = (String) mbeanServer.getAttribute(on, "CamelId");
ids2.add(id);
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
index 86a828f..f4e17c7 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
@@ -76,10 +76,10 @@ public class DualCamelContextManagedTest extends
SpringTestSupport {
} else if (name.contains("mock://mock2")) {
String id = (String) mbeanServer.getAttribute(on, "CamelId");
assertEquals("camel-B", id);
- } else if (name.contains("file://target/route1")) {
+ } else if
(name.contains("file://target/data/DualCamelContextManagedTest/route1")) {
String id = (String) mbeanServer.getAttribute(on, "CamelId");
assertEquals("camel-A", id);
- } else if (name.contains("file://target/route2")) {
+ } else if
(name.contains("file://target/data/DualCamelContextManagedTestroute2")) {
String id = (String) mbeanServer.getAttribute(on, "CamelId");
assertEquals("camel-B", id);
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
index 65a69bf..3d93d3c 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
@@ -47,13 +47,14 @@ public class ManagedEndpointInjectRefEndpointTest extends
SpringTestSupport {
return
context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
- @Test
- public void testRef() throws Exception {
+ @Override
+ protected boolean canRunOnThisPlatform() {
// JMX tests dont work well on AIX CI servers (hangs them)
- if (isPlatform("aix")) {
- return;
- }
+ return !isPlatform("aix");
+ }
+ @Test
+ public void testRef() throws Exception {
// fire a message to get it running
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("foo").expectedMessageCount(1);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
index 6cb5386..c4b250f 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
@@ -46,13 +46,14 @@ public class ManagedRefEndpointTest extends
SpringTestSupport {
return
context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
- @Test
- public void testRef() throws Exception {
+ @Override
+ protected boolean canRunOnThisPlatform() {
// JMX tests dont work well on AIX CI servers (hangs them)
- if (isPlatform("aix")) {
- return;
- }
+ return !isPlatform("aix");
+ }
+ @Test
+ public void testRef() throws Exception {
// fire a message to get it running
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("foo").expectedMessageCount(1);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
index df412fc..0245389 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
@@ -47,14 +47,14 @@ public class SpringJmxDumpCBRRoutesAsXmlTest extends
SpringTestSupport {
public void testJmxDumpCBRRoutesAsXml() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=context,name=\"camel-1\"");
+ ObjectName on = getContextObjectName();
String xml = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null,
null);
assertNotNull(xml);
log.info(xml);
assertTrue(xml.contains("myRoute"), xml);
- assertTrue(xml.contains("<when id=\"when1\">"));
- assertTrue(xml.contains("<otherwise id=\"otherwise1\">"));
+ assertTrue(xml.matches("[\\S\\s]*<when id=\"when[0-9]+\">[\\S\\s]*"));
+ assertTrue(xml.matches("[\\S\\s]*<otherwise
id=\"otherwise[0-9]+\">[\\S\\s]*"));
assertTrue(xml.contains("<route customId=\"true\" id=\"myRoute\">")
|| xml.contains("<route id=\"myRoute\" customId=\"true\">"));
assertTrue(xml.contains("<choice customId=\"true\" id=\"myChoice\">")
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
index a71efc1..c5a15d4 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
@@ -48,7 +48,9 @@ public class SpringJmxDumpRoutesAsXmlIncludeHostNameTest
extends SpringTestSuppo
public void testJmxDumpRoutesAsXml() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+ ObjectName on = ObjectName
+ .getInstance("org.apache.camel:context=localhost/" +
context.getManagementName() + ",type=context,name=\""
+ + context.getName() + "\"");
String xml = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null,
null);
assertNotNull(xml);
log.info(xml);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
index 84dabd9..91edd96 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
@@ -47,7 +47,7 @@ public class SpringJmxDumpRoutesAsXmlTest extends
SpringTestSupport {
public void testJmxDumpRoutesAsXml() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=context,name=\"camel-1\"");
+ ObjectName on = getContextObjectName();
String xml = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null,
null);
assertNotNull(xml);
log.info(xml);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
index 55ceda5..de5bd98 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
@@ -24,6 +24,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_COMPONENT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -47,10 +49,10 @@ public class SpringJmxEndpointInjectBeanRefTest extends
SpringTestSupport {
public void testJmxEndpointInjectBean() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=components,name=\"seda\"");
+ ObjectName on = getCamelObjectName(TYPE_COMPONENT, "seda");
assertTrue(mbeanServer.isRegistered(on));
- on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"seda://foo\"");
+ on = getCamelObjectName(TYPE_ENDPOINT, "seda://foo");
assertTrue(mbeanServer.isRegistered(on));
String uri = (String) mbeanServer.getAttribute(on, "EndpointUri");
assertEquals("seda://foo", uri);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
index 3935b6e..79f8775 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
@@ -24,6 +24,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_COMPONENT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -48,10 +50,10 @@ public class SpringJmxEndpointInjectBeanRefTwoTest extends
SpringTestSupport {
public void testJmxEndpointInjectBean() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=components,name=\"seda\"");
+ ObjectName on = getCamelObjectName(TYPE_COMPONENT, "seda");
assertTrue(mbeanServer.isRegistered(on));
- on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"seda://foo\"");
+ on = getCamelObjectName(TYPE_ENDPOINT, "seda://foo");
assertTrue(mbeanServer.isRegistered(on));
String uri = (String) mbeanServer.getAttribute(on, "EndpointUri");
assertEquals("seda://foo", uri);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
index 8eb0c0f..a69c75f 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
@@ -24,6 +24,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_COMPONENT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
import static org.junit.jupiter.api.Assertions.*;
public class SpringJmxEndpointInjectBeanTest extends SpringTestSupport {
@@ -46,10 +48,10 @@ public class SpringJmxEndpointInjectBeanTest extends
SpringTestSupport {
public void testJmxEndpointInjectBean() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=components,name=\"seda\"");
+ ObjectName on = getCamelObjectName(TYPE_COMPONENT, "seda");
assertTrue(mbeanServer.isRegistered(on));
- on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"seda://foo\"");
+ on = getCamelObjectName(TYPE_ENDPOINT, "seda://foo");
assertTrue(mbeanServer.isRegistered(on));
String uri = (String) mbeanServer.getAttribute(on, "EndpointUri");
assertEquals("seda://foo", uri);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
index 6b30a4d..b15227f 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
@@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_COMPONENT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
import static org.junit.jupiter.api.Assertions.*;
public class SpringJmxRecipientListRegisterAlwaysTest extends
SpringTestSupport {
@@ -61,21 +63,21 @@ public class SpringJmxRecipientListRegisterAlwaysTest
extends SpringTestSupport
MBeanServer mbeanServer = getMBeanServer();
// this endpoint is part of the route and should be registered
- ObjectName name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"direct://a\"");
+ ObjectName name = getCamelObjectName(TYPE_ENDPOINT, "direct://a");
assertTrue(mbeanServer.isRegistered(name), "Should be registered");
// endpoints added after routes has been started is now also registered
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"mock://x\"");
+ name = getCamelObjectName(TYPE_ENDPOINT, "mock://x");
assertTrue(mbeanServer.isRegistered(name), "Should be registered");
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"mock://y\"");
+ name = getCamelObjectName(TYPE_ENDPOINT, "mock://y");
assertTrue(mbeanServer.isRegistered(name), "Should be registered");
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"mock://z\"");
+ name = getCamelObjectName(TYPE_ENDPOINT, "mock://z");
assertTrue(mbeanServer.isRegistered(name), "Should be registered");
// however components is always registered
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=components,name=\"mock\"");
+ name = getCamelObjectName(TYPE_COMPONENT, "mock");
assertTrue(mbeanServer.isRegistered(name), "Should be registered");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
index 17dcad9..858e342 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
@@ -25,6 +25,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_COMPONENT;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
import static org.junit.jupiter.api.Assertions.*;
public class SpringJmxRecipientListTest extends SpringTestSupport {
@@ -60,21 +62,21 @@ public class SpringJmxRecipientListTest extends
SpringTestSupport {
MBeanServer mbeanServer = getMBeanServer();
// this endpoint is part of the route and should be registered
- ObjectName name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"direct://a\"");
+ ObjectName name = getCamelObjectName(TYPE_ENDPOINT, "direct://a");
assertTrue(mbeanServer.isRegistered(name), "Should be registered");
// endpoints added after routes has been started is by default not
registered
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"mock://x\"");
+ name = getCamelObjectName(TYPE_ENDPOINT, "mock://x");
assertFalse(mbeanServer.isRegistered(name), "Should not be
registered");
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"mock://y\"");
+ name = getCamelObjectName(TYPE_ENDPOINT, "mock://y");
assertFalse(mbeanServer.isRegistered(name), "Should not be
registered");
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"mock://z\"");
+ name = getCamelObjectName(TYPE_ENDPOINT, "mock://z");
assertFalse(mbeanServer.isRegistered(name), "Should not be
registered");
// however components is always registered
- name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=components,name=\"mock\"");
+ name = getCamelObjectName(TYPE_COMPONENT, "mock");
assertTrue(mbeanServer.isRegistered(name), "Should be registered");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
index 87c221c..03aecf0 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
@@ -38,26 +38,17 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class SpringManagedCamelContextTest extends ManagedCamelContextTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedCamelContextTest.xml");
}
@Test
public void testFindEipNames() throws Exception {
- // JMX tests dont work well on AIX CI servers (hangs them)
- if (isPlatform("aix")) {
- return;
- }
-
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=19-camel-1,type=context,name=\"camel-1\"");
+ assertEquals("19-" + context.getName(), context.getManagementName());
+ ObjectName on = getContextObjectName();
assertTrue(mbeanServer.isRegistered(on), "Should be registered");
@SuppressWarnings("unchecked")
@@ -72,15 +63,11 @@ public class SpringManagedCamelContextTest extends
ManagedCamelContextTest {
@Test
public void testFindEips() throws Exception {
- // JMX tests dont work well on AIX CI servers (hangs them)
- if (isPlatform("aix")) {
- return;
- }
-
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=19-camel-1,type=context,name=\"camel-1\"");
+ assertEquals("19-" + context.getName(), context.getManagementName());
+ ObjectName on = getContextObjectName();
assertTrue(mbeanServer.isRegistered(on), "Should be registered");
@SuppressWarnings("unchecked")
@@ -96,15 +83,11 @@ public class SpringManagedCamelContextTest extends
ManagedCamelContextTest {
@Test
public void testListEips() throws Exception {
- // JMX tests dont work well on AIX CI servers (hangs them)
- if (isPlatform("aix")) {
- return;
- }
-
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=19-camel-1,type=context,name=\"camel-1\"");
+ assertEquals("19-" + context.getName(), context.getManagementName());
+ ObjectName on = getContextObjectName();
assertTrue(mbeanServer.isRegistered(on), "Should be registered");
TabularData data = (TabularData) mbeanServer.invoke(on, "listEips",
null, null);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
index 1737572..11fdc27 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
@@ -30,6 +30,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedResource;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Disabled("Flaky test")
@@ -52,7 +53,7 @@ public class SpringManagedCustomProcessorTest extends
SpringTestSupport {
@Test
public void testManageCustomProcessor() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=processors,name=\"custom\"");
+ ObjectName on = getCamelObjectName(TYPE_PROCESSOR, "custom");
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("mock:result").expectedHeaderReceived("foo", "hey");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
index be4b9d7..01b64e8 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedNamePatternFixedTest extends
ManagedNamePatternFixedTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
index 98c7300..697c02b 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedNamePatternTest extends ManagedNamePatternTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedNamePatternTest.xml");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
index 747ad94..9fd121f 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedResourceTest extends ManagedResourceTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedResourceTest.xml");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
index dc1505f..30a08e7 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedRouteRemoveContextScopedErrorHandlerTest extends
ManagedRouteRemoveContextScopedErrorHandlerTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
index 791d337..06e4550 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
@@ -25,11 +25,6 @@ public class
SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest
extends ManagedRouteRemoveRouteAndContextScopedErrorHandlerTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
index 8a6bbee..a0663af 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedRouteRemoveRouteScopedErrorHandlerTest extends
ManagedRouteRemoveRouteScopedErrorHandlerTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
index 680a553..59601df 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedSanitizeTest extends ManagedSanitizeTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedSanitizeTest.xml");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
index f68e930..46d1f47 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_ENDPOINT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -59,7 +60,7 @@ public class SpringManagedSedaEndpointTest extends
SpringTestSupport {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName name =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"seda://start\"");
+ ObjectName name = getCamelObjectName(TYPE_ENDPOINT, "seda://start");
String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
assertEquals("seda://start", uri);
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
index a585c5b..10b5c88 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedStatisticsLevelOffTest extends
ManagedStatisticsLevelOffTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.xml");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
index 13e60e0..35f0084 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
@@ -24,11 +24,6 @@ import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedStatisticsLevelRoutesOnlyTest extends
ManagedStatisticsLevelRoutesOnlyTest {
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/management/ManagedStatisticsLevelRoutesOnlyTest.xml");
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
index 264541d..acb5fd8 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.spring.SpringRunWithTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
@@ -37,19 +36,12 @@ public class
SimpleLanguageWithSpringPropertyPlaceholderRouteTest extends Spring
@Produce("direct:startSimple")
protected ProducerTemplate template;
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/outBox");
- deleteDirectory("target/outBoxSimple");
- }
-
@Test
@DirtiesContext
public void replaceSimpleExpression() throws Exception {
template.sendBody("Test");
- await().atMost(2, TimeUnit.SECONDS).untilAsserted(() ->
assertDirectoryExists("target/outBoxSimple/"));
+ await().atMost(2, TimeUnit.SECONDS).untilAsserted(() ->
assertDirectoryExists(testDirectory("outBoxSimple")));
}
@Disabled(value = "disabled because of
https://jira.springsource.org/browse/SPR-7593";)
@@ -58,7 +50,8 @@ public class
SimpleLanguageWithSpringPropertyPlaceholderRouteTest extends Spring
public void replaceExpression() throws Exception {
template.sendBody("direct:start", "Test");
- await().atMost(2, TimeUnit.SECONDS).untilAsserted(() ->
assertFileExists("target/outBox/" + getTestFileName()));
+ await().atMost(2, TimeUnit.SECONDS)
+ .untilAsserted(() ->
assertFileExists(testDirectory("outBox").resolve(getTestFileName())));
}
private String getTestFileName() {
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
index f36cd23..def3d42 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring.pollingconsumer;
import org.apache.camel.Exchange;
import org.apache.camel.spring.SpringTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,18 +30,11 @@ public class FileConsumerSpringSchedulerTest extends
SpringTestSupport {
"org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml");
}
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- deleteDirectory("target/file/spring");
- super.setUp();
- }
-
@Test
public void testSpringScheduler() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
- template.sendBodyAndHeader("file:target/file/spring", "Hello World",
Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World",
Exchange.FILE_NAME, "hello.txt");
context.getRouteController().startRoute("foo");
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
index 27b9ec4..0b5d967 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static
org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_THREAD_POOL;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class DualSpringManagedThreadsThreadPoolTest extends SpringTestSupport {
@@ -43,7 +44,8 @@ public class DualSpringManagedThreadsThreadPoolTest extends
SpringTestSupport {
public void testDualManagedThreadPool() throws Exception {
MBeanServer mbeanServer =
context.getManagementStrategy().getManagementAgent().getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=threadpools,name=\"myPool\"");
+ ObjectName on = ObjectName
+ .getInstance("org.apache.camel:context=" +
context.getManagementName() + ",type=threadpools,name=\"myPool\"");
Integer corePoolSize = (Integer) mbeanServer.getAttribute(on,
"CorePoolSize");
assertEquals(2, corePoolSize.intValue());
@@ -67,7 +69,7 @@ public class DualSpringManagedThreadsThreadPoolTest extends
SpringTestSupport {
String routeId = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals(null, routeId);
- on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=threadpools,name=\"myOtherPool\"");
+ on = getCamelObjectName(TYPE_THREAD_POOL, "myOtherPool");
corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(7, corePoolSize.intValue());
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
index a48f3b2..834006f 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
@@ -39,7 +39,8 @@ public class SpringManagedThreadsThreadPoolTest extends
SpringTestSupport {
public void testManagedThreadPool() throws Exception {
MBeanServer mbeanServer =
context.getManagementStrategy().getManagementAgent().getMBeanServer();
- ObjectName on =
ObjectName.getInstance("org.apache.camel:context=camel-1,type=threadpools,name=\"myPool\"");
+ ObjectName on = ObjectName
+ .getInstance("org.apache.camel:context=" +
context.getManagementName() + ",type=threadpools,name=\"myPool\"");
Integer corePoolSize = (Integer) mbeanServer.getAttribute(on,
"CorePoolSize");
assertEquals(2, corePoolSize.intValue());
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
index 94d74a9..74ed22a 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSagaTest.java
@@ -20,9 +20,11 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+@Isolated
public class SpringSagaTest extends ContextTestSupport {
@Test
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
index a03092f..1f3cc6f 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSamplingThrottlerTest.java
@@ -28,4 +28,32 @@ public class SpringSamplingThrottlerTest extends
SamplingThrottlerTest {
return createSpringCamelContext(this,
"org/apache/camel/spring/processor/samplingThrottler.xml");
}
+ @Override
+ public void testSamplingFromExchangeStream() throws Exception {
+ try {
+ super.testSamplingFromExchangeStream();
+ } catch (Exception e) {
+ throw new Exception("Error", e);
+ }
+ }
+
+ @Override
+ public void testBurstySampling() throws Exception {
+ super.testBurstySampling();
+ }
+
+ @Override
+ public void testSendLotsOfMessagesSimultaneouslyButOnly3GetThrough()
throws Exception {
+ super.testSendLotsOfMessagesSimultaneouslyButOnly3GetThrough();
+ }
+
+ @Override
+ public void testSamplingUsingMessageFrequency() throws Exception {
+ super.testSamplingUsingMessageFrequency();
+ }
+
+ @Override
+ public void testSamplingUsingMessageFrequencyViaDSL() throws Exception {
+ super.testSamplingUsingMessageFrequencyViaDSL();
+ }
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java
index 547eacc..65a17c2 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringShutdownCompleteAllTasksTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.spring.processor;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.camel.CamelContext;
import org.apache.camel.processor.ShutdownCompleteAllTasksTest;
@@ -25,6 +28,9 @@ public class SpringShutdownCompleteAllTasksTest extends
ShutdownCompleteAllTasks
@Override
protected CamelContext createCamelContext() throws Exception {
- return createSpringCamelContext(this,
"org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml");
+ Map<String, Object> beans = new HashMap<>();
+ beans.put("myProcessor", new
ShutdownCompleteAllTasksTest.MyProcessor());
+ return createSpringCamelContext(this,
+
"org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml", beans);
}
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java
index bcc82bb..8df56fc 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.spring.processor;
+import java.util.Collections;
+
import org.apache.camel.CamelContext;
import org.apache.camel.processor.SplitSubUnitOfWorkTest;
@@ -25,6 +27,7 @@ public class SpringSplitSubUnitOfWorkTest extends
SplitSubUnitOfWorkTest {
@Override
protected CamelContext createCamelContext() throws Exception {
- return createSpringCamelContext(this,
"org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml");
+ return createSpringCamelContext(this,
"org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml",
+ Collections.singletonMap("myProcessor", new MyProcessor()));
}
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
index cbbca65..7237562 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
@@ -16,9 +16,13 @@
*/
package org.apache.camel.spring.processor;
+import java.util.Collections;
+import java.util.Map;
+
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Service;
+import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -29,8 +33,15 @@ public final class SpringTestHelper {
}
public static CamelContext createSpringCamelContext(ContextTestSupport
test, String classpathUri) throws Exception {
+ return createSpringCamelContext(test, classpathUri,
Collections.emptyMap());
+ }
+
+ public static CamelContext createSpringCamelContext(ContextTestSupport
test, String classpathUri, Map<String, Object> beans)
+ throws Exception {
test.setUseRouteBuilder(false);
+ boolean isNoStart = DefaultCamelContext.isNoStart();
+ DefaultCamelContext.setNoStart(true);
final AbstractXmlApplicationContext applicationContext = new
ClassPathXmlApplicationContext(classpathUri);
test.setCamelContextService(new Service() {
public void start() {
@@ -42,6 +53,15 @@ public final class SpringTestHelper {
}
});
- return SpringCamelContext.springCamelContext(applicationContext, true);
+ SpringCamelContext context =
SpringCamelContext.springCamelContext(applicationContext, false);
+ for (Map.Entry<String, Object> entry : beans.entrySet()) {
+ context.getRegistry().bind(entry.getKey(), entry.getValue());
+ }
+ DefaultCamelContext.setNoStart(isNoStart);
+ if (!isNoStart) {
+ context.start();
+ }
+
+ return context;
}
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
index a709ab7..a9c0a13 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.camel.spring.processor.idempotent;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
@@ -37,28 +38,21 @@ public class FileConsumerIdempotentLoadStoreTest extends
ContextTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
- return createSpringCamelContext(this,
"org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml");
+ return createSpringCamelContext(this,
+
"org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml");
}
@SuppressWarnings("unchecked")
@Override
@BeforeEach
public void setUp() throws Exception {
- deleteDirectory("target/fileidempotent");
- createDirectory("target/fileidempotent");
-
- File file = new File("target/fileidempotent/.filestore.dat");
- FileOutputStream fos = new FileOutputStream(file);
-
- // insert existing name to the file repo, so we should skip this file
- String name = FileUtil.normalizePath(new
File("target/fileidempotent/report.txt").getAbsolutePath());
- fos.write(name.getBytes());
- fos.write(LS.getBytes());
-
- fos.close();
-
super.setUp();
+ Path file = testFile(".filestore.dat");
+ try (Writer w = Files.newBufferedWriter(file)) {
+ w.write(testFile("report.txt").toAbsolutePath().toString() + LS);
+ }
+
// add a file to the repo
repo = context.getRegistry().lookupByNameAndType("fileStore",
IdempotentRepository.class);
}
@@ -66,8 +60,8 @@ public class FileConsumerIdempotentLoadStoreTest extends
ContextTestSupport {
@Test
public void testIdempotentLoad() throws Exception {
// send two files (report.txt exists already in idempotent repo)
- template.sendBodyAndHeader("file://target/fileidempotent/", "Hello
World", Exchange.FILE_NAME, "report.txt");
- template.sendBodyAndHeader("file://target/fileidempotent/", "Bye
World", Exchange.FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World",
Exchange.FILE_NAME, "report.txt");
+ template.sendBodyAndHeader(fileUri(), "Bye World", Exchange.FILE_NAME,
"report2.txt");
// consume the file the first time
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -77,10 +71,10 @@ public class FileConsumerIdempotentLoadStoreTest extends
ContextTestSupport {
// wait for the exchange to be done, as it only append to idempotent
repo after success
oneExchangeDone.matchesMockWaitTime();
- String name = FileUtil.normalizePath(new
File("target/fileidempotent/report.txt").getAbsolutePath());
+ String name =
FileUtil.normalizePath(testFile("report.txt").toAbsolutePath().toString());
assertTrue(repo.contains(name), "Should contain file: " + name);
- String name2 = FileUtil.normalizePath(new
File("target/fileidempotent/report2.txt").getAbsolutePath());
+ String name2 =
FileUtil.normalizePath(testFile("report2.txt").toAbsolutePath().toString());
assertTrue(repo.contains(name2), "Should contain file: " + name2);
}
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
index 7b9873d..f8c2917 100644
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
+++
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
@@ -43,8 +43,6 @@ public class FileConsumerIdempotentTest extends
ContextTestSupport {
@Override
@BeforeEach
public void setUp() throws Exception {
- deleteDirectory("target/fileidempotent");
-
super.setUp();
repo = context.getRegistry().lookupByNameAndType("fileStore",
IdempotentRepository.class);
}
@@ -52,7 +50,7 @@ public class FileConsumerIdempotentTest extends
ContextTestSupport {
@Test
public void testIdempotent() throws Exception {
// send a file
- template.sendBodyAndHeader("file://target/fileidempotent/", "Hello
World", Exchange.FILE_NAME, "report.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World",
Exchange.FILE_NAME, "report.txt");
// consume the file the first time
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -67,14 +65,14 @@ public class FileConsumerIdempotentTest extends
ContextTestSupport {
mock.setResultMinimumWaitTime(50);
// move file back
- File file = new File("target/fileidempotent/done/report.txt");
- File renamed = new File("target/fileidempotent/report.txt");
+ File file = testFile("done/report.txt").toFile();
+ File renamed = testFile("report.txt").toFile();
file.renameTo(renamed);
// should NOT consume the file again, let 2 secs pass to let the
consumer try to consume it but it should not
assertMockEndpointsSatisfied();
- String name = FileUtil.normalizePath(new
File("target/fileidempotent/report.txt").getAbsolutePath());
+ String name =
FileUtil.normalizePath(testFile("report.txt").toAbsolutePath().toString());
assertTrue(repo.contains(name), "Should contain file: " + name);
}
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml
index fcbc478..33abef2 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/properties/SpringPropertiesComponentTest.xml
@@ -31,7 +31,7 @@
classpath:org/apache/camel/component/properties/cheese.properties"/>
</bean>
- <camelContext autoStartup="{{autoStartup}}"
xmlns="http://camel.apache.org/schema/spring";>
+ <camelContext autoStartup="{{autoStartup}}"
xmlns="http://camel.apache.org/schema/spring"; id="myCamelContext">
<route>
<from uri="direct:start"/>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml
index 8acb66c..26e2e94 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringTokenXMLPairNamespaceSplitTest.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from uri="file:target/data/pair?initialDelay=0&delay=10"/>
+ <from
uri="file:target/data/SpringTokenXMLPairNamespaceSplitTest/pair?initialDelay=0&delay=10"/>
<split>
<!-- split the file using XML tokenizer, where we grab the order tag,
and inherit the namespaces from the parent/root orders tag
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
index 813897e..81db26b 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/language/SpringXMLTokenSplitTest.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<camelContext xmlns="http://camel.apache.org/schema/spring";
xmlns:s="http:acme.com">
<route>
- <from uri="file:target/data/xtokenizer?initialDelay=0&delay=10"/>
+ <from
uri="file:target/data/SpringXMLTokenSplitTest/xtokenizer?initialDelay=0&delay=10"/>
<split>
<!-- split the file using XML tokenizer, where we grab the order tag,
and inject the namespaces declarations from its ancestor nodes -->
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
index 077ba79..ef4a74a 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
@@ -29,7 +29,7 @@
<template id="camelTemplate"/>
<!-- use myFilter as filter to allow setting ANT paths for which files
to scan for -->
- <endpoint id="myFileEndpoint"
uri="file://target/antpathmatcher?initialDelay=0&delay=10&recursive=true&filter=#myAntFilter"/>
+ <endpoint id="myFileEndpoint"
uri="file://target/data/SpringFileAntPathMatcherFileFilterTest?initialDelay=0&delay=10&recursive=true&filter=#myAntFilter"/>
<route>
<from uri="ref:myFileEndpoint"/>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml
index 56bd890..95d29cf 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveIssueTest.xml
@@ -26,12 +26,12 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from
uri="file://target/data/premove?initialDelay=0&delay=10&preMove=before/${file:name.noext}-moved.${file:ext}"/>
+ <from
uri="file://target/data/SpringFileConsumerPreMoveIssueTest?initialDelay=0&delay=10&preMove=before/${file:name.noext}-moved.${file:ext}"/>
<process ref="checker"/>
<to uri="mock:result"/>
</route>
</camelContext>
- <bean id="checker"
class="org.apache.camel.component.file.FileConsumerPreMoveIssueTest$MyPreMoveCheckerProcessor"/>
+ <bean id="checker"
class="org.apache.camel.spring.file.SpringFileConsumerPreMoveIssueTest$MyPreMoveCheckerProcessor"/>
</beans>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml
index 8a2765d..0483c41 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileConsumerPreMoveTest.xml
@@ -26,12 +26,12 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from
uri="file://target/data/premove?initialDelay=0&delay=10&preMove=work/work-${file:name}"/>
+ <from
uri="file://target/data/SpringFileConsumerPreMoveTest?initialDelay=0&delay=10&preMove=work/work-${file:name}"/>
<process ref="checker"/>
<to uri="mock:result"/>
</route>
</camelContext>
- <bean id="checker"
class="org.apache.camel.component.file.FileConsumerPreMoveTest$MyPreMoveCheckerProcessor"/>
+ <bean id="checker"
class="org.apache.camel.spring.file.SpringFileConsumerPreMoveTest$MyPreMoveCheckerProcessor"/>
</beans>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml
index c45657f..a7f4ca4 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileLanguageCBRTest.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from
uri="file://target/cbr?initialDelay=0&delay=10&delete=true"/>
+ <from
uri="file://target/data/SpringFileLanguageCBRTest?initialDelay=0&delay=10&delete=true"/>
<choice>
<when>
<simple>${file:ext} == 'txt'</simple>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
index 652e150..9c6b008 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
@@ -35,7 +35,7 @@
</camelContext>
<bean id="inputFile" class="org.apache.camel.component.file.FileEndpoint">
- <property name="file" value="target/test-default-inbox"/>
+ <property name="file" value="target/data/SpringFileRouteTest"/>
</bean>
<!-- END SNIPPET: example -->
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
index 1e1b87a..b336ce0 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest-context.xml
@@ -26,7 +26,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from uri="file://target/foo?initialDelay=0&delay=10"/>
+ <from
uri="file://target/data/SpringSimpleFileNameWithQuoteTest?initialDelay=0&delay=10"/>
<setHeader name="foo">
<simple>"${file:name}" abc</simple>
</setHeader>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml
index 349bf64..b96efbe 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CamelContextModelErrorHandlerIssueTest.xml
@@ -28,11 +28,11 @@
<when>
<xpath>/person/city = 'London'</xpath>
<log message="UK message"/>
- <to uri="file:target/messages/uk"/>
+ <to uri="file:target/data/CamelContextModelErrorHandlerIssueTest/uk"/>
</when>
<otherwise>
<log message="Other message"/>
- <to uri="file:target/messages/others"/>
+ <to
uri="file:target/data/CamelContextModelErrorHandlerIssueTest/others"/>
</otherwise>
</choice>
</route>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml
index 3035a36..16de22d 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/CustomIdIssueTest.xml
@@ -36,11 +36,11 @@
<when customId="true" id="UK">
<xpath>/person/city = 'London'</xpath>
<log message="UK message" customId="true" id="ukLog"/>
- <to uri="file:target/messages/uk" customId="true" id="ukOutput"/>
+ <to uri="file:target/data/CustomIdIssueTest/uk" customId="true"
id="ukOutput"/>
</when>
<otherwise>
<log message="Other message"/>
- <to uri="file:target/messages/others"/>
+ <to uri="file:target/data/CustomIdIssueTest/others"/>
</otherwise>
</choice>
</route>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml
index 449a88a..574aeaf 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/FileWireTapWithXMLPayloadIssueTest.xml
@@ -26,7 +26,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from uri="file://target/xmldata?initialDelay=0&delay=10"/>
+ <from
uri="file://target/data/FileWireTapWithXMLPayloadIssueTest?initialDelay=0&delay=10"/>
<convertBodyTo type="java.lang.String"/>
<wireTap uri="mock:wiretap"/>
<to uri="mock:result"/>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
index c30d56c..7f16e60 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringRenameFileOnCommitIssueTest.xml
@@ -27,7 +27,7 @@
<camelContext trace="true" xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from
uri="file://target/renameissue?initialDelay=0&delay=10&noop=false"/>
+ <from
uri="file://target/data/SpringRenameFileOnCommitIssueTest?initialDelay=0&delay=10&noop=false"/>
<setProperty name="PartitionID">
<xpath>//persons/person[1]/@name</xpath>
</setProperty>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/myprop.properties
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/myprop.properties
index 74009b2..f00b49c 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/myprop.properties
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/myprop.properties
@@ -17,6 +17,6 @@
inputQueue=direct:start
-outputFolder=target/issue
+outputFolder=target/data/SpringPropertyPlaceholderFileEndpointIssueTest
myCharset=utf-8
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml
index f413e33..664b25c 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml
@@ -33,10 +33,10 @@
<choice id="myChoice">
<when>
<xpath>/person/city = 'London'</xpath>
- <to uri="file:target/messages/uk"/>
+ <to uri="file:target/data/SpringJmxDumpCBRRouteAsXmlTest/uk"/>
</when>
<otherwise>
- <to uri="file:target/messages/others"/>
+ <to uri="file:target/data/SpringJmxDumpCBRRouteAsXmlTest/others"/>
</otherwise>
</choice>
</route>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml
index 51a9b02..0aba2b5 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedAutoAssignedNameTest.xml
@@ -26,7 +26,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
- <endpoint id="fromFile"
uri="file://target/route1?initialDelay=0&delay=10"/>
+ <endpoint id="fromFile"
uri="file://target/data/DualCamelContextManagedAutoAssignedNameTest/route1?initialDelay=0&delay=10"/>
<endpoint id="mock1" uri="mock:mock1"/>
<route id="route1">
@@ -38,7 +38,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
- <endpoint id="fromFile2"
uri="file://target/route2?initialDelay=0&delay=10"/>
+ <endpoint id="fromFile2"
uri="file://target/data/DualCamelContextManagedAutoAssignedNameTest/route2?initialDelay=0&delay=10"/>
<endpoint id="mock2" uri="mock:mock2"/>
<route id="route2">
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
index e8ffa01..d7c3c54 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
@@ -26,7 +26,7 @@
<camelContext id="camel-A" xmlns="http://camel.apache.org/schema/spring";>
- <endpoint id="fromFile"
uri="file://target/route1?initialDelay=0&delay=10"/>
+ <endpoint id="fromFile"
uri="file://target/data/DualCamelContextManagedTest/route1?initialDelay=0&delay=10"/>
<endpoint id="mock1" uri="mock:mock1"/>
<route id="route1">
@@ -38,7 +38,7 @@
<camelContext id="camel-B" xmlns="http://camel.apache.org/schema/spring";>
- <endpoint id="fromFile2"
uri="file://target/route2?initialDelay=0&delay=10"/>
+ <endpoint id="fromFile2"
uri="file://target/data/DualCamelContextManagedTest/route2?initialDelay=0&delay=10"/>
<endpoint id="mock2" uri="mock:mock2"/>
<route id="route2">
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
index a72ad19..2e0b140 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/placeholder/bundle-context.properties
@@ -16,7 +16,7 @@
## ---------------------------------------------------------------------------
fromEndpoint=direct:start
-toEndpoint=file://target/outBox?fileName=test-${date:now:yyyyMMdd}.txt
+toEndpoint=file://target/data/SimpleLanguageWithSpringPropertyPlaceholderRouteTest/outBox?fileName=test-${date:now:yyyyMMdd}.txt
fromEndpointSimple=direct:startSimple
-toEndpointSimple=file://target/outBoxSimple?fileName=test-$simple{date:now:yyyyMMdd}.txt
+toEndpointSimple=file://target/data/SimpleLanguageWithSpringPropertyPlaceholderRouteTest/outBoxSimple?fileName=test-$simple{date:now:yyyyMMdd}.txt
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml
index 94cdeea..35c2e89 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/pollingconsumer/FileConsumerSpringSchedulerTest.xml
@@ -28,7 +28,7 @@
<!-- START SNIPPET: example -->
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route id="foo" autoStartup="false">
- <from
uri="file:target/file/spring?scheduler=spring&scheduler.cron=0/2+*+*+*+*+?"/>
+ <from
uri="file:target/data/FileConsumerSpringSchedulerTest?scheduler=spring&scheduler.cron=0/2+*+*+*+*+?"/>
<to uri="log:result"/>
<to uri="mock:result"/>
</route>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
index 36e0721..16e36ee 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteAllTasksTest.xml
@@ -24,8 +24,6 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="myProcessor"
class="org.apache.camel.processor.ShutdownCompleteAllTasksTest$MyProcessor"/>
-
<bean id="shutdown"
class="org.apache.camel.impl.engine.DefaultShutdownStrategy">
<!-- give it 30 sec to shutdown -->
<property name="timeout" value="30"/>
@@ -35,7 +33,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<!-- let this route complete all its pending messages when asked to
shutdown -->
<route id="foo" autoStartup="false"
shutdownRunningTask="CompleteAllTasks">
- <from
uri="file:target/data/pending?initialDelay=0&delay=10&synchronous=true"/>
+ <from
uri="file:target/data/SpringShutdownCompleteAllTasksTest?initialDelay=0&delay=10&synchronous=true"/>
<delay><constant>1000</constant></delay>
<process ref="myProcessor"/>
<to uri="mock:bar"/>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
index 4f00a18..58489f6 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/ShutdownCompleteCurrentTaskOnlyTest.xml
@@ -31,7 +31,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route startupOrder="1" shutdownRunningTask="CompleteCurrentTaskOnly">
- <from
uri="file:target/data/pending?initialDelay=0&delay=10&synchronous=true"/>
+ <from
uri="file:target/data/SpringShutdownCompleteCurrentTaskOnlyTest?initialDelay=0&delay=10&synchronous=true"/>
<delay><constant>1000</constant></delay>
<to uri="seda:foo"/>
</route>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
index 71eeebb..8c5efc4 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
@@ -57,7 +57,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";
errorHandlerRef="dead">
<route>
- <from
uri="file://target/data/originalexchange?initialDelay=0&delay=10&noop=true"/>
+ <from
uri="file://target/data/SpringDeadLetterChannelUseOriginalBodyWithFileTest?initialDelay=0&delay=10&noop=true"/>
<transform><simple>${in.body} World</simple></transform>
<process ref="myThrowProcessor"/>
</route>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml
index 23c59fb..f439361 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringSplitSubUnitOfWorkTest.xml
@@ -24,8 +24,6 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="myProcessor"
class="org.apache.camel.processor.SplitSubUnitOfWorkTest$MyProcessor"/>
-
<!-- START SNIPPET: e1 -->
<camelContext errorHandlerRef="dlc"
xmlns="http://camel.apache.org/schema/spring";>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml
similarity index 86%
copy from
components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
copy to
components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml
index 2002d93..7af0744 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentLoadStoreTest.xml
@@ -28,7 +28,7 @@
<!-- this is our file based idempotent store configured to use the
.filestore.dat as file -->
<bean id="fileStore"
class="org.apache.camel.support.processor.idempotent.FileIdempotentRepository">
<!-- the filename for the store -->
- <property name="fileStore"
value="target/fileidempotent/.filestore.dat"/>
+ <property name="fileStore"
value="target/data/FileConsumerIdempotentLoadStoreTest/.filestore.dat"/>
<!-- the max filesize in bytes for the file. Camel will trunk and
flush the cache
if the file gets bigger -->
<property name="maxFileStoreSize" value="512000"/>
@@ -38,7 +38,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from
uri="file://target/fileidempotent/?initialDelay=0&delay=10&idempotent=true&idempotentRepository=#fileStore&move=done/${file:name}"/>
+ <from
uri="file://target/data/FileConsumerIdempotentLoadStoreTest/?initialDelay=0&delay=10&idempotent=true&idempotentRepository=#fileStore&move=done/${file:name}"/>
<to uri="mock:result"/>
</route>
</camelContext>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
index 2002d93..e6585d3 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/idempotent/fileConsumerIdempotentTest.xml
@@ -28,7 +28,7 @@
<!-- this is our file based idempotent store configured to use the
.filestore.dat as file -->
<bean id="fileStore"
class="org.apache.camel.support.processor.idempotent.FileIdempotentRepository">
<!-- the filename for the store -->
- <property name="fileStore"
value="target/fileidempotent/.filestore.dat"/>
+ <property name="fileStore"
value="target/data/FileConsumerIdempotentTest/.filestore.dat"/>
<!-- the max filesize in bytes for the file. Camel will trunk and
flush the cache
if the file gets bigger -->
<property name="maxFileStoreSize" value="512000"/>
@@ -38,7 +38,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
- <from
uri="file://target/fileidempotent/?initialDelay=0&delay=10&idempotent=true&idempotentRepository=#fileStore&move=done/${file:name}"/>
+ <from
uri="file://target/data/FileConsumerIdempotentTest/?initialDelay=0&delay=10&idempotent=true&idempotentRepository=#fileStore&move=done/${file:name}"/>
<to uri="mock:result"/>
</route>
</camelContext>
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml
index 40c6566..33f71bf 100644
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml
+++
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/interceptSendToEndpointDynamic.xml
@@ -35,7 +35,7 @@
<route>
<from uri="direct:first"/>
- <to uri="file://target/foo"/>
+ <to
uri="file://target/data/SpringInterceptSendToEndpointSkipTest"/>
<to uri="mock:result"/>
</route>
