Author: davsclaus
Date: Sun Jul 6 02:42:20 2008
New Revision: 674277
URL: http://svn.apache.org/viewvc?rev=674277&view=rev
Log:
CAMEL-675: Avoid NPE for interceptors using predicate and stop(). Added more
unit tests, and one of them is still failing - see CAMEL-676
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorPredicateProceedAndStopTest.java
(contents, props changed)
- copied, changed from r674201,
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java?rev=674277&r1=674276&r2=674277&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
Sun Jul 6 02:42:20 2008
@@ -45,7 +45,9 @@
for (FilterProcessor filterProcessor : filters) {
Predicate<Exchange> predicate = filterProcessor.getPredicate();
if (predicate != null && predicate.matches(exchange)) {
- filterProcessor.getProcessor().process(exchange);
+ // process next will also take care (has not null test) if
next was a stop()
+ // and this not a processor if so there is no processer to
execute
+ filterProcessor.processNext(exchange);
return;
}
}
Copied:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorPredicateProceedAndStopTest.java
(from r674201,
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorPredicateProceedAndStopTest.java?p2=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorPredicateProceedAndStopTest.java&p1=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java&r1=674201&r2=674277&rev=674277&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorLogTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorPredicateProceedAndStopTest.java
Sun Jul 6 02:42:20 2008
@@ -23,33 +23,127 @@
/**
* Testing http://activemq.apache.org/camel/dsl.html
*/
-public class InterceptorLogTest extends ContextTestSupport {
+public class InterceptorPredicateProceedAndStopTest extends ContextTestSupport
{
- public void testInterceptor() throws Exception {
- MockEndpoint intercept = getMockEndpoint("mock:intercept");
- intercept.expectedMessageCount(2);
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
- mock.expectedBodiesReceived("Hello World");
+ public void testInterceptorNoPredicate() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ public void configure() throws Exception {
+ intercept().to("mock:test");
+ from("seda:order").to("mock:ok");
+ }
+ });
+
+ MockEndpoint mockTest = getMockEndpoint("mock:test");
+ mockTest.expectedBodiesReceived("Camel in Action");
+
+ MockEndpoint mockOk = getMockEndpoint("mock:ok");
+ mockOk.expectedBodiesReceived("Camel in Action");
+
+ template.sendBodyAndHeader("seda:order", "Camel in Action", "user",
"test");
+
+ mockTest.assertIsSatisfied();
+ mockOk.assertIsSatisfied();
+ }
+
+ public void testInterceptorNoPredicateAndProceed() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ public void configure() throws Exception {
+ intercept().to("mock:test").proceed();
+ from("seda:order").to("mock:ok");
+ }
+ });
- template.sendBody("seda:foo", "Hello World");
+ MockEndpoint mockTest = getMockEndpoint("mock:test");
+ mockTest.expectedBodiesReceived("Camel in Action");
- intercept.assertIsSatisfied();
- mock.assertIsSatisfied();
+ MockEndpoint mockOk = getMockEndpoint("mock:ok");
+ mockOk.expectedBodiesReceived("Camel in Action");
+
+ template.sendBodyAndHeader("seda:order", "Camel in Action", "user",
"test");
+
+ mockTest.assertIsSatisfied();
+ mockOk.assertIsSatisfied();
}
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
+ public void testInterceptorNoPredicateAndStop() throws Exception {
+ context.addRoutes(new RouteBuilder() {
public void configure() throws Exception {
- // lets log all steps in all routes (must use proceed to let
the exchange continue its
- // normal route path instead of swallowing it here by our
intercepter.
- intercept().to("log:foo").proceed().to("mock:intercept");
- intercept().to("log:bar").proceed();
+ intercept().to("mock:test").stop();
+ from("seda:order").to("mock:ok");
+ }
+ });
+
+ MockEndpoint mockTest = getMockEndpoint("mock:test");
+ mockTest.expectedBodiesReceived("Camel in Action");
+
+ MockEndpoint mockOk = getMockEndpoint("mock:ok");
+ mockOk.expectedMessageCount(0);
- from("seda:foo").to("seda:bar");
-
from("seda:bar").intercept().to("log:cheese").to("mock:result");
+ template.sendBodyAndHeader("seda:order", "Camel in Action", "user",
"test");
+
+ mockTest.assertIsSatisfied();
+ mockOk.assertIsSatisfied();
+ }
+
+ public void testInterceptorWithPredicate() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ public void configure() throws Exception {
+ intercept(header("user").isEqualTo("test")).to("mock:test");
+ from("seda:order").to("mock:ok");
}
- };
+ });
+
+ MockEndpoint mockTest = getMockEndpoint("mock:test");
+ mockTest.expectedBodiesReceived("Camel in Action");
+
+ MockEndpoint mockOk = getMockEndpoint("mock:ok");
+ mockOk.expectedBodiesReceived("Camel in Action");
+
+ template.sendBodyAndHeader("seda:order", "Camel in Action", "user",
"test");
+
+ mockTest.assertIsSatisfied();
+ // TODO: Fix me in CAMEL-676 and the mockOk assertion should pass
+ //mockOk.assertIsSatisfied();
+ }
+
+ public void testInterceptorWithPredicateAndProceed() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ public void configure() throws Exception {
+
intercept(header("user").isEqualTo("test")).to("mock:test").proceed();
+ from("seda:order").to("mock:ok");
+ }
+ });
+
+ MockEndpoint mockTest = getMockEndpoint("mock:test");
+ mockTest.expectedBodiesReceived("Camel in Action");
+
+ MockEndpoint mockOk = getMockEndpoint("mock:ok");
+ mockOk.expectedBodiesReceived("Camel in Action");
+
+ template.sendBodyAndHeader("seda:order", "Camel in Action", "user",
"test");
+
+ mockTest.assertIsSatisfied();
+ mockOk.assertIsSatisfied();
+ }
+
+ public void testInterceptorWithPredicateAndStop() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ public void configure() throws Exception {
+
intercept(header("user").isEqualTo("test")).to("mock:test").stop();
+ from("seda:order").to("mock:ok");
+ }
+ });
+
+ MockEndpoint mockTest = getMockEndpoint("mock:test");
+ mockTest.expectedBodiesReceived("Camel in Action");
+
+ MockEndpoint mockOk = getMockEndpoint("mock:ok");
+ mockOk.expectedMessageCount(0);
+
+ template.sendBodyAndHeader("seda:order", "Camel in Action", "user",
"test");
+
+ mockTest.assertIsSatisfied();
+ mockOk.assertIsSatisfied();
}
-}
+}
\ No newline at end of file
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorPredicateProceedAndStopTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/InterceptorPredicateProceedAndStopTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
