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 92dedbf6155091ec8cad0676fec498fd408b952d Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Wed Jun 10 09:34:31 2020 +0200 Fix FileDataSetProducerTest on windows --- .../main/java/org/apache/camel/component/dataset/FileDataSet.java | 2 -- .../org/apache/camel/component/dataset/FileDataSetProducerTest.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java index 0bcdc77..26ff077 100644 --- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java +++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/FileDataSet.java @@ -34,8 +34,6 @@ public class FileDataSet extends ListDataSet { private File sourceFile; private String delimiter; - private List<Object> defaultBodies; - public FileDataSet(String sourceFileName) throws IOException { this(new File(sourceFileName)); } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java index 2380438..424e1ae 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java @@ -40,7 +40,7 @@ public class FileDataSetProducerTest extends ContextTestSupport { protected FileDataSet dataSet; - final String testPayload = String.format("Line 1%nLine 2%nLine 3%nLine 4%nLine 5%nLine 6%nLine 7%nLine 8%nLine 9%nLine 10%n"); + final String testPayload = "Line 1\nLine 2\nLine 3\nLine 4\nLine 5\nLine 6\nLine 7\nLine 8\nLine 9\nLine 10\n"; final String sourceUri = "direct://source"; final String dataSetName = "foo"; @@ -77,13 +77,13 @@ public class FileDataSetProducerTest extends ContextTestSupport { @Override @BeforeEach public void setUp() throws Exception { - File fileDataset = createFileDatasetWithSystemEndOfLine(); + File fileDataset = createFileDataset(); dataSet = new FileDataSet(fileDataset); assertEquals(1, dataSet.getSize(), "Unexpected DataSet size"); super.setUp(); } - private File createFileDatasetWithSystemEndOfLine() throws IOException { + private File createFileDataset() throws IOException { Files.createDirectories(tempFolder); Path fileDataset = tempFolder.resolve("file-dataset-test.txt"); Files.copy(new ByteArrayInputStream(testPayload.getBytes()), fileDataset, StandardCopyOption.REPLACE_EXISTING);