You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2011/06/07 02:12:57 UTC
svn commit: r1132841 -
/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/
Author: hadrian
Date: Tue Jun 7 00:12:56 2011
New Revision: 1132841
URL: http://svn.apache.org/viewvc?rev=1132841&view=rev
Log:
CAMEL-4022. Checkstyle fixes.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java Tue Jun 7 00:12:56 2011
@@ -54,7 +54,7 @@ public class ContextScopedOnExceptionErr
onException(IllegalArgumentException.class)
.handled(true)
.to("mock:handled")
- .end();
+ .end();
from("direct:start")
.to("mock:a")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java Tue Jun 7 00:12:56 2011
@@ -64,7 +64,7 @@ public class ContextScopedOnExceptionErr
onException(IllegalArgumentException.class)
.handled(true)
.to("mock:handled")
- .end();
+ .end();
from("direct:foo")
.errorHandler(new ErrorHandlerBuilderRef("myDLC"))
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java Tue Jun 7 00:12:56 2011
@@ -59,7 +59,7 @@ public class ContextScopedOnExceptionNot
onException(IllegalArgumentException.class)
.handled(false)
.to("mock:handled")
- .end();
+ .end();
errorHandler(new ErrorHandlerBuilderRef("myDLC"));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java Tue Jun 7 00:12:56 2011
@@ -73,7 +73,7 @@ public class ContextScopedOnExceptionNot
onException(IllegalArgumentException.class)
.handled(false)
.to("mock:handled")
- .end();
+ .end();
from("direct:foo")
.to("mock:foo")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java Tue Jun 7 00:12:56 2011
@@ -71,7 +71,7 @@ public class ContextScopedOnExceptionNot
onException(IllegalArgumentException.class)
.handled(false)
.to("mock:handled")
- .end();
+ .end();
from("direct:foo")
.errorHandler(new ErrorHandlerBuilderRef("myDLC"))
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java Tue Jun 7 00:12:56 2011
@@ -53,7 +53,7 @@ public class ContextScopedOnExceptionRou
onException(IllegalArgumentException.class)
.handled(true)
.to("mock:handled")
- .end();
+ .end();
from("direct:start")
.errorHandler(new ErrorHandlerBuilderRef("myDLC"))
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java Tue Jun 7 00:12:56 2011
@@ -64,7 +64,7 @@ public class ContextScopedOnExceptionRou
onException(IllegalArgumentException.class)
.handled(true)
.to("mock:handled")
- .end();
+ .end();
from("direct:foo")
.errorHandler(new ErrorHandlerBuilderRef("myDLC"))
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java?rev=1132841&r1=1132840&r2=1132841&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionThrownFromOnExceptionTest.java Tue Jun 7 00:12:56 2011
@@ -30,8 +30,8 @@ import org.apache.camel.builder.RouteBui
*/
public class ExceptionThrownFromOnExceptionTest extends ContextTestSupport {
- private static AtomicInteger RETRY = new AtomicInteger();
- private static AtomicInteger ON_EXCEPTION_RETRY = new AtomicInteger();
+ private static AtomicInteger retry = new AtomicInteger();
+ private static AtomicInteger onExceptionRetry = new AtomicInteger();
@Override
public boolean isUseRouteBuilder() {
@@ -39,8 +39,8 @@ public class ExceptionThrownFromOnExcept
}
public void testExceptionThrownFromOnException() throws Exception {
- RETRY.set(0);
- ON_EXCEPTION_RETRY.set(0);
+ retry.set(0);
+ onExceptionRetry.set(0);
context.addRoutes(new RouteBuilder() {
@Override
@@ -52,7 +52,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- ON_EXCEPTION_RETRY.incrementAndGet();
+ onExceptionRetry.incrementAndGet();
throw new IOException("Some other IOException");
}
})
@@ -67,7 +67,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- RETRY.incrementAndGet();
+ retry.incrementAndGet();
throw new IOException("IO error");
}
})
@@ -92,13 +92,13 @@ public class ExceptionThrownFromOnExcept
assertMockEndpointsSatisfied();
- assertEquals("Should try 4 times (1 first, 3 retry)", 4, RETRY.get());
- assertEquals("Should only invoke onException once", 1, ON_EXCEPTION_RETRY.get());
+ assertEquals("Should try 4 times (1 first, 3 retry)", 4, retry.get());
+ assertEquals("Should only invoke onException once", 1, onExceptionRetry.get());
}
public void testExceptionThrownFromOnExceptionAndHandled() throws Exception {
- RETRY.set(0);
- ON_EXCEPTION_RETRY.set(0);
+ retry.set(0);
+ onExceptionRetry.set(0);
context.addRoutes(new RouteBuilder() {
@Override
@@ -112,7 +112,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- ON_EXCEPTION_RETRY.incrementAndGet();
+ onExceptionRetry.incrementAndGet();
throw new IOException("Some other IOException");
}
})
@@ -127,7 +127,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- RETRY.incrementAndGet();
+ retry.incrementAndGet();
throw new IOException("IO error");
}
})
@@ -152,13 +152,13 @@ public class ExceptionThrownFromOnExcept
assertMockEndpointsSatisfied();
- assertEquals("Should try 4 times (1 first, 3 retry)", 4, RETRY.get());
- assertEquals("Should only invoke onException once", 1, ON_EXCEPTION_RETRY.get());
+ assertEquals("Should try 4 times (1 first, 3 retry)", 4, retry.get());
+ assertEquals("Should only invoke onException once", 1, onExceptionRetry.get());
}
public void testExceptionThrownFromOnExceptionWithDeadLetterChannel() throws Exception {
- RETRY.set(0);
- ON_EXCEPTION_RETRY.set(0);
+ retry.set(0);
+ onExceptionRetry.set(0);
context.addRoutes(new RouteBuilder() {
@Override
@@ -173,7 +173,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- ON_EXCEPTION_RETRY.incrementAndGet();
+ onExceptionRetry.incrementAndGet();
throw new IOException("Some other IOException");
}
})
@@ -188,7 +188,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- RETRY.incrementAndGet();
+ retry.incrementAndGet();
throw new IOException("IO error");
}
})
@@ -216,13 +216,13 @@ public class ExceptionThrownFromOnExcept
assertMockEndpointsSatisfied();
- assertEquals("Should try 4 times (1 first, 3 retry)", 4, RETRY.get());
- assertEquals("Should only invoke onException once", 1, ON_EXCEPTION_RETRY.get());
+ assertEquals("Should try 4 times (1 first, 3 retry)", 4, retry.get());
+ assertEquals("Should only invoke onException once", 1, onExceptionRetry.get());
}
public void testExceptionThrownFromOnExceptionAndHandledWithDeadLetterChannel() throws Exception {
- RETRY.set(0);
- ON_EXCEPTION_RETRY.set(0);
+ retry.set(0);
+ onExceptionRetry.set(0);
context.addRoutes(new RouteBuilder() {
@Override
@@ -239,7 +239,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- ON_EXCEPTION_RETRY.incrementAndGet();
+ onExceptionRetry.incrementAndGet();
throw new IOException("Some other IOException");
}
})
@@ -254,7 +254,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- RETRY.incrementAndGet();
+ retry.incrementAndGet();
throw new IOException("IO error");
}
})
@@ -282,13 +282,13 @@ public class ExceptionThrownFromOnExcept
assertMockEndpointsSatisfied();
- assertEquals("Should try 4 times (1 first, 3 retry)", 4, RETRY.get());
- assertEquals("Should only invoke onException once", 1, ON_EXCEPTION_RETRY.get());
+ assertEquals("Should try 4 times (1 first, 3 retry)", 4, retry.get());
+ assertEquals("Should only invoke onException once", 1, onExceptionRetry.get());
}
public void testNoExceptionThrownFromOnExceptionWithDeadLetterChannel() throws Exception {
- RETRY.set(0);
- ON_EXCEPTION_RETRY.set(0);
+ retry.set(0);
+ onExceptionRetry.set(0);
context.addRoutes(new RouteBuilder() {
@Override
@@ -303,7 +303,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- ON_EXCEPTION_RETRY.incrementAndGet();
+ onExceptionRetry.incrementAndGet();
// no exception is thrown this time
}
})
@@ -318,7 +318,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- RETRY.incrementAndGet();
+ retry.incrementAndGet();
throw new IOException("IO error");
}
})
@@ -348,13 +348,13 @@ public class ExceptionThrownFromOnExcept
assertMockEndpointsSatisfied();
- assertEquals("Should try 4 times (1 first, 3 retry)", 4, RETRY.get());
- assertEquals("Should only invoke onException once", 1, ON_EXCEPTION_RETRY.get());
+ assertEquals("Should try 4 times (1 first, 3 retry)", 4, retry.get());
+ assertEquals("Should only invoke onException once", 1, onExceptionRetry.get());
}
public void testNoExceptionThrownFromOnExceptionAndHandledWithDeadLetterChannel() throws Exception {
- RETRY.set(0);
- ON_EXCEPTION_RETRY.set(0);
+ retry.set(0);
+ onExceptionRetry.set(0);
context.addRoutes(new RouteBuilder() {
@Override
@@ -371,7 +371,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- ON_EXCEPTION_RETRY.incrementAndGet();
+ onExceptionRetry.incrementAndGet();
// no exception is thrown this time
}
})
@@ -386,7 +386,7 @@ public class ExceptionThrownFromOnExcept
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- RETRY.incrementAndGet();
+ retry.incrementAndGet();
throw new IOException("IO error");
}
})
@@ -409,8 +409,8 @@ public class ExceptionThrownFromOnExcept
assertMockEndpointsSatisfied();
- assertEquals("Should try 4 times (1 first, 3 retry)", 4, RETRY.get());
- assertEquals("Should only invoke onException once", 1, ON_EXCEPTION_RETRY.get());
+ assertEquals("Should try 4 times (1 first, 3 retry)", 4, retry.get());
+ assertEquals("Should only invoke onException once", 1, onExceptionRetry.get());
}
}