Repository: camel Updated Branches: refs/heads/master 985689f5a -> 4a610c38e
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/4a610c38 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a610c38 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a610c38 Branch: refs/heads/master Commit: 4a610c38e4f0bc322de220c845f4afbdd05eada4 Parents: 985689f Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Mar 5 08:44:48 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Mar 5 08:44:48 2015 +0100 ---------------------------------------------------------------------- .../mustache/MustacheComponentTest.java | 21 ++++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4a610c38/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java index 8fb2c51..5ac5339 100644 --- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java +++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java @@ -79,10 +79,8 @@ public class MustacheComponentTest extends CamelTestSupport { exchange.getIn().setHeader("someHeader", "Some Header"); exchange.getIn().setHeader(MustacheConstants.MUSTACHE_RESOURCE_URI, "/another.mustache"); endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Yet another Mustache with body:\n" - + " 'The Body'\n" - + "and some header:\n" - + " 'Some Header'\n"); + endSimpleMock.message(0).body().contains("The Body"); + endSimpleMock.message(0).body().contains("Some Header"); // Act startSimpleProducerTemplate.send(exchange); // Verify @@ -95,11 +93,9 @@ public class MustacheComponentTest extends CamelTestSupport { Exchange exchange = createExchangeWithBody("The Body"); exchange.getIn().setHeader(MustacheConstants.MUSTACHE_RESOURCE_URI, "/child.mustache"); endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Start\n" - + "Content 1: Child 1\n" - + "Middle\n" - + "Content 2: Child 2\n" - + "End"); + endSimpleMock.message(0).body().contains("Content 1: Child 1"); + endSimpleMock.message(0).body().contains("Middle"); + endSimpleMock.message(0).body().contains("Content 2: Child 2"); // Act startSimpleProducerTemplate.send(exchange); // Verify @@ -112,9 +108,9 @@ public class MustacheComponentTest extends CamelTestSupport { Exchange exchange = createExchangeWithBody("The Body"); exchange.getIn().setHeader(MustacheConstants.MUSTACHE_RESOURCE_URI, "/includer.mustache"); endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Start\n" - + "Included\n" - + "End"); + endSimpleMock.message(0).body().contains("Start"); + endSimpleMock.message(0).body().contains("Included"); + endSimpleMock.message(0).body().contains("End"); // Act startSimpleProducerTemplate.send(exchange); // Verify @@ -134,7 +130,6 @@ public class MustacheComponentTest extends CamelTestSupport { } assertMockEndpointsSatisfied(); LoggerFactory.getLogger(getClass()).info("Mustache performance: " + stopwatch.stop() + "ms for " + messageCount + " messages"); - } @Override
