You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/07/10 17:47:07 UTC
(camel) branch main updated: CAMEL-20686 - appended static test filenames with UUID for uniqueness (set 4) (#14781)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 d90280baa74 CAMEL-20686 - appended static test filenames with UUID for uniqueness (set 4) (#14781)
d90280baa74 is described below
commit d90280baa74dc280fec584fed60ff20d4889b13b
Author: Jang-Vijay Singh <jv...@gmail.com>
AuthorDate: Wed Jul 10 18:47:01 2024 +0100
CAMEL-20686 - appended static test filenames with UUID for uniqueness (set 4) (#14781)
* Revert "CAMEL-20686 - appended static test filenames with UUID for uniqueness (set 2)"
This reverts commit 3024dc7083a5d496fb9e0f0420a805a8f5a37939.
* CAMEL-20686 - appended static test filenames with UUID for uniqueness (set 4)
- CAMEL-20686 - appended static test filenames with UUID for uniqueness
- FileProducerFileExistAppendTest : Additional change due to existing
code smell issues flagged on Sonar
---
.../FileConsumeAlterFileNameHeaderIssueTest.java | 27 +++++++++----------
.../component/file/FileConsumerPreMoveTest.java | 10 +++++---
.../component/file/FileKeepLastModifiedTest.java | 15 ++++++-----
.../component/file/FileProduceAppendTest.java | 12 ++++++---
.../component/file/FileProduceOverruleTest.java | 22 +++++++---------
.../file/FileProduceTempFileNameTest.java | 30 +++++++++++++---------
...ProducerAllowNullBodyFileAlreadyExistsTest.java | 16 +++++-------
.../file/FileProducerFileExistAppendTest.java | 28 ++++++++++++--------
.../file/FileProducerMoveExistingStrategyTest.java | 15 +++++------
.../component/file/GenericFileConverterTest.java | 17 +++++-------
.../apache/camel/converter/IOConverterTest.java | 15 +++++------
11 files changed, 104 insertions(+), 103 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java
index 486cd05331f..ee3f56df4db 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAlterFileNameHeaderIssueTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.file;
import java.nio.file.Files;
-import java.util.UUID;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -32,8 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*
*/
public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport {
- public static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
- public static final String TEST_FILE_NAME_BYE = "bye." + UUID.randomUUID() + ".txt";
@Override
public boolean isUseRouteBuilder() {
@@ -55,7 +52,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
oneExchangeDone.matchesWaitTime();
@@ -65,7 +62,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
// the original file should have been deleted, as the file consumer
// should be resilient against
// end users deleting headers
- assertFalse(Files.exists(testFile(TEST_FILE_NAME)), "File should been deleted");
+ assertFalse(Files.exists(testFile("hello.txt")), "File should been deleted");
}
@Test
@@ -75,16 +72,16 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
public void configure() {
from(fileUri() + "?initialDelay=0&delay=10&delete=true")
// change file header
- .setHeader(Exchange.FILE_NAME, constant(TEST_FILE_NAME_BYE)).to("mock:result");
+ .setHeader(Exchange.FILE_NAME, constant("bye.txt")).to("mock:result");
}
});
context.start();
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- mock.expectedHeaderReceived(Exchange.FILE_NAME, TEST_FILE_NAME_BYE);
+ mock.expectedHeaderReceived(Exchange.FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
oneExchangeDone.matchesWaitTime();
@@ -92,7 +89,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
// the original file should have been deleted, as the file consumer
// should be resilient against
// end users changing headers
- assertFalse(Files.exists(testFile(TEST_FILE_NAME)), "File should been deleted");
+ assertFalse(Files.exists(testFile("hello.txt")), "File should been deleted");
}
@Test
@@ -110,7 +107,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
oneExchangeDone.matchesWaitTime();
@@ -120,7 +117,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
// the original file should have been moved, as the file consumer should
// be resilient against
// end users deleting headers
- assertTrue(Files.exists(testFile(".camel/" + TEST_FILE_NAME)), "File should been moved");
+ assertTrue(Files.exists(testFile(".camel/hello.txt")), "File should been moved");
}
@Test
@@ -130,16 +127,16 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
public void configure() {
from(fileUri() + "?initialDelay=0&delay=10")
// change file header
- .setHeader(Exchange.FILE_NAME, constant(TEST_FILE_NAME_BYE)).to("mock:result");
+ .setHeader(Exchange.FILE_NAME, constant("bye.txt")).to("mock:result");
}
});
context.start();
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- mock.expectedHeaderReceived(Exchange.FILE_NAME, TEST_FILE_NAME_BYE);
+ mock.expectedHeaderReceived(Exchange.FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
oneExchangeDone.matchesWaitTime();
@@ -147,7 +144,7 @@ public class FileConsumeAlterFileNameHeaderIssueTest extends ContextTestSupport
// the original file should have been moved, as the file consumer should
// be resilient against
// end users changing headers
- assertTrue(Files.exists(testFile(".camel/" + TEST_FILE_NAME)), "File should been moved");
+ assertTrue(Files.exists(testFile(".camel/hello.txt")), "File should been moved");
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java
index f9d62efbc69..079623553f1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.file;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.UUID;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -29,13 +30,14 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class FileConsumerPreMoveTest extends ContextTestSupport {
+ private static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
@Test
public void testPreMove() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
assertMockEndpointsSatisfied();
}
@@ -45,7 +47,7 @@ public class FileConsumerPreMoveTest extends ContextTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
assertMockEndpointsSatisfied();
oneExchangeDone.matchesWaitTime();
@@ -54,7 +56,7 @@ public class FileConsumerPreMoveTest extends ContextTestSupport {
mock.reset();
mock.expectedBodiesReceived("Hello Again World");
- template.sendBodyAndHeader(fileUri(), "Hello Again World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello Again World", Exchange.FILE_NAME, TEST_FILE_NAME);
assertMockEndpointsSatisfied();
}
@@ -76,7 +78,7 @@ public class FileConsumerPreMoveTest extends ContextTestSupport {
public void process(Exchange exchange) {
Path testDirectory = (Path) exchange.getContext().getRegistry()
.lookupByName("testDirectory");
- Path file = testDirectory.resolve("work/work-hello.txt");
+ Path file = testDirectory.resolve("work/work-" + TEST_FILE_NAME);
assertTrue(Files.exists(file), "Pre move file should exist");
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java
index ec01b46dfcf..d0c4ea1cf8c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileKeepLastModifiedTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.file;
+import java.util.UUID;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -26,6 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotSame;
public class FileKeepLastModifiedTest extends ContextTestSupport {
+ private static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
@Test
public void testKeepLastModified() throws Exception {
@@ -42,12 +45,12 @@ public class FileKeepLastModifiedTest extends ContextTestSupport {
mock.expectedMessageCount(1);
mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull();
- template.sendBodyAndHeader(fileUri(), "Hello World", "CamelFileName", "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World", "CamelFileName", TEST_FILE_NAME);
assertMockEndpointsSatisfied();
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
- long t2 = testFile("out/hello.txt").toFile().lastModified();
+ long t2 = testFile("out/" + TEST_FILE_NAME).toFile().lastModified();
assertEquals(t1, t2, "Timestamp should have been kept");
}
@@ -67,12 +70,12 @@ public class FileKeepLastModifiedTest extends ContextTestSupport {
mock.expectedMessageCount(1);
mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull();
- template.sendBodyAndHeader(fileUri(), "Hello World", "CamelFileName", "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World", "CamelFileName", TEST_FILE_NAME);
assertMockEndpointsSatisfied();
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
- long t2 = testFile("out/hello.txt").toFile().lastModified();
+ long t2 = testFile("out/" + TEST_FILE_NAME).toFile().lastModified();
assertNotSame(t1, t2, "Timestamp should NOT have been kept");
}
@@ -92,12 +95,12 @@ public class FileKeepLastModifiedTest extends ContextTestSupport {
mock.expectedMessageCount(1);
mock.message(0).header(Exchange.FILE_LAST_MODIFIED).isNotNull();
- template.sendBodyAndHeader(fileUri(), "Hello World", "CamelFileName", "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World", "CamelFileName", TEST_FILE_NAME);
assertMockEndpointsSatisfied();
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
- long t2 = testFile("out/hello.txt").toFile().lastModified();
+ long t2 = testFile("out/" + TEST_FILE_NAME).toFile().lastModified();
assertNotSame(t1, t2, "Timestamp should NOT have been kept");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
index b0a5c9eb818..b749926b86e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.file;
+import java.util.UUID;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -26,15 +28,17 @@ import org.junit.jupiter.api.Test;
* Unit test to verify the append option
*/
public class FileProduceAppendTest extends ContextTestSupport {
+ private static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
+ private static final String TEST_FILE_NAME_2 = "world." + UUID.randomUUID() + ".txt";
@Test
public void testAppendText() throws Exception {
- template.sendBodyAndHeader(fileUri(), "Hello", Exchange.FILE_NAME, "hello.txt");
- template.sendBodyAndHeader(fileUri(), " World", Exchange.FILE_NAME, "world.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), " World", Exchange.FILE_NAME, TEST_FILE_NAME_2);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.expectedFileExists(testFile("hello.txt"), "Hello World");
+ mock.expectedFileExists(testFile(TEST_FILE_NAME), "Hello World");
template.sendBody("direct:start", " World");
@@ -45,7 +49,7 @@ public class FileProduceAppendTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:start").setHeader(Exchange.FILE_NAME, constant("hello.txt"))
+ from("direct:start").setHeader(Exchange.FILE_NAME, constant(TEST_FILE_NAME))
.to(fileUri("?fileExist=Append"), "mock:result");
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java
index 89f0f497da2..7d6f06e4758 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.file;
import java.util.HashMap;
import java.util.Map;
-import java.util.UUID;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -30,18 +29,15 @@ import org.junit.jupiter.api.Test;
* Unit test to verify the overrule filename header
*/
public class FileProduceOverruleTest extends ContextTestSupport {
- public static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
- public static final String TEST_FILE_NAME_OVERRULE = "overrule." + UUID.randomUUID() + ".txt";
- public static final String TEST_FILE_NAME_RULED = "ruled." + UUID.randomUUID() + ".txt";
@Test
public void testNoOverrule() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.expectedHeaderReceived(Exchange.FILE_NAME, TEST_FILE_NAME);
- mock.expectedFileExists(testFile(TEST_FILE_NAME), "Hello World");
+ mock.expectedHeaderReceived(Exchange.FILE_NAME, "hello.txt");
+ mock.expectedFileExists(testFile("hello.txt"), "Hello World");
- template.sendBodyAndHeader("direct:start", "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader("direct:start", "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -51,9 +47,9 @@ public class FileProduceOverruleTest extends ContextTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).header(Exchange.FILE_NAME).isNull();
- mock.expectedFileExists(testFile(TEST_FILE_NAME_OVERRULE), "Hello World");
+ mock.expectedFileExists(testFile("overrule.txt"), "Hello World");
- template.sendBodyAndHeader("direct:start", "Hello World", Exchange.OVERRULE_FILE_NAME, TEST_FILE_NAME_OVERRULE);
+ template.sendBodyAndHeader("direct:start", "Hello World", Exchange.OVERRULE_FILE_NAME, "overrule.txt");
assertMockEndpointsSatisfied();
}
@@ -62,14 +58,14 @@ public class FileProduceOverruleTest extends ContextTestSupport {
public void testBoth() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- mock.expectedHeaderReceived(Exchange.FILE_NAME, TEST_FILE_NAME);
+ mock.expectedHeaderReceived(Exchange.FILE_NAME, "hello.txt");
mock.message(0).header(Exchange.OVERRULE_FILE_NAME).isNull();
- mock.expectedFileExists(testFile(TEST_FILE_NAME_RULED), "Hello World");
+ mock.expectedFileExists(testFile("ruled.txt"), "Hello World");
Map<String, Object> map = new HashMap<>();
- map.put(Exchange.FILE_NAME, TEST_FILE_NAME);
+ map.put(Exchange.FILE_NAME, "hello.txt");
// this header should overrule the endpoint configuration
- map.put(Exchange.OVERRULE_FILE_NAME, TEST_FILE_NAME_RULED);
+ map.put(Exchange.OVERRULE_FILE_NAME, "ruled.txt");
template.sendBodyAndHeaders("direct:start", "Hello World", map);
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java
index ec53ce96730..b0181945480 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempFileNameTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.file;
+import java.util.UUID;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -27,6 +29,9 @@ import org.junit.jupiter.api.Test;
*/
public class FileProduceTempFileNameTest extends ContextTestSupport {
+ private static final String TEST_FILE_NAME = "hello" + UUID.randomUUID() + ".txt";
+ private static final String TEST_FILE_NAME_CLAUS = "claus" + UUID.randomUUID(); //noext
+
public static final String FILE_URL_QUERY = "tempandrename?tempFileName=inprogress-${file:name.noext}.tmp";
public static final String PARENT_FILE_URL_QUERY = "tempandrename?tempFileName=../work/${file:name.noext}.tmp";
public static final String CHILD_FILE_URL_QUERY = "tempandrename?tempFileName=work/${file:name.noext}.tmp";
@@ -36,10 +41,10 @@ public class FileProduceTempFileNameTest extends ContextTestSupport {
Endpoint endpoint = context.getEndpoint(fileUri(FILE_URL_QUERY));
GenericFileProducer<?> producer = (GenericFileProducer<?>) endpoint.createProducer();
Exchange exchange = endpoint.createExchange();
- exchange.getIn().setHeader(Exchange.FILE_NAME, "claus.txt");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, TEST_FILE_NAME_CLAUS + ".txt");
- String tempFileName = producer.createTempFileName(exchange, testFile("claus.txt").toString());
- assertDirectoryEquals(testFile("inprogress-claus.tmp").toString(), tempFileName);
+ String tempFileName = producer.createTempFileName(exchange, testFile(TEST_FILE_NAME_CLAUS + ".txt").toString());
+ assertDirectoryEquals(testFile("inprogress-" + TEST_FILE_NAME_CLAUS + ".tmp").toString(), tempFileName);
}
@Test
@@ -47,29 +52,29 @@ public class FileProduceTempFileNameTest extends ContextTestSupport {
Endpoint endpoint = context.getEndpoint(fileUri(FILE_URL_QUERY));
GenericFileProducer<?> producer = (GenericFileProducer<?>) endpoint.createProducer();
Exchange exchange = endpoint.createExchange();
- exchange.getIn().setHeader(Exchange.FILE_NAME, "claus.txt");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, TEST_FILE_NAME_CLAUS + ".txt");
String tempFileName = producer.createTempFileName(exchange, ".");
- assertDirectoryEquals("inprogress-claus.tmp", tempFileName);
+ assertDirectoryEquals("inprogress-" + TEST_FILE_NAME_CLAUS + ".tmp", tempFileName);
}
@Test
public void testTempFileName() {
- template.sendBodyAndHeader("direct:a", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("direct:a", "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
- assertFileExists(testFile("tempandrename/hello.txt"));
+ assertFileExists(testFile("tempandrename/" + TEST_FILE_NAME));
}
@Test
public void testParentTempFileName() {
- template.sendBodyAndHeader("direct:b", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("direct:b", "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
assertDirectoryExists(testDirectory("work"));
}
@Test
public void testChildTempFileName() {
- template.sendBodyAndHeader("direct:c", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("direct:c", "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
assertDirectoryExists(testDirectory("tempandrename/work"));
}
@@ -79,10 +84,11 @@ public class FileProduceTempFileNameTest extends ContextTestSupport {
Endpoint endpoint = context.getEndpoint(fileUri(PARENT_FILE_URL_QUERY));
GenericFileProducer<?> producer = (GenericFileProducer<?>) endpoint.createProducer();
Exchange exchange = endpoint.createExchange();
- exchange.getIn().setHeader(Exchange.FILE_NAME, "claus.txt");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, TEST_FILE_NAME_CLAUS + ".txt");
- String tempFileName = producer.createTempFileName(exchange, testFile("tempandrename/claus.txt").toString());
- assertDirectoryEquals(testDirectory("work/claus.tmp").toString(), tempFileName);
+ String tempFileName
+ = producer.createTempFileName(exchange, testFile("tempandrename/" + TEST_FILE_NAME_CLAUS + ".txt").toString());
+ assertDirectoryEquals(testDirectory("work/" + TEST_FILE_NAME_CLAUS + ".tmp").toString(), tempFileName);
}
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerAllowNullBodyFileAlreadyExistsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerAllowNullBodyFileAlreadyExistsTest.java
index 7fba38f11c4..5e51a0c0e56 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerAllowNullBodyFileAlreadyExistsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerAllowNullBodyFileAlreadyExistsTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.file;
-import java.util.UUID;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -30,15 +28,13 @@ import org.junit.jupiter.api.Test;
*/
public class FileProducerAllowNullBodyFileAlreadyExistsTest extends ContextTestSupport {
- public static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
-
@Test
public void testFileExistAppendAllowNullBody() throws Exception {
- template.sendBodyAndHeader(fileUri(), "Hello world", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello world", Exchange.FILE_NAME, "hello.txt");
MockEndpoint mock = getMockEndpoint("mock:appendTypeAppendResult");
mock.expectedMessageCount(1);
- mock.expectedFileExists(testFile(TEST_FILE_NAME), "Hello world");
+ mock.expectedFileExists(testFile("hello.txt"), "Hello world");
template.sendBody("direct:appendTypeAppend", null);
@@ -47,11 +43,11 @@ public class FileProducerAllowNullBodyFileAlreadyExistsTest extends ContextTestS
@Test
public void testFileExistOverrideAllowNullBody() throws Exception {
- template.sendBodyAndHeader(fileUri(), "Hello world", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello world", Exchange.FILE_NAME, "hello.txt");
MockEndpoint mock = getMockEndpoint("mock:appendTypeOverrideResult");
mock.expectedMessageCount(1);
- mock.expectedFileExists(testFile(TEST_FILE_NAME), "");
+ mock.expectedFileExists(testFile("hello.txt"), "");
template.sendBody("direct:appendTypeOverride", null);
@@ -62,11 +58,11 @@ public class FileProducerAllowNullBodyFileAlreadyExistsTest extends ContextTestS
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:appendTypeAppend").setHeader(Exchange.FILE_NAME, constant(TEST_FILE_NAME))
+ from("direct:appendTypeAppend").setHeader(Exchange.FILE_NAME, constant("hello.txt"))
.to(fileUri("?allowNullBody=true&fileExist=Append"))
.to("mock:appendTypeAppendResult");
- from("direct:appendTypeOverride").setHeader(Exchange.FILE_NAME, constant(TEST_FILE_NAME))
+ from("direct:appendTypeOverride").setHeader(Exchange.FILE_NAME, constant("hello.txt"))
.to(fileUri("?allowNullBody=true&fileExist=Override"))
.to("mock:appendTypeOverrideResult");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
index 79b944e0a72..7b3b8612611 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileExistAppendTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.file;
+import java.util.UUID;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -23,16 +25,20 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
public class FileProducerFileExistAppendTest extends ContextTestSupport {
+ private static final String TEST_FILE_NAME = "hello" + UUID.randomUUID() + ".txt";
+ private static final String TEST_FILE_NAME_1 = "test1" + UUID.randomUUID() + ".txt";
+ private static final String TEST_FILE_NAME_2 = "test2" + UUID.randomUUID() + ".txt";
+ private static final String TEST_FILE_NAME_OUT = "out" + UUID.randomUUID() + ".txt";
@Test
public void testAppend() throws Exception {
- template.sendBodyAndHeader(fileUri(), "Hello World\n", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri(), "Hello World\n", Exchange.FILE_NAME, TEST_FILE_NAME);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World\nBye World");
- mock.expectedFileExists(testFile("hello.txt"), "Hello World\nBye World");
+ mock.expectedFileExists(testFile(TEST_FILE_NAME), "Hello World\nBye World");
- template.sendBodyAndHeader(fileUri("?fileExist=Append"), "Bye World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(fileUri("?fileExist=Append"), "Bye World", Exchange.FILE_NAME, TEST_FILE_NAME);
context.getRouteController().startAllRoutes();
@@ -44,16 +50,16 @@ public class FileProducerFileExistAppendTest extends ContextTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
// Create some test files
- template.sendBodyAndHeader(fileUri(), "Row 1\n", Exchange.FILE_NAME, "test1.txt");
- template.sendBodyAndHeader(fileUri(), "Row 2\n", Exchange.FILE_NAME, "test2.txt");
+ template.sendBodyAndHeader(fileUri(), "Row 1\n", Exchange.FILE_NAME, TEST_FILE_NAME_1);
+ template.sendBodyAndHeader(fileUri(), "Row 2\n", Exchange.FILE_NAME, TEST_FILE_NAME_2);
// Append test files to the target one
- template.sendBodyAndHeader(fileUri("?fileExist=Append"), testFile("test1.txt").toFile(),
- Exchange.FILE_NAME, "out.txt");
- template.sendBodyAndHeader(fileUri("?fileExist=Append"), testFile("test2.txt").toFile(),
- Exchange.FILE_NAME, "out.txt");
+ template.sendBodyAndHeader(fileUri("?fileExist=Append"), testFile(TEST_FILE_NAME_1).toFile(),
+ Exchange.FILE_NAME, TEST_FILE_NAME_OUT);
+ template.sendBodyAndHeader(fileUri("?fileExist=Append"), testFile(TEST_FILE_NAME_2).toFile(),
+ Exchange.FILE_NAME, TEST_FILE_NAME_OUT);
- mock.expectedFileExists(testFile("out.txt"), "Row 1\nRow 2\n");
+ mock.expectedFileExists(testFile(TEST_FILE_NAME_OUT), "Row 1\nRow 2\n");
context.getRouteController().startAllRoutes();
@@ -66,7 +72,7 @@ public class FileProducerFileExistAppendTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from(fileUri("?noop=true&initialDelay=0&delay=10")).noAutoStartup().convertBodyTo(String.class)
+ from(fileUri("?noop=true&initialDelay=0&delay=10")).autoStartup(false).convertBodyTo(String.class)
.to("mock:result");
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
index b52624eb094..83db991c616 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.file;
import java.io.File;
-import java.util.UUID;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -34,8 +33,6 @@ import org.slf4j.LoggerFactory;
*/
public class FileProducerMoveExistingStrategyTest extends ContextTestSupport {
- public static final String TEST_FILE_NAME_NOEXT = "hello." + UUID.randomUUID();
- public static final String TEST_FILE_NAME = TEST_FILE_NAME_NOEXT + ".txt";
private final MyStrategy myStrategy = new MyStrategy();
@Override
@@ -49,19 +46,19 @@ public class FileProducerMoveExistingStrategyTest extends ContextTestSupport {
public void testExistingFileExists() throws Exception {
template.sendBodyAndHeader(
fileUri("?fileExist=Move&moveExisting=${file:parent}/renamed-${file:onlyname}&moveExistingFileStrategy=#myStrategy"),
- "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ "Hello World", Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeader(
fileUri("?fileExist=Move&moveExisting=${file:parent}/renamed-${file:onlyname}&moveExistingFileStrategy=#myStrategy"),
- "Bye Existing World 1", Exchange.FILE_NAME, TEST_FILE_NAME);
+ "Bye Existing World 1", Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeader(
fileUri("?fileExist=Move&moveExisting=${file:parent}/renamed-${file:onlyname}&moveExistingFileStrategy=#myStrategy"),
- "Bye Existing World 2", Exchange.FILE_NAME, TEST_FILE_NAME);
+ "Bye Existing World 2", Exchange.FILE_NAME, "hello.txt");
- assertFileExists(testFile(TEST_FILE_NAME), "Bye Existing World 2");
+ assertFileExists(testFile("hello.txt"), "Bye Existing World 2");
- assertFileExists(testFile("renamed-" + TEST_FILE_NAME_NOEXT + "2.txt"), "Bye Existing World 1");
+ assertFileExists(testFile("renamed-hello2.txt"), "Bye Existing World 1");
- assertFileExists(testFile("renamed-" + TEST_FILE_NAME_NOEXT + "1.txt"), "Hello World");
+ assertFileExists(testFile("renamed-hello1.txt"), "Hello World");
}
private static class MyStrategy implements FileMoveExistingStrategy {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
index 8cc20be8257..47dcf2e62f5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
@@ -20,7 +20,6 @@ import java.io.BufferedInputStream;
import java.io.File;
import java.io.InputStream;
import java.io.Serializable;
-import java.util.UUID;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -32,8 +31,6 @@ import org.junit.jupiter.api.Test;
public class GenericFileConverterTest extends ContextTestSupport {
- public static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
-
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -53,7 +50,7 @@ public class GenericFileConverterTest extends ContextTestSupport {
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(File.class);
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -73,7 +70,7 @@ public class GenericFileConverterTest extends ContextTestSupport {
mock.message(0).body().isInstanceOf(String.class);
mock.message(0).body().isEqualTo("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -93,7 +90,7 @@ public class GenericFileConverterTest extends ContextTestSupport {
mock.message(0).body().isInstanceOf(byte[].class);
mock.message(0).body(String.class).isEqualTo("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -113,7 +110,7 @@ public class GenericFileConverterTest extends ContextTestSupport {
mock.message(0).body().isInstanceOf(Serializable.class);
mock.message(0).body(String.class).isEqualTo("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -133,7 +130,7 @@ public class GenericFileConverterTest extends ContextTestSupport {
mock.message(0).body().isInstanceOf(InputStream.class);
mock.message(0).body(String.class).isEqualTo("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -159,7 +156,7 @@ public class GenericFileConverterTest extends ContextTestSupport {
mock.message(0).body().isInstanceOf(InputStreamCache.class);
mock.message(0).body(String.class).isEqualTo("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
@@ -190,7 +187,7 @@ public class GenericFileConverterTest extends ContextTestSupport {
mock.message(0).body().isInstanceOf(BufferedInputStream.class);
mock.message(0).body(String.class).isEqualTo("Hello World");
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java
index 5081f151cf3..a234da928dc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java
@@ -34,7 +34,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
-import java.util.UUID;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -53,8 +52,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class IOConverterTest extends ContextTestSupport {
- public static final String TEST_FILE_NAME = "hello." + UUID.randomUUID() + ".txt";
-
private static final byte[] TESTDATA = "My test data".getBytes();
@Test
@@ -79,8 +76,8 @@ public class IOConverterTest extends ContextTestSupport {
@Test
public void testToOutputStreamFile() throws Exception {
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
- File file = testFile(TEST_FILE_NAME).toFile();
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
+ File file = testFile("hello.txt").toFile();
OutputStream os = IOConverter.toOutputStream(file);
assertIsInstanceOf(BufferedOutputStream.class, os);
@@ -89,8 +86,8 @@ public class IOConverterTest extends ContextTestSupport {
@Test
public void testToWriterFile() throws Exception {
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
- File file = testFile(TEST_FILE_NAME).toFile();
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
+ File file = testFile("hello.txt").toFile();
Writer writer = IOConverter.toWriter(file, null);
assertIsInstanceOf(BufferedWriter.class, writer);
@@ -152,8 +149,8 @@ public class IOConverterTest extends ContextTestSupport {
@Test
public void testToByteArrayFile() throws Exception {
- template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, TEST_FILE_NAME);
- File file = testFile(TEST_FILE_NAME).toFile();
+ template.sendBodyAndHeader(fileUri(), "Hello World", Exchange.FILE_NAME, "hello.txt");
+ File file = testFile("hello.txt").toFile();
byte[] data = IOConverter.toByteArray(file);
assertNotNull(data);