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 2008/08/28 09:29:28 UTC
svn commit: r689745 - in
/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel:
issues/BelasThreadErrorHandlerIssue794Test.java
processor/DeadLetterChannelRedeliveryTest.java
Author: ningjiang
Date: Thu Aug 28 00:29:27 2008
New Revision: 689745
URL: http://svn.apache.org/viewvc?rev=689745&view=rev
Log:
Fixed the CS errors of camel-core
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue794Test.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue794Test.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue794Test.java?rev=689745&r1=689744&r2=689745&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue794Test.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue794Test.java Thu Aug 28 00:29:27 2008
@@ -26,13 +26,13 @@
* Unit test to verify that error handling using thread() pool also works as expected.
*/
public class BelasThreadErrorHandlerIssue794Test extends ContextTestSupport {
- private static int counter;
+ private static int counter;
public void testThreadErrorHandlerRedeliveryNoThread() throws Exception {
counter = 0;
// We expect the exchange here after 1 delivery and 2 re-deliveries
- MockEndpoint mock= getMockEndpoint("mock:noThread");
+ MockEndpoint mock = getMockEndpoint("mock:noThread");
mock.expectedMessageCount(1);
mock.message(0).header("org.apache.camel.Redelivered").isEqualTo(Boolean.TRUE);
mock.message(0).header("org.apache.camel.RedeliveryCounter").isEqualTo(2);
@@ -47,7 +47,7 @@
counter = 0;
// We expect the exchange here after 1 delivery and 2 re-deliveries
- MockEndpoint mock= getMockEndpoint("mock:beforeThread");
+ MockEndpoint mock = getMockEndpoint("mock:beforeThread");
mock.expectedMessageCount(1);
mock.message(0).header("org.apache.camel.Redelivered").isEqualTo(Boolean.TRUE);
mock.message(0).header("org.apache.camel.RedeliveryCounter").isEqualTo(2);
@@ -69,7 +69,7 @@
counter = 0;
// We expect the exchange here after 1 delivery and 2 re-deliveries
- MockEndpoint mock= getMockEndpoint("mock:deafultAfterThread");
+ MockEndpoint mock = getMockEndpoint("mock:deafultAfterThread");
mock.expectedMessageCount(1);
mock.message(0).header("org.apache.camel.Redelivered").isEqualTo(Boolean.TRUE);
mock.message(0).header("org.apache.camel.RedeliveryCounter").isEqualTo(2);
@@ -92,35 +92,35 @@
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:inNoThread")
- .errorHandler(deadLetterChannel("mock:noThread").maximumRedeliveries(2))
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- counter++;
- throw new Exception("Forced exception by unit test");
- }
- });
+ .errorHandler(deadLetterChannel("mock:noThread").maximumRedeliveries(2))
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ counter++;
+ throw new Exception("Forced exception by unit test");
+ }
+ });
from("direct:inBeforeThread")
- .errorHandler(deadLetterChannel("mock:beforeThread").maximumRedeliveries(2))
- .thread(2)
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- counter++;
- throw new Exception("Forced exception by unit test");
- }
- });
+ .errorHandler(deadLetterChannel("mock:beforeThread").maximumRedeliveries(2))
+ .thread(2)
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ counter++;
+ throw new Exception("Forced exception by unit test");
+ }
+ });
errorHandler(deadLetterChannel("mock:deafultAfterThread").maximumRedeliveries(2));
from("direct:inAfterThread")
- .thread(2)
+ .thread(2)
// NOTE: this error handler below is not used as we must set it before the thread type
- .errorHandler(deadLetterChannel("mock:afterThread").maximumRedeliveries(1))
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- counter++;
- throw new Exception("Forced exception by unit test");
- }
- });
+ .errorHandler(deadLetterChannel("mock:afterThread").maximumRedeliveries(1))
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ counter++;
+ throw new Exception("Forced exception by unit test");
+ }
+ });
}
};
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java?rev=689745&r1=689744&r2=689745&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryTest.java Thu Aug 28 00:29:27 2008
@@ -82,31 +82,31 @@
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2))
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- counter++;
- throw new Exception("Forced exception by unit test");
- }
- });
+ .errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(2))
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ counter++;
+ throw new Exception("Forced exception by unit test");
+ }
+ });
from("direct:no")
- .errorHandler(deadLetterChannel("mock:no").maximumRedeliveries(0))
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- counter++;
- throw new Exception("Forced exception by unit test");
- }
- });
+ .errorHandler(deadLetterChannel("mock:no").maximumRedeliveries(0))
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ counter++;
+ throw new Exception("Forced exception by unit test");
+ }
+ });
from("direct:one")
- .errorHandler(deadLetterChannel("mock:one").maximumRedeliveries(1))
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- counter++;
- throw new Exception("Forced exception by unit test");
- }
- });
+ .errorHandler(deadLetterChannel("mock:one").maximumRedeliveries(1))
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ counter++;
+ throw new Exception("Forced exception by unit test");
+ }
+ });
}
};
}