You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/11 10:24:35 UTC
[1/4] git commit: Added test based on user forum issue
Updated Branches:
refs/heads/camel-2.12.x de697543a -> ddc6b43c1
refs/heads/master 81d00c1c4 -> e76d870de
Added test based on user forum issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38c21fe6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38c21fe6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38c21fe6
Branch: refs/heads/master
Commit: 38c21fe609804b4e3aff9805bc05c1a656f15f8e
Parents: 81d00c1
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 11 10:22:33 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 11 10:22:33 2013 +0200
----------------------------------------------------------------------
.../SplitTokenizerXmlMultilineTest.java | 63 ++++++++++++++++++++
1 file changed, 63 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/38c21fe6/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java
new file mode 100644
index 0000000..530b757
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class SplitTokenizerXmlMultilineTest extends ContextTestSupport {
+
+ public void testSingleLine() throws Exception {
+ String payload = "<Parent>\n"
+ + "\t<Child A=\"1\" B=\"2\"/>\n"
+ + "</Parent>";
+
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", payload);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testMultipleLines() throws Exception {
+ String payload = "<Parent>\n"
+ + "\t<Child A=\"1\"\n"
+ + "\tB=\"2\"/>\n"
+ + "</Parent>";
+
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", payload);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .split().tokenizeXML("Child")
+ .to("mock:result");
+ }
+ };
+ }
+}
[2/4] git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e76d870d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e76d870d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e76d870d
Branch: refs/heads/master
Commit: e76d870de38f801793621b094bc2a4c945798ac0
Parents: 38c21fe
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 11 10:23:29 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 11 10:23:29 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/ShutdownDeferTest.java | 6 +++---
.../java/org/apache/camel/processor/ShutdownNotDeferTest.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e76d870d/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
index 5220ed4..b7cf4f6 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
@@ -35,7 +35,7 @@ import static org.apache.camel.ShutdownRoute.Defer;
*/
public class ShutdownDeferTest extends ContextTestSupport {
- private static final AtomicBoolean consumerSuspended = new AtomicBoolean();
+ private static final AtomicBoolean CONSUMER_SUSPENDED = new AtomicBoolean();
@Override
protected void setUp() throws Exception {
@@ -59,7 +59,7 @@ public class ShutdownDeferTest extends ContextTestSupport {
context.stop();
- assertFalse("Should not have been suspended", consumerSuspended.get());
+ assertFalse("Should not have been suspended", CONSUMER_SUSPENDED.get());
}
@Override
@@ -98,7 +98,7 @@ public class ShutdownDeferTest extends ContextTestSupport {
return new FileConsumer(this, processor, operations) {
@Override
protected void doSuspend() throws Exception {
- consumerSuspended.set(true);
+ CONSUMER_SUSPENDED.set(true);
super.doSuspend();
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/e76d870d/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
index 5a8156d..5ce82ff 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
@@ -35,7 +35,7 @@ import static org.apache.camel.ShutdownRoute.Default;
*/
public class ShutdownNotDeferTest extends ContextTestSupport {
- private static final AtomicBoolean consumerSuspended = new AtomicBoolean();
+ private static final AtomicBoolean CONSUMER_SUSPENDED = new AtomicBoolean();
@Override
protected void setUp() throws Exception {
@@ -57,7 +57,7 @@ public class ShutdownNotDeferTest extends ContextTestSupport {
context.stop();
- assertTrue("Should have been suspended", consumerSuspended.get());
+ assertTrue("Should have been suspended", CONSUMER_SUSPENDED.get());
}
@Override
@@ -92,7 +92,7 @@ public class ShutdownNotDeferTest extends ContextTestSupport {
return new FileConsumer(this, processor, operations) {
@Override
protected void doSuspend() throws Exception {
- consumerSuspended.set(true);
+ CONSUMER_SUSPENDED.set(true);
super.doSuspend();
}
};
[4/4] git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddc6b43c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddc6b43c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddc6b43c
Branch: refs/heads/camel-2.12.x
Commit: ddc6b43c10929fa1d785e53d22f97970a583d50e
Parents: 041c0ef
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 11 10:23:29 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 11 10:23:58 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/ShutdownDeferTest.java | 6 +++---
.../java/org/apache/camel/processor/ShutdownNotDeferTest.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ddc6b43c/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
index 5220ed4..b7cf4f6 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
@@ -35,7 +35,7 @@ import static org.apache.camel.ShutdownRoute.Defer;
*/
public class ShutdownDeferTest extends ContextTestSupport {
- private static final AtomicBoolean consumerSuspended = new AtomicBoolean();
+ private static final AtomicBoolean CONSUMER_SUSPENDED = new AtomicBoolean();
@Override
protected void setUp() throws Exception {
@@ -59,7 +59,7 @@ public class ShutdownDeferTest extends ContextTestSupport {
context.stop();
- assertFalse("Should not have been suspended", consumerSuspended.get());
+ assertFalse("Should not have been suspended", CONSUMER_SUSPENDED.get());
}
@Override
@@ -98,7 +98,7 @@ public class ShutdownDeferTest extends ContextTestSupport {
return new FileConsumer(this, processor, operations) {
@Override
protected void doSuspend() throws Exception {
- consumerSuspended.set(true);
+ CONSUMER_SUSPENDED.set(true);
super.doSuspend();
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/ddc6b43c/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
index 5a8156d..5ce82ff 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
@@ -35,7 +35,7 @@ import static org.apache.camel.ShutdownRoute.Default;
*/
public class ShutdownNotDeferTest extends ContextTestSupport {
- private static final AtomicBoolean consumerSuspended = new AtomicBoolean();
+ private static final AtomicBoolean CONSUMER_SUSPENDED = new AtomicBoolean();
@Override
protected void setUp() throws Exception {
@@ -57,7 +57,7 @@ public class ShutdownNotDeferTest extends ContextTestSupport {
context.stop();
- assertTrue("Should have been suspended", consumerSuspended.get());
+ assertTrue("Should have been suspended", CONSUMER_SUSPENDED.get());
}
@Override
@@ -92,7 +92,7 @@ public class ShutdownNotDeferTest extends ContextTestSupport {
return new FileConsumer(this, processor, operations) {
@Override
protected void doSuspend() throws Exception {
- consumerSuspended.set(true);
+ CONSUMER_SUSPENDED.set(true);
super.doSuspend();
}
};
[3/4] git commit: Added test based on user forum issue
Posted by da...@apache.org.
Added test based on user forum issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/041c0ef4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/041c0ef4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/041c0ef4
Branch: refs/heads/camel-2.12.x
Commit: 041c0ef4c0ccaf922459b444792e63c9daa15dae
Parents: de69754
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 11 10:22:33 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 11 10:23:52 2013 +0200
----------------------------------------------------------------------
.../SplitTokenizerXmlMultilineTest.java | 63 ++++++++++++++++++++
1 file changed, 63 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/041c0ef4/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java
new file mode 100644
index 0000000..530b757
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerXmlMultilineTest.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class SplitTokenizerXmlMultilineTest extends ContextTestSupport {
+
+ public void testSingleLine() throws Exception {
+ String payload = "<Parent>\n"
+ + "\t<Child A=\"1\" B=\"2\"/>\n"
+ + "</Parent>";
+
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", payload);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testMultipleLines() throws Exception {
+ String payload = "<Parent>\n"
+ + "\t<Child A=\"1\"\n"
+ + "\tB=\"2\"/>\n"
+ + "</Parent>";
+
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", payload);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .split().tokenizeXML("Child")
+ .to("mock:result");
+ }
+ };
+ }
+}