CAMEL-11229: Rename due typo
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7fda1675 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7fda1675 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7fda1675 Branch: refs/heads/camel-2.19.x Commit: 7fda1675bf971c2bda5af724a67a1cea3c33aa27 Parents: b69dd82 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu May 11 11:55:56 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu May 11 18:39:39 2017 +0200 ---------------------------------------------------------------------- .../ErrorOccuredInOnExceptionRoute.java | 134 ------------------- .../ErrorOccurredInOnExceptionRoute.java | 134 +++++++++++++++++++ 2 files changed, 134 insertions(+), 134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7fda1675/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccuredInOnExceptionRoute.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccuredInOnExceptionRoute.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccuredInOnExceptionRoute.java deleted file mode 100644 index f7f5699..0000000 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccuredInOnExceptionRoute.java +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 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.onexception; - -import java.io.IOException; - -import org.apache.camel.CamelExecutionException; -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; - -/** - * @version - */ -public class ErrorOccuredInOnExceptionRoute extends ContextTestSupport { - - // TODO: fails when run individually but works with mvn clean install and run all tests - - @Override - public boolean isUseRouteBuilder() { - return false; - } - - public void testErrorInOnException() throws Exception { - context.addRoutes(new RouteBuilder() { - @Override - public void configure() throws Exception { - onException(MyTechnicalException.class) - .handled(true) - .to("mock:tech"); - - onException(MyFunctionalException.class) - .handled(true) - .to("mock:onFunc") - .throwException(new MyTechnicalException("Tech error")) - .to("mock:doneFunc"); - - // in this regular route the processing failed - from("direct:start") - .throwException(new MyFunctionalException("Func error")); - } - }); - context.start(); - - getMockEndpoint("mock:onFunc").expectedMessageCount(1); - getMockEndpoint("mock:doneFunc").expectedMessageCount(0); - getMockEndpoint("mock:tech").expectedMessageCount(1); - - template.sendBody("direct:start", "Hello World"); - - assertMockEndpointsSatisfied(); - } - - public void testErrorInOnExceptionNotHandledSecondOnException() throws Exception { - context.addRoutes(new RouteBuilder() { - @Override - public void configure() throws Exception { - onException(IOException.class) - // we cannot handle this exception so it should propagate back - .to("mock:tech"); - - onException(MyFunctionalException.class) - .handled(true) - .to("mock:onFunc") - .throwException(new IOException("Cannot do this")) - .to("mock:doneFunc"); - - // in this regular route the processing failed - from("direct:start") - .throwException(new MyFunctionalException("Func error")); - } - }); - context.start(); - - getMockEndpoint("mock:onFunc").expectedMessageCount(1); - getMockEndpoint("mock:doneFunc").expectedMessageCount(0); - getMockEndpoint("mock:tech").expectedMessageCount(1); - - try { - template.sendBody("direct:start", "Hello World"); - fail("Should have thrown an exception"); - } catch (CamelExecutionException e) { - assertIsInstanceOf(IOException.class, e.getCause()); - assertEquals("Cannot do this", e.getCause().getMessage()); - } - - assertMockEndpointsSatisfied(); - } - - public void testErrorInOnExceptionNotHandled() throws Exception { - context.addRoutes(new RouteBuilder() { - @Override - public void configure() throws Exception { - onException(MyFunctionalException.class) - .handled(true) - .to("mock:onFunc") - .throwException(new IOException("Cannot do this")) - .to("mock:doneFunc"); - - // in this regular route the processing failed - from("direct:start") - .throwException(new MyFunctionalException("Func error")); - } - }); - context.start(); - - getMockEndpoint("mock:onFunc").expectedMessageCount(1); - getMockEndpoint("mock:doneFunc").expectedMessageCount(0); - - try { - template.sendBody("direct:start", "Hello World"); - fail("Should have thrown an exception"); - } catch (CamelExecutionException e) { - assertIsInstanceOf(IOException.class, e.getCause()); - assertEquals("Cannot do this", e.getCause().getMessage()); - } - - assertMockEndpointsSatisfied(); - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/7fda1675/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccurredInOnExceptionRoute.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccurredInOnExceptionRoute.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccurredInOnExceptionRoute.java new file mode 100644 index 0000000..6ad3a8f --- /dev/null +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/ErrorOccurredInOnExceptionRoute.java @@ -0,0 +1,134 @@ +/** + * 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.onexception; + +import java.io.IOException; + +import org.apache.camel.CamelExecutionException; +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; + +/** + * @version + */ +public class ErrorOccurredInOnExceptionRoute extends ContextTestSupport { + + // TODO: fails when run individually but works with mvn clean install and run all tests + + @Override + public boolean isUseRouteBuilder() { + return false; + } + + public void testErrorInOnException() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + onException(MyTechnicalException.class) + .handled(true) + .to("mock:tech"); + + onException(MyFunctionalException.class) + .handled(true) + .to("mock:onFunc") + .throwException(new MyTechnicalException("Tech error")) + .to("mock:doneFunc"); + + // in this regular route the processing failed + from("direct:start") + .throwException(new MyFunctionalException("Func error")); + } + }); + context.start(); + + getMockEndpoint("mock:onFunc").expectedMessageCount(1); + getMockEndpoint("mock:doneFunc").expectedMessageCount(0); + getMockEndpoint("mock:tech").expectedMessageCount(1); + + template.sendBody("direct:start", "Hello World"); + + assertMockEndpointsSatisfied(); + } + + public void testErrorInOnExceptionNotHandledSecondOnException() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + onException(IOException.class) + // we cannot handle this exception so it should propagate back + .to("mock:tech"); + + onException(MyFunctionalException.class) + .handled(true) + .to("mock:onFunc") + .throwException(new IOException("Cannot do this")) + .to("mock:doneFunc"); + + // in this regular route the processing failed + from("direct:start") + .throwException(new MyFunctionalException("Func error")); + } + }); + context.start(); + + getMockEndpoint("mock:onFunc").expectedMessageCount(1); + getMockEndpoint("mock:doneFunc").expectedMessageCount(0); + getMockEndpoint("mock:tech").expectedMessageCount(1); + + try { + template.sendBody("direct:start", "Hello World"); + fail("Should have thrown an exception"); + } catch (CamelExecutionException e) { + assertIsInstanceOf(IOException.class, e.getCause()); + assertEquals("Cannot do this", e.getCause().getMessage()); + } + + assertMockEndpointsSatisfied(); + } + + public void testErrorInOnExceptionNotHandled() throws Exception { + context.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + onException(MyFunctionalException.class) + .handled(true) + .to("mock:onFunc") + .throwException(new IOException("Cannot do this")) + .to("mock:doneFunc"); + + // in this regular route the processing failed + from("direct:start") + .throwException(new MyFunctionalException("Func error")); + } + }); + context.start(); + + getMockEndpoint("mock:onFunc").expectedMessageCount(1); + getMockEndpoint("mock:doneFunc").expectedMessageCount(0); + + try { + template.sendBody("direct:start", "Hello World"); + fail("Should have thrown an exception"); + } catch (CamelExecutionException e) { + assertIsInstanceOf(IOException.class, e.getCause()); + assertEquals("Cannot do this", e.getCause().getMessage()); + } + + assertMockEndpointsSatisfied(); + } + +}
