This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 9436b42f39a (chores) camel-endpointdsl: use unique data directory for tests 9436b42f39a is described below commit 9436b42f39af3e4328e6158b1264c4bd43caf7f4 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Mon Aug 1 17:13:33 2022 +0200 (chores) camel-endpointdsl: use unique data directory for tests This helps prevents misbehaved tests from causing other tests to fail --- .../apache/camel/builder/endpoint/BaseEndpointDslTest.java | 6 ++++++ .../org/apache/camel/builder/endpoint/DumpRoutesTest.java | 7 ++++--- .../camel/builder/endpoint/FileConsumeCharsetTest.java | 12 +++++------- .../org/apache/camel/builder/endpoint/FileDelayTest.java | 9 +++++---- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java index 09ffe16f34d..17452c618ee 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.builder.endpoint; +import java.util.concurrent.ThreadLocalRandom; + import org.apache.camel.CamelContext; import org.apache.camel.test.junit5.CamelTestSupport; @@ -28,4 +30,8 @@ public abstract class BaseEndpointDslTest extends CamelTestSupport { context.disableJMX(); return context; } + + protected static String generateUniquePath(Class<?> clazz) { + return "target/data/files" + clazz.getSimpleName() + ThreadLocalRandom.current().nextInt(0, 100); + } } diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java index 3323b95672c..336818f0cfe 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java @@ -28,8 +28,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; public class DumpRoutesTest extends BaseEndpointDslTest { - private static final Logger LOG = LoggerFactory.getLogger(DumpRoutesTest.class); + private static final String TEST_DATA_DIR = BaseEndpointDslTest.generateUniquePath(DumpRoutesTest.class); @Test public void testDumpModelAsXml() throws Exception { @@ -39,7 +39,8 @@ public class DumpRoutesTest extends BaseEndpointDslTest { LOG.info(xml); assertTrue(xml - .contains("file://target/data/files/?delay=2&delete=true&maxMessagesPerPoll=1&timeUnit=SECONDS")); + .contains( + "file://" + TEST_DATA_DIR + "?delay=2&delete=true&maxMessagesPerPoll=1&timeUnit=SECONDS")); assertTrue(xml.contains("mock://result")); } @@ -47,7 +48,7 @@ public class DumpRoutesTest extends BaseEndpointDslTest { protected RouteBuilder createRouteBuilder() throws Exception { return new EndpointRouteBuilder() { public void configure() throws Exception { - from(file("target/data/files/").delay(2).timeUnit(TimeUnit.SECONDS).delete(true).maxMessagesPerPoll(1)) + from(file(TEST_DATA_DIR).delay(2).timeUnit(TimeUnit.SECONDS).delete(true).maxMessagesPerPoll(1)) .routeId("myRoute") .convertBodyTo(String.class) .to(mock("result")); diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java index f8b77686865..6e4927c3400 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java @@ -28,17 +28,15 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; -/** - * - */ public class FileConsumeCharsetTest extends BaseEndpointDslTest { + private static final String TEST_DATA_DIR = BaseEndpointDslTest.generateUniquePath(FileConsumeCharsetTest.class); @Override @BeforeEach public void setUp() throws Exception { - TestSupport.deleteDirectory("target/data/files"); + TestSupport.deleteDirectory(TEST_DATA_DIR); super.setUp(); - template.sendBodyAndHeader("file://target/data/files?charset=UTF-8", "Hello World \u4f60\u597d", Exchange.FILE_NAME, + template.sendBodyAndHeader("file://" + TEST_DATA_DIR + "?charset=UTF-8", "Hello World \u4f60\u597d", Exchange.FILE_NAME, "report.txt"); } @@ -54,14 +52,14 @@ public class FileConsumeCharsetTest extends BaseEndpointDslTest { oneExchangeDone.matchesWaitTime(); // file should not exists - assertFalse(new File("target/data/files/report.txt").exists(), "File should been deleted"); + assertFalse(new File(TEST_DATA_DIR, "report.txt").exists(), "File should been deleted"); } @Override protected RouteBuilder createRouteBuilder() throws Exception { return new EndpointRouteBuilder() { public void configure() throws Exception { - from(file("target/data/files/").initialDelay(0).delay(10).fileName("report.txt").delete(true).charset("UTF-8")) + from(file(TEST_DATA_DIR).initialDelay(0).delay(10).fileName("report.txt").delete(true).charset("UTF-8")) .convertBodyTo(String.class) .to(mock("result")); } diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java index 47377e44c93..8fc753069a8 100644 --- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java +++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java @@ -27,14 +27,15 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; public class FileDelayTest extends BaseEndpointDslTest { + private static final String TEST_DATA_DIR = BaseEndpointDslTest.generateUniquePath(BaseEndpointDslTest.class); @Override @BeforeEach public void setUp() throws Exception { - deleteDirectory("target/data/files"); + deleteDirectory(TEST_DATA_DIR); super.setUp(); - template.sendBodyAndHeader("file://target/data/files", "Hello World", Exchange.FILE_NAME, "hello.txt"); - template.sendBodyAndHeader("file://target/data/files", "Bye World", Exchange.FILE_NAME, "bye.txt"); + template.sendBodyAndHeader("file://" + TEST_DATA_DIR, "Hello World", Exchange.FILE_NAME, "hello.txt"); + template.sendBodyAndHeader("file://" + TEST_DATA_DIR, "Bye World", Exchange.FILE_NAME, "bye.txt"); } @Test @@ -50,7 +51,7 @@ public class FileDelayTest extends BaseEndpointDslTest { protected RouteBuilder createRouteBuilder() throws Exception { return new EndpointRouteBuilder() { public void configure() throws Exception { - from(file("target/data/files/").delay(2).timeUnit(TimeUnit.SECONDS).delete(true).maxMessagesPerPoll(1)) + from(file(TEST_DATA_DIR).delay(2).timeUnit(TimeUnit.SECONDS).delete(true).maxMessagesPerPoll(1)) .convertBodyTo(String.class) .to(mock("result")); }