Repository: camel Updated Branches: refs/heads/master bf8df747a -> 7307c0f3d
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/7307c0f3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7307c0f3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7307c0f3 Branch: refs/heads/master Commit: 7307c0f3df3821cb8ac86fb26e6d1a07ace58b95 Parents: bf8df74 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 4 16:37:06 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 4 16:37:06 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/jackson/JacksonMarshalTest.java | 4 +--- .../camel/component/jackson/SpringJacksonJsonDataFormatTest.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7307c0f3/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java index bd5de84..bb7d0f5 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java @@ -57,9 +57,7 @@ public class JacksonMarshalTest extends CamelTestSupport { Object marshalled = template.requestBody("direct:pretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); - String expected = "{\n" - + " \"name\" : \"Camel\"" - + "\n}"; + String expected = String.format("{%s \"name\" : \"Camel\"%s}", System.lineSeparator(), System.lineSeparator()); assertEquals(expected, marshalledAsString); template.sendBody("direct:backPretty", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/7307c0f3/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java index ea22b3b..bfa13ac 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java @@ -61,9 +61,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { Object marshalled = template.requestBody("direct:pretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); - String expected = "{\n" - + " \"name\" : \"Camel\"" - + "\n}"; + String expected = String.format("{%s \"name\" : \"Camel\"%s}", System.lineSeparator(), System.lineSeparator()); assertEquals(expected, marshalledAsString); template.sendBody("direct:back", marshalled);
