Repository: camel Updated Branches: refs/heads/master ac64e160c -> 34859c7dc
Changes to make the file endpoint include & exclude patterns case insensitive by default Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/34859c7d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34859c7d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34859c7d Branch: refs/heads/master Commit: 34859c7dc0802d13cfde0cb872460c4c011a312c Parents: ac64e16 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Nov 26 07:05:56 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Nov 26 07:05:56 2015 +0100 ---------------------------------------------------------------------- .../camel/component/file/FileConsumerExcludeNameTest.java | 6 +++--- .../camel/component/file/FileConsumerIncludeNameTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/34859c7d/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java index fd8d7cc..030defe 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java @@ -31,7 +31,7 @@ public class FileConsumerExcludeNameTest extends ContextTestSupport { prepareFiles(); MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceived("Reports", "Reports", "Reports3"); + mock.expectedBodiesReceivedInAnyOrder("Reports1", "Reports2", "Reports3"); mock.expectedMessageCount(3); mock.assertIsSatisfied(); } @@ -39,9 +39,9 @@ public class FileConsumerExcludeNameTest extends ContextTestSupport { private void prepareFiles() throws Exception { String url = "file://target/exclude"; template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME, "hello.xml"); - template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report1.txt"); + template.sendBodyAndHeader(url, "Reports1", Exchange.FILE_NAME, "report1.txt"); template.sendBodyAndHeader(url, "Bye World", Exchange.FILE_NAME, "secret.txt"); - template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report2.txt"); + template.sendBodyAndHeader(url, "Reports2", Exchange.FILE_NAME, "report2.txt"); template.sendBodyAndHeader(url, "Reports3", Exchange.FILE_NAME, "Report3.txt"); template.sendBodyAndHeader(url, "Secret2", Exchange.FILE_NAME, "Secret2.txt"); } http://git-wip-us.apache.org/repos/asf/camel/blob/34859c7d/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java index 902622d..c78b424 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java @@ -34,7 +34,7 @@ public class FileConsumerIncludeNameTest extends ContextTestSupport { public void testIncludePreAndPostfixes() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceived("Reports", "Reports", "Reports3"); + mock.expectedBodiesReceivedInAnyOrder("Reports1", "Reports2", "Reports3"); mock.expectedMessageCount(3); sendFiles(); @@ -45,9 +45,9 @@ public class FileConsumerIncludeNameTest extends ContextTestSupport { private void sendFiles() throws Exception { String url = "file://target/include"; template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME, "hello.xml"); - template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report1.txt"); + template.sendBodyAndHeader(url, "Reports1", Exchange.FILE_NAME, "report1.txt"); template.sendBodyAndHeader(url, "Bye World", Exchange.FILE_NAME, "secret.txt"); - template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report2.txt"); + template.sendBodyAndHeader(url, "Reports2", Exchange.FILE_NAME, "report2.txt"); template.sendBodyAndHeader(url, "Reports3", Exchange.FILE_NAME, "Report3.txt"); template.sendBodyAndHeader(url, "Secret2", Exchange.FILE_NAME, "Secret2.txt"); }
