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
commit 199d0cb9d05eb02b319626a2cecb85ff0ab3184d Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu Apr 18 09:43:24 2024 +0200 CAMEL-20686: avoid using unsafe shared resources --- .../FileProducerCharsetUTFtoISOConfiguredTest.java | 17 +++++++++-------- .../FileProducerCharsetUTFtoISOConvertBodyToTest.java | 18 ++++++++++-------- .../file/FileProducerCharsetUTFtoUTFTest.java | 18 ++++++++---------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConfiguredTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConfiguredTest.java index d2ef4decdf4..ebfe3643519 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConfiguredTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConfiguredTest.java @@ -27,23 +27,24 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ class FileProducerCharsetUTFtoISOConfiguredTest extends ContextTestSupport { private static final String DATA = "ABC\u00e6"; + private static final String INPUT_FILE + = "input." + FileProducerCharsetUTFtoISOConfiguredTest.class.getSimpleName() + ".txt"; + private static final String OUTPUT_FILE + = "output." + FileProducerCharsetUTFtoISOConfiguredTest.class.getSimpleName() + ".txt"; @Test void testFileProducerCharsetUTFtoISO() throws Exception { - try (OutputStream fos = Files.newOutputStream(testFile("input.txt"))) { + try (OutputStream fos = Files.newOutputStream(testFile(INPUT_FILE))) { fos.write(DATA.getBytes(StandardCharsets.UTF_8)); } assertTrue(oneExchangeDone.matchesWaitTime()); - assertFileExists(testFile("output.txt")); - byte[] data = Files.readAllBytes(testFile("output.txt")); + assertFileExists(testFile(OUTPUT_FILE)); + byte[] data = Files.readAllBytes(testFile(OUTPUT_FILE)); assertEquals(DATA, new String(data, StandardCharsets.ISO_8859_1)); } @@ -53,8 +54,8 @@ class FileProducerCharsetUTFtoISOConfiguredTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() { - from(fileUri("?initialDelay=0&delay=10&charset=utf-8&fileName=input.txt")) - .to(fileUri("?fileName=output.txt&charset=iso-8859-1")); + fromF(fileUri("?initialDelay=0&delay=10&charset=utf-8&fileName=%s"), INPUT_FILE) + .toF(fileUri("?fileName=%s&charset=iso-8859-1"), OUTPUT_FILE); } }; } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConvertBodyToTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConvertBodyToTest.java index 9dfab1de6e9..5b44ac00bf1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConvertBodyToTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoISOConvertBodyToTest.java @@ -35,16 +35,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -/** - * - */ class FileProducerCharsetUTFtoISOConvertBodyToTest extends ContextTestSupport { private static final String DATA = "ABC\u00e6"; + private static final String INPUT_FILE + = "input." + FileProducerCharsetUTFtoISOConvertBodyToTest.class.getSimpleName() + ".txt"; + private static final String OUTPUT_FILE + = "output." + FileProducerCharsetUTFtoISOConvertBodyToTest.class.getSimpleName() + ".txt"; + @BeforeEach void writeTestData() { - try (OutputStream fos = Files.newOutputStream(testFile("input.txt"))) { + try (OutputStream fos = Files.newOutputStream(testFile(INPUT_FILE))) { fos.write(DATA.getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { fail("The test cannot run due to: " + e.getMessage()); @@ -54,7 +56,7 @@ class FileProducerCharsetUTFtoISOConvertBodyToTest extends ContextTestSupport { @AfterEach void cleanupFile() { try { - Files.delete(testFile("output.txt")); + Files.delete(testFile(OUTPUT_FILE)); } catch (IOException e) { fail("The test cannot run due to an error cleaning up: " + e.getMessage()); } @@ -64,7 +66,7 @@ class FileProducerCharsetUTFtoISOConvertBodyToTest extends ContextTestSupport { void testFileProducerCharsetUTFtoISOConvertBodyTo() throws Exception { assertTrue(oneExchangeDone.matchesWaitTime()); - final Path outputFile = testFile("output.txt"); + final Path outputFile = testFile(OUTPUT_FILE); Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> assertFileExists(outputFile)); Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> assertTrue(Files.size(outputFile) > 0)); @@ -80,12 +82,12 @@ class FileProducerCharsetUTFtoISOConvertBodyToTest extends ContextTestSupport { @Override public void configure() { // the input file is in utf-8 - from(fileUri("?initialDelay=0&delay=10&fileName=input.txt&charset=utf-8")) + fromF(fileUri("?initialDelay=0&delay=10&fileName=%s&charset=utf-8"), INPUT_FILE) // now convert the input file from utf-8 to iso-8859-1 .convertBodyTo(byte[].class, "iso-8859-1") // and write the file using that encoding .setProperty(Exchange.CHARSET_NAME, header("someCharsetHeader")) - .to(fileUri("?fileName=output.txt")); + .toF(fileUri("?fileName=%s"), OUTPUT_FILE); } }; } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java index 9f85da59eb4..5341889da04 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFtoUTFTest.java @@ -24,29 +24,27 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.ObjectHelper; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - * - */ -@Isolated class FileProducerCharsetUTFtoUTFTest extends ContextTestSupport { private static final String DATA = "ABC\u00e6"; + private static final String INPUT_FILE = "input." + FileProducerCharsetUTFtoUTFTest.class.getSimpleName() + ".txt"; + private static final String OUTPUT_FILE = "output." + FileProducerCharsetUTFtoUTFTest.class.getSimpleName() + ".txt"; + @Test void testFileProducerCharsetUTFtoUTF() throws Exception { byte[] source = DATA.getBytes(StandardCharsets.UTF_8); - try (OutputStream fos = Files.newOutputStream(testFile("input.txt"))) { + try (OutputStream fos = Files.newOutputStream(testFile(INPUT_FILE))) { fos.write(source); } assertTrue(oneExchangeDone.matchesWaitTime()); - assertFileExists(testFile("output.txt")); - byte[] target = Files.readAllBytes(testFile("output.txt")); + assertFileExists(testFile(OUTPUT_FILE)); + byte[] target = Files.readAllBytes(testFile(OUTPUT_FILE)); assertTrue(ObjectHelper.equalByteArray(source, target)); } @@ -56,8 +54,8 @@ class FileProducerCharsetUTFtoUTFTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from(fileUri("?initialDelay=0&delay=10&fileName=input.txt")) - .to(fileUri("?fileName=output.txt&charset=utf-8")); + fromF(fileUri("?initialDelay=0&delay=10&fileName=%s"), INPUT_FILE) + .toF(fileUri("?fileName=%s&charset=utf-8"), OUTPUT_FILE); } }; }
