Repository: camel Updated Branches: refs/heads/master f3829994c -> efa976884
Fixed test on windows Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/efa97688 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/efa97688 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/efa97688 Branch: refs/heads/master Commit: efa976884cb8659788ad4cbd1d46e19577d1cb8b Parents: f382999 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 4 16:16:40 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 4 16:16:40 2015 +0100 ---------------------------------------------------------------------- .../velocity/VelocityBodyAsDomainObjectTest.java | 5 ++++- .../component/velocity/VelocityDynamicTemplateTest.java | 12 +++++++----- .../camel/component/velocity/VelocityLetterTest.java | 5 ++++- .../velocity/VelocitySetTemplateViaHeaderTest.java | 12 +++++++----- 4 files changed, 22 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/efa97688/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java index 429cb8f..8dd60e2 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java @@ -30,9 +30,12 @@ public class VelocityBodyAsDomainObjectTest extends CamelTestSupport { @Test public void testWithObject() throws Exception { + String msg = String.format("Hi Claus how are you? Its a nice day.%sGive my regards to the family Ibsen.", + System.lineSeparator()); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Hi Claus how are you? Its a nice day.\nGive my regards to the family Ibsen."); + mock.expectedBodiesReceived(msg); MyPerson person = new MyPerson(); person.setFamilyName("Ibsen"); http://git-wip-us.apache.org/repos/asf/camel/blob/efa97688/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java index f4123a5..2be5048 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java @@ -38,18 +38,20 @@ public class VelocityDynamicTemplateTest extends CamelTestSupport { @Test public void testVelocityLetter() throws Exception { + String msg = String.format("Dear Ibsen, Claus%s%sThanks for the order of Camel in Action.%s%sRegards Camel Riders Bookstore%sPS: Next beer is on me, James", + System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator()); MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Dear Ibsen, Claus\n\nThanks for the order of Camel in Action.\n\nRegards Camel Riders Bookstore\nPS: Next beer is on me, James"); + mock.expectedBodiesReceived(msg); template.send("direct:a", createLetter()); mock.assertIsSatisfied(); mock.reset(); - - mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Dear Ibsen, Claus\n\nThanks for the order of Camel in Action.\n\nRegards Apache Camel Riders Bookstore\nPS: Next beer is on me, James"); + + String msg2 = String.format("Dear Ibsen, Claus%s%sThanks for the order of Camel in Action.%s%sRegards Apache Camel Riders Bookstore%sPS: Next beer is on me, James", + System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator()); + mock.expectedBodiesReceived(msg2); template.send("direct:a", createLetter()); http://git-wip-us.apache.org/repos/asf/camel/blob/efa97688/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java index 7810613..eb8c39c 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java @@ -41,9 +41,12 @@ public class VelocityLetterTest extends CamelTestSupport { @Test public void testVelocityLetter() throws Exception { + String msg = String.format("Dear Ibsen, Claus%s%sThanks for the order of Camel in Action.%s%sRegards Camel Riders Bookstore%sPS: Next beer is on me, James", + System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator()); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Dear Ibsen, Claus\n\nThanks for the order of Camel in Action.\n\nRegards Camel Riders Bookstore\nPS: Next beer is on me, James"); + mock.expectedBodiesReceived(msg); template.send("direct:a", createLetter()); http://git-wip-us.apache.org/repos/asf/camel/blob/efa97688/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java index 5b9e298..a6a4d00 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java @@ -38,18 +38,20 @@ public class VelocitySetTemplateViaHeaderTest extends CamelTestSupport { @Test public void testVelocityLetter() throws Exception { + String msg = String.format("Dear Ibsen, Claus%s%sThanks for the order of Camel in Action.%s%sRegards Camel Riders Bookstore%sPS: Next beer is on me, James", + System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator()); MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Dear Ibsen, Claus\n\nThanks for the order of Camel in Action.\n\nRegards Camel Riders Bookstore\nPS: Next beer is on me, James"); + mock.expectedBodiesReceived(msg); template.send("direct:a", createLetter("org/apache/camel/component/velocity/letter.vm")); mock.assertIsSatisfied(); mock.reset(); - - mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Dear Ibsen, Claus\n\nThanks for the order of Camel in Action.\n\nRegards Apache Camel Riders Bookstore\nPS: Next beer is on me, James"); + + String msg2 = String.format("Dear Ibsen, Claus%s%sThanks for the order of Camel in Action.%s%sRegards Apache Camel Riders Bookstore%sPS: Next beer is on me, James", + System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator()); + mock.expectedBodiesReceived(msg2); template.send("direct:a", createLetter("org/apache/camel/component/velocity/letter2.vm"));
