This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch 13514
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 47447ba105b13dae9972812ffe168309df5431ae
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 14 15:11:30 2019 +0200
CAMEL-13522: camel3 - The various Camel exceptions should favour extending
runtime exception
---
.../java/org/apache/camel/component/bean/BeanInvokeStaticTest.java | 5 ++---
.../org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java | 2 +-
.../org/apache/camel/component/bean/BeanWithMethodHeaderTest.java | 4 ++--
.../component/file/FileConsumerFileExpressionThrowExceptionTest.java | 2 +-
.../java/org/apache/camel/component/xslt/InvalidXsltFileTest.java | 2 +-
.../java/org/apache/camel/component/xslt/XsltFileNotFoundTest.java | 4 ++--
.../src/test/java/org/apache/camel/component/xslt/XsltSaxonTest.java | 2 +-
.../test/java/org/apache/camel/impl/FromHasNoOutputRouteTest.java | 4 ++--
.../java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java | 2 +-
.../camel-core/src/test/java/org/apache/camel/language/BeanTest.java | 2 +-
.../java/org/apache/camel/management/ManagedDuplicateIdTest.java | 2 +-
11 files changed, 15 insertions(+), 16 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java
index 5cbd741..6826ad7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeStaticTest.java
@@ -54,9 +54,8 @@ public class BeanInvokeStaticTest extends ContextTestSupport {
context.start();
fail("Should have thrown exception");
} catch (Exception e) {
- assertIsInstanceOf(RuntimeCamelException.class, e.getCause());
- assertIsInstanceOf(MethodNotFoundException.class,
e.getCause().getCause());
- assertEquals("Static method with name: doSomething not found on
class: org.apache.camel.component.bean.MyStaticClass",
e.getCause().getCause().getMessage());
+ assertIsInstanceOf(MethodNotFoundException.class, e.getCause());
+ assertEquals("Static method with name: doSomething not found on
class: org.apache.camel.component.bean.MyStaticClass",
e.getCause().getMessage());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
index f70a3cf..5f6acc8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanRefMethodNotFoundTest.java
@@ -47,7 +47,7 @@ public class BeanRefMethodNotFoundTest extends
ContextTestSupport {
} catch (Exception e) {
FailedToCreateRouteException failed =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
assertEquals("b", failed.getRouteId());
- MethodNotFoundException cause =
assertIsInstanceOf(MethodNotFoundException.class, e.getCause().getCause());
+ MethodNotFoundException cause =
assertIsInstanceOf(MethodNotFoundException.class, e.getCause());
assertEquals("bye", cause.getMethodName());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
index 32ef478..fe3f6e8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithMethodHeaderTest.java
@@ -102,7 +102,7 @@ public class BeanWithMethodHeaderTest extends
ContextTestSupport {
});
fail("Should throw an exception");
} catch (Exception e) {
- MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, e.getCause().getCause());
+ MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, e.getCause());
assertEquals("ups", mnfe.getMethodName());
assertSame(bean, mnfe.getBean());
}
@@ -120,7 +120,7 @@ public class BeanWithMethodHeaderTest extends
ContextTestSupport {
});
fail("Should throw an exception");
} catch (Exception e) {
- MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, e.getCause().getCause());
+ MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, e.getCause());
assertEquals("ups", mnfe.getMethodName());
assertSame(myBean, mnfe.getBean());
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
index 5c2c81e..37ec5ba 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
@@ -83,7 +83,7 @@ public class FileConsumerFileExpressionThrowExceptionTest
extends ContextTestSup
assertNotNull(rollbackCause);
- MethodNotFoundException e =
assertIsInstanceOf(MethodNotFoundException.class, rollbackCause.getCause());
+ MethodNotFoundException e =
assertIsInstanceOf(MethodNotFoundException.class, rollbackCause);
assertNotNull(e);
assertEquals("doNotExistMethod", e.getMethodName());
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/xslt/InvalidXsltFileTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/xslt/InvalidXsltFileTest.java
index 9052d31..41470ce 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/xslt/InvalidXsltFileTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/xslt/InvalidXsltFileTest.java
@@ -40,7 +40,7 @@ public class InvalidXsltFileTest extends TestSupport {
fail("Should have thrown an exception due XSL compilation error");
} catch (Exception e) {
// expected
- assertIsInstanceOf(TransformerConfigurationException.class,
e.getCause());
+ assertIsInstanceOf(TransformerConfigurationException.class,
e.getCause().getCause());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFileNotFoundTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFileNotFoundTest.java
index 86d623c..cf8617b 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFileNotFoundTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFileNotFoundTest.java
@@ -41,8 +41,8 @@ public class XsltFileNotFoundTest extends TestSupport {
fail("Should have thrown an exception due XSLT file not found");
} catch (Exception e) {
- assertIsInstanceOf(TransformerException.class, e.getCause());
- assertIsInstanceOf(FileNotFoundException.class,
e.getCause().getCause());
+ assertIsInstanceOf(TransformerException.class,
e.getCause().getCause());
+ assertIsInstanceOf(FileNotFoundException.class,
e.getCause().getCause().getCause());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltSaxonTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltSaxonTest.java
index ef829ff..dee4088 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltSaxonTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltSaxonTest.java
@@ -37,7 +37,7 @@ public class XsltSaxonTest extends TestSupport {
fail("Should have thrown an exception due XSLT saxon not on
classpath");
} catch (Exception e) {
- assertIsInstanceOf(ClassNotFoundException.class, e.getCause());
+ assertIsInstanceOf(ClassNotFoundException.class,
e.getCause().getCause());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/FromHasNoOutputRouteTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/FromHasNoOutputRouteTest.java
index a3dad8e..4401578 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/FromHasNoOutputRouteTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/FromHasNoOutputRouteTest.java
@@ -41,9 +41,9 @@ public class FromHasNoOutputRouteTest extends
ContextTestSupport {
context.start();
fail("Should throw exception");
} catch (Exception e) {
- FailedToCreateRouteException failed =
assertIsInstanceOf(FailedToCreateRouteException.class, e.getCause());
+ FailedToCreateRouteException failed =
assertIsInstanceOf(FailedToCreateRouteException.class, e);
assertEquals("route1", failed.getRouteId());
- IllegalArgumentException cause =
assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause());
+ IllegalArgumentException cause =
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
assertEquals("Route route1 has no output processors. You need to
add outputs to the route such as to(\"log:foo\").", cause.getMessage());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
index 74dd08e..f7c74da 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
@@ -41,7 +41,7 @@ public class BeanLanguageInvalidOGNLTest extends
ContextTestSupport {
context.start();
fail("Should have thrown exception");
} catch (Exception e) {
- RuntimeCamelException rce =
assertIsInstanceOf(RuntimeCamelException.class, e.getCause());
+ RuntimeCamelException rce =
assertIsInstanceOf(RuntimeCamelException.class, e);
MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, rce.getCause());
assertEquals("getOther[xx", mnfe.getMethodName());
ExpressionIllegalSyntaxException cause =
assertIsInstanceOf(ExpressionIllegalSyntaxException.class, mnfe.getCause());
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
index f87e0bf..e97348e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
@@ -93,7 +93,7 @@ public class BeanTest extends LanguageTestSupport {
exp.evaluate(exchange, Object.class);
fail("Should throw exception");
} catch (Exception e) {
- MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, e.getCause());
+ MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, e);
assertSame(user, mnfe.getBean());
assertEquals("unknown", mnfe.getMethodName());
}
diff --git
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedDuplicateIdTest.java
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedDuplicateIdTest.java
index ceed5c0..cae4c3d 100644
---
a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedDuplicateIdTest.java
+++
b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedDuplicateIdTest.java
@@ -50,7 +50,7 @@ public class ManagedDuplicateIdTest extends
ManagementTestSupport {
context.start();
fail("Should fail");
} catch (Exception e) {
- assertEquals("Failed to start route foo because of duplicate id
detected: clash. Please correct ids to be unique among all your routes.",
e.getCause().getMessage());
+ assertEquals("Failed to start route foo because of duplicate id
detected: clash. Please correct ids to be unique among all your routes.",
e.getMessage());
}
}
