You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/05/08 04:20:45 UTC
[1/2] git commit: Fixed the CS error in camel-core
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x f001fcae3 -> 2da223d6e
Fixed the CS error in camel-core
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1c28c2ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c28c2ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c28c2ad
Branch: refs/heads/camel-2.12.x
Commit: 1c28c2adfebef2f36881808124e26325af902d7c
Parents: f001fca
Author: Ubuntu <wi...@gmail.com>
Authored: Wed May 7 04:36:56 2014 +0000
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu May 8 10:20:00 2014 +0800
----------------------------------------------------------------------
.../tokenizer/TokenizeLanguageTest.java | 20 ++++++++++++++------
.../tokenizer/TokenizeWrapLanguageTest.java | 12 +++++++++---
2 files changed, 23 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1c28c2ad/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
index d4b4c0f..1605a81 100644
--- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
@@ -77,30 +77,38 @@ public class TokenizeLanguageTest extends ContextTestSupport {
public void testSendNamespacedChildMessageToTokenize() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived(
- "<c:child xmlns:c='urn:c' some_attr='a' anotherAttr='a'></c:child>", "<c:child xmlns:c='urn:c' some_attr='b' anotherAttr='b' />");
+ "<c:child xmlns:c='urn:c' some_attr='a' anotherAttr='a'></c:child>",
+ "<c:child xmlns:c='urn:c' some_attr='b' anotherAttr='b' />");
template.sendBody("direct:start",
- "<?xml version='1.0' encoding='UTF-8'?><parent><c:child xmlns:c='urn:c' some_attr='a' anotherAttr='a'></c:child><c:child xmlns:c='urn:c' some_attr='b' anotherAttr='b' /></parent>");
+ "<?xml version='1.0' encoding='UTF-8'?><parent><c:child xmlns:c='urn:c' some_attr='a' anotherAttr='a'></c:child>"
+ + "<c:child xmlns:c='urn:c' some_attr='b' anotherAttr='b' /></parent>");
assertMockEndpointsSatisfied();
}
public void testSendNamespacedParentMessageToTokenize() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived(
- "<c:child some_attr='a' anotherAttr='a' xmlns:c='urn:c' xmlns:d=\"urn:d\"></c:child>", "<c:child some_attr='b' anotherAttr='b' xmlns:c='urn:c' xmlns:d=\"urn:d\"/>");
+ "<c:child some_attr='a' anotherAttr='a' xmlns:c='urn:c' xmlns:d=\"urn:d\"></c:child>",
+ "<c:child some_attr='b' anotherAttr='b' xmlns:c='urn:c' xmlns:d=\"urn:d\"/>");
template.sendBody("direct:start",
- "<?xml version='1.0' encoding='UTF-8'?><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent>");
+ "<?xml version='1.0' encoding='UTF-8'?><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent>");
assertMockEndpointsSatisfied();
}
public void testSendMoreParentsMessageToTokenize() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived(
- "<c:child some_attr='a' anotherAttr='a' xmlns:c='urn:c' xmlns:d=\"urn:d\"></c:child>", "<c:child some_attr='b' anotherAttr='b' xmlns:c='urn:c' xmlns:d=\"urn:d\"/>");
+ "<c:child some_attr='a' anotherAttr='a' xmlns:c='urn:c' xmlns:d=\"urn:d\"></c:child>",
+ "<c:child some_attr='b' anotherAttr='b' xmlns:c='urn:c' xmlns:d=\"urn:d\"/>");
template.sendBody("direct:start",
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
+ "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'>"
+ + "<grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/>"
+ + "</c:parent></grandparent></g:greatgrandparent>");
assertMockEndpointsSatisfied();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1c28c2ad/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
index d2523e8..1e47793 100644
--- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeWrapLanguageTest.java
@@ -105,11 +105,17 @@ public class TokenizeWrapLanguageTest extends ContextTestSupport {
public void testSendMoreParentsMessageToTokenize() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived(
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='a' anotherAttr='a'></c:child></c:parent></grandparent></g:greatgrandparent>",
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
+ "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent>"
+ + "<uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='a' anotherAttr='a'></c:child></c:parent></grandparent></g:greatgrandparent>",
+ "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent>"
+ + "<uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='b' anotherAttr='b'/>"
+ + "</c:parent></grandparent></g:greatgrandparent>");
template.sendBody("direct:start",
- "<?xml version='1.0' encoding='UTF-8'?><g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\"><c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
+ "<?xml version='1.0' encoding='UTF-8'?>"
+ + "<g:greatgrandparent xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt><c:parent xmlns:c='urn:c' xmlns:d=\"urn:d\">"
+ + "<c:child some_attr='a' anotherAttr='a'></c:child><c:child some_attr='b' anotherAttr='b'/></c:parent></grandparent></g:greatgrandparent>");
assertMockEndpointsSatisfied();
}
[2/2] git commit: Fixed the CS error of camel-sql
Posted by ni...@apache.org.
Fixed the CS error of camel-sql
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2da223d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2da223d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2da223d6
Branch: refs/heads/camel-2.12.x
Commit: 2da223d6ebca58983075bb3fd66c2599ef33133f
Parents: 1c28c2a
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed May 7 13:07:57 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu May 8 10:20:13 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2da223d6/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
index 6a381ab..8b6fa7f 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlGeneratedKeysTest.java
@@ -158,7 +158,7 @@ public class SqlGeneratedKeysTest extends CamelTestSupport {
assertEquals(4, generatedKeys.size());
int id = 3;
- for (Map<String, Object> row: generatedKeys) {
+ for (Map<String, Object> row : generatedKeys) {
assertEquals("auto increment value should be " + id, Integer.valueOf(id++), row.get("ID"));
}