Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 11bd3a1bd -> 8e4485292
Fixed the VelocityBodyAsDomainObjectTest in windows
Conflicts:
components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8e448529
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8e448529
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8e448529
Branch: refs/heads/camel-2.15.x
Commit: 8e4485292d9d509e7c2a40c28ab9033f9161c833
Parents: 11bd3a1
Author: Willem Jiang <[email protected]>
Authored: Tue Apr 14 09:23:53 2015 +0800
Committer: Willem Jiang <[email protected]>
Committed: Tue Apr 14 09:29:27 2015 +0800
----------------------------------------------------------------------
.../component/velocity/VelocityBodyAsDomainObjectTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8e448529/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 8dd60e2..544ec31 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,8 +30,7 @@ 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());
+ String msg = String.format("Hi Claus how are you? Its a nice
day.%sGive my regards to the family Ibsen.", "\n");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -86,4 +85,4 @@ public class VelocityBodyAsDomainObjectTest extends
CamelTestSupport {
}
}
-}
\ No newline at end of file
+}