This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6a657c70dfd26e4b130df29cf71ec0b1fcb1c0b4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 14 16:20:42 2019 +0200
CAMEL-13522: camel3 - The various Camel exceptions should favour extending
runtime exception
---
.../camel/spring/CircularComponentCreationTest.java | 6 ++----
.../ErrorHandlerCamelContextRefNotFoundTest.java | 5 +++--
.../ErrorHandlerRouteContextRefNotFoundTest.java | 4 ++--
.../spring/issues/SpringMainStartFailedIssueTest.java | 4 ++--
.../SpringCamelContextStartingFailedEventTest.java | 4 ++--
...pringDeadLetterChannelInvalidDeadLetterUriTest.java | 5 +++--
...eadLetterChannelInvalidOptionDeadLetterUriTest.java | 5 +++--
.../SpringDoubleLoadBalancerMisconfigurationTest.java | 5 +++--
.../spring/processor/SpringFilterNoChildTest.java | 5 +++--
...ringRouteWithConstantFieldFromExchangeFailTest.java | 18 ++----------------
.../processor/SpringTryCatchMisconfiguredTest.java | 8 ++++----
.../SpringTryCatchMustHaveExceptionConfiguredTest.java | 4 ++--
12 files changed, 31 insertions(+), 42 deletions(-)
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
index 735c186..e9700aa 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentCreationTest.java
@@ -16,9 +16,7 @@
*/
package org.apache.camel.spring;
-
import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.IOHelper;
import org.junit.Assert;
import org.junit.Test;
@@ -32,8 +30,8 @@ public class CircularComponentCreationTest {
doTest("org/apache/camel/spring/CircularComponentCreationSimpleTest.xml");
Assert.fail("Exception should have been thrown");
- } catch (RuntimeCamelException e) {
- Assert.assertTrue(e.getCause() instanceof
FailedToCreateRouteException);
+ } catch (Exception e) {
+ Assert.assertTrue(e instanceof FailedToCreateRouteException);
}
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
index eb1c5e8..06741a7 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.spring.config;
+
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.RuntimeCamelException;
@@ -32,8 +33,8 @@ public class ErrorHandlerCamelContextRefNotFoundTest extends
SpringTestSupport {
try {
super.setUp();
fail("Should have thrown an exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException cause =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException cause =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
NoSuchBeanException nsbe =
assertIsInstanceOf(NoSuchBeanException.class, cause.getCause());
assertEquals("No bean could be found in the registry for: foo of
type: org.apache.camel.builder.ErrorHandlerBuilder", nsbe.getMessage());
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
index 5841dc3..5f9483d 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
@@ -32,8 +32,8 @@ public class ErrorHandlerRouteContextRefNotFoundTest extends
SpringTestSupport {
try {
super.setUp();
fail("Should have thrown exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException cause =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException cause =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
NoSuchBeanException nsbe =
assertIsInstanceOf(NoSuchBeanException.class, cause.getCause());
assertEquals("No bean could be found in the registry for: bar of
type: org.apache.camel.builder.ErrorHandlerBuilder", nsbe.getMessage());
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
index 9931751..b94b651 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
@@ -32,8 +32,8 @@ public class SpringMainStartFailedIssueTest extends
TestSupport {
try {
main.run(args);
fail("Should have thrown an exception");
- } catch (RuntimeCamelException e) {
- assertIsInstanceOf(FailedToCreateRouteException.class,
e.getCause());
+ } catch (Exception e) {
+ assertIsInstanceOf(FailedToCreateRouteException.class, e);
}
assertNull("Spring application context should NOT be created",
main.getApplicationContext());
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
index 805e24f..30d60d9 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
@@ -35,8 +35,8 @@ public class SpringCamelContextStartingFailedEventTest
extends SpringTestSupport
try {
new
ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml");
fail("Should thrown an exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
assertIsInstanceOf(ResolveEndpointFailedException.class,
ftcre.getCause());
// expected
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
index b2b1057..af771a2 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.spring.processor;
+
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.RuntimeCamelException;
@@ -37,8 +38,8 @@ public class SpringDeadLetterChannelInvalidDeadLetterUriTest
extends SpringTestS
try {
super.setUp();
fail("Should have thrown an exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
NoSuchEndpointException cause =
assertIsInstanceOf(NoSuchEndpointException.class, ftcre.getCause());
assertEquals("No endpoint could be found for: xxx, please check
your classpath contains the needed Camel component jar.", cause.getMessage());
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
index bb57cfd..2d23645 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.spring.processor;
+
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.RuntimeCamelException;
@@ -37,8 +38,8 @@ public class
SpringDeadLetterChannelInvalidOptionDeadLetterUriTest extends Sprin
try {
super.setUp();
fail("Should have thrown an exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
ResolveEndpointFailedException cause =
assertIsInstanceOf(ResolveEndpointFailedException.class, ftcre.getCause());
assertTrue(cause.getMessage().endsWith("Unknown
parameters=[{foo=bar}]"));
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
index cf33f57..4930b79 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.spring.processor;
+
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.FailedToCreateRouteException;
@@ -32,8 +33,8 @@ public class SpringDoubleLoadBalancerMisconfigurationTest
extends ContextTestSup
try {
super.setUp();
fail("Should have thrown exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException fe =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException fe =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
IllegalArgumentException ie =
assertIsInstanceOf(IllegalArgumentException.class, fe.getCause());
assertTrue(ie.getMessage().startsWith("Loadbalancer already
configured to: RandomLoadBalancer. Cannot set it to:
LoadBalanceType[RoundRobinLoadBalancer"));
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
index 990f7eb..56bf920 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.spring.processor;
+
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spring.SpringTestSupport;
@@ -30,8 +31,8 @@ public class SpringFilterNoChildTest extends
SpringTestSupport {
try {
new
ClassPathXmlApplicationContext("org/apache/camel/spring/processor/filterNoChild.xml");
fail("Should thrown an exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException cause =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException cause =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, cause.getCause());
assertEquals("Definition has no children on Filter[xpath{$foo =
'bar'} -> []]", iae.getMessage());
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
index e707fa4..2ac068c 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRouteWithConstantFieldFromExchangeFailTest.java
@@ -15,30 +15,16 @@
* limitations under the License.
*/
package org.apache.camel.spring.processor;
+
import org.apache.camel.CamelContext;
-import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.processor.RouteWithConstantFieldFromExchangeFailTest;
-import org.junit.Before;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
public class SpringRouteWithConstantFieldFromExchangeFailTest extends
RouteWithConstantFieldFromExchangeFailTest {
- @Override
- @Before
- public void setUp() throws Exception {
- try {
- super.setUp();
- fail("Should have thrown an exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException re =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
- IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, re.getCause());
- assertEquals("Constant field with name: XXX not found on
Exchange.class", iae.getMessage());
- }
- }
-
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this,
"org/apache/camel/spring/processor/RouteWithConstantFieldFromExchangeFailTest.xml");
}
+
}
\ No newline at end of file
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
index bb1dafe..85bf262 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
@@ -31,8 +31,8 @@ public class SpringTryCatchMisconfiguredTest extends
ContextTestSupport {
try {
createSpringCamelContext(this,
"org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.xml");
fail("Should have thrown exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException ftce =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException ftce =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, ftce.getCause());
assertEquals("This doCatch should have a doTry as its parent on
DoCatch[ [class java.io.IOException] -> [To[mock:fail]]]", iae.getMessage());
}
@@ -40,8 +40,8 @@ public class SpringTryCatchMisconfiguredTest extends
ContextTestSupport {
try {
createSpringCamelContext(this,
"org/apache/camel/spring/processor/SpringTryCatchMisconfiguredFinallyTest.xml");
fail("Should have thrown exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, ftcre.getCause());
assertEquals("This doFinally should have a doTry as its parent on
DoFinally[[To[mock:finally]]]", iae.getMessage());
}
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
index 00eff42..0adf7cb 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
@@ -30,8 +30,8 @@ public class SpringTryCatchMustHaveExceptionConfiguredTest
extends ContextTestSu
try {
createSpringCamelContext(this,
"org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.xml");
fail("Should have thrown exception");
- } catch (RuntimeCamelException e) {
- FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ } catch (Exception e) {
+ FailedToCreateRouteException ftcre =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, ftcre.getCause());
assertEquals("At least one Exception must be configured to catch",
iae.getMessage());
}
