Repository: camel Updated Branches: refs/heads/master efa976884 -> bf8df747a
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/bf8df747 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf8df747 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf8df747 Branch: refs/heads/master Commit: bf8df747a27cc5c6eafa038d2a89d32d878393cb Parents: efa9768 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 4 16:22:58 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 4 16:22:58 2015 +0100 ---------------------------------------------------------------------- .../component/velocity/VelocityDynamicTemplateTest.java | 10 ++++------ .../camel/component/velocity/VelocityLetterTest.java | 5 +---- .../velocity/VelocitySetTemplateViaHeaderTest.java | 10 ++++------ .../velocity/VelocitySomeValuesNotInExchangeTest.java | 8 ++++---- 4 files changed, 13 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bf8df747/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 2be5048..519ee71 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,10 +38,9 @@ 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.expectedBodiesReceived(msg); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).contains("Thanks for the order of Camel in Action"); template.send("direct:a", createLetter()); @@ -49,9 +48,8 @@ public class VelocityDynamicTemplateTest extends CamelTestSupport { mock.reset(); - 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); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).contains("Regards Apache Camel Riders Bookstore"); template.send("direct:a", createLetter()); http://git-wip-us.apache.org/repos/asf/camel/blob/bf8df747/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 eb8c39c..b236e73 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,12 +41,9 @@ 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(msg); + mock.message(0).body(String.class).contains("Thanks for the order of Camel in Action"); template.send("direct:a", createLetter()); http://git-wip-us.apache.org/repos/asf/camel/blob/bf8df747/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 a6a4d00..faa22ba 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,10 +38,9 @@ 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.expectedBodiesReceived(msg); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).contains("Thanks for the order of Camel in Action"); template.send("direct:a", createLetter("org/apache/camel/component/velocity/letter.vm")); @@ -49,9 +48,8 @@ public class VelocitySetTemplateViaHeaderTest extends CamelTestSupport { mock.reset(); - 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); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).contains("Regards Apache Camel Riders Bookstore"); template.send("direct:a", createLetter("org/apache/camel/component/velocity/letter2.vm")); http://git-wip-us.apache.org/repos/asf/camel/blob/bf8df747/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java index dc674be..7ff09bd 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java @@ -33,8 +33,8 @@ public class VelocitySomeValuesNotInExchangeTest extends CamelTestSupport { public void testWithAllValues() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Hello Claus\n" - + "You have id: 123 if an id was assigned to you."); + mock.message(0).constant("Hello Claus"); + mock.message(0).constant("You have id: 123 if an id was assigned to you."); Map<String, Object> headers = new HashMap<String, Object>(); headers.put("name", "Claus"); @@ -48,8 +48,8 @@ public class VelocitySomeValuesNotInExchangeTest extends CamelTestSupport { public void testWithSomeValues() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.expectedBodiesReceived("Hello Claus\n" - + "You have id: if an id was assigned to you."); + mock.message(0).constant("Hello Claus"); + mock.message(0).constant("You have id: if an id was assigned to you."); Map<String, Object> headers = new HashMap<String, Object>(); headers.put("name", "Claus");
