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 2014/08/27 08:42:39 UTC
git commit: Fixed tests
Repository: camel
Updated Branches:
refs/heads/master 5d3b9457e -> f39b5446e
Fixed tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f39b5446
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f39b5446
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f39b5446
Branch: refs/heads/master
Commit: f39b5446ef2c454cc87ed61bee38226e2d248d9d
Parents: 5d3b945
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 27 08:38:27 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 27 08:42:33 2014 +0200
----------------------------------------------------------------------
.../apache/camel/processor/OnCompletionOnFailureOnlyTest.java | 2 +-
.../org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala | 4 ++--
.../camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala | 5 +++--
.../camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala | 6 +++---
4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f39b5446/camel-core/src/test/java/org/apache/camel/processor/OnCompletionOnFailureOnlyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/OnCompletionOnFailureOnlyTest.java b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionOnFailureOnlyTest.java
index 44fe5c4..d34cf26 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/OnCompletionOnFailureOnlyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/OnCompletionOnFailureOnlyTest.java
@@ -49,7 +49,7 @@ public class OnCompletionOnFailureOnlyTest extends OnCompletionTest {
.to("mock:sync")
// must use end to denote the end of the onCompletion route
.end()
- // here the original route contiues
+ // here the original route continues
.process(new MyProcessor())
.to("mock:result");
// END SNIPPET: e1
http://git-wip-us.apache.org/repos/asf/camel/blob/f39b5446/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala
index 2e9e3af..6714bf1 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionGlobalTest.scala
@@ -24,9 +24,9 @@ class SOnCompletionGlobalTest extends OnCompletionGlobalTest with RouteBuilderSu
override def createRouteBuilder = new RouteBuilder {
- onCompletion to "mock:sync"
+ onCompletion to "log:global" to "mock:sync"
- "direct:start" process (new MyProcessor()) to ("mock:result")
+ "direct:start" process new MyProcessor() to "mock:result"
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f39b5446/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
index 354c34d..3309143 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
@@ -17,7 +17,7 @@
package org.apache.camel
package scala.dsl
-import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
+import org.apache.camel.processor.OnCompletionTest.MyProcessor
import org.apache.camel.scala.dsl.builder.{RouteBuilderSupport, RouteBuilder}
import processor.OnCompletionOnCompleteOnlyTest
@@ -26,7 +26,8 @@ class SOnCompletionOnCompleteOnlyTest extends OnCompletionOnCompleteOnlyTest wit
override def createRouteBuilder = new RouteBuilder {
"direct:start" ==> {
- onCompletion(completeOnly).parallelProcessing {
+ onCompletion.onCompleteOnly {
+ to("log:sync")
to("mock:sync")
}
process(new MyProcessor())
http://git-wip-us.apache.org/repos/asf/camel/blob/f39b5446/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
index f645d54..b897edb 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
@@ -17,7 +17,7 @@
package org.apache.camel
package scala.dsl
-import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
+import org.apache.camel.processor.OnCompletionTest.MyProcessor
import org.apache.camel.scala.dsl.builder.{RouteBuilderSupport, RouteBuilder}
import processor.OnCompletionOnFailureOnlyTest
@@ -26,14 +26,14 @@ class SOnCompletionOnFailureOnlyTest extends OnCompletionOnFailureOnlyTest with
override def createRouteBuilder = new RouteBuilder {
"direct:start" ==> {
- onCompletion(failureOnly).parallelProcessing {
+ onCompletion.onFailureOnly {
+ to("log:sync")
to("mock:sync")
}
process(new MyProcessor())
to("mock:result")
}
- def containsHello(exchange: Exchange) = exchange.getIn.getBody(classOf[String]).contains("Hello")
}
}