summaryrefslogtreecommitdiffstats
path: root/utils-test/src/main
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2018-10-03 12:09:28 -0400
committerJim Hahn <jrh3@att.com>2018-10-03 13:23:56 -0400
commitee70adfa3010dbde69e2fffda8527d81a6429e96 (patch)
tree8a01df88de9a07e560aab800bcb4496bbe259854 /utils-test/src/main
parentd94a034ad6a871e024d84d42d97d40b83af0770d (diff)
Support Throwables in expectException()
Also fixed some bugs in the junit tests. Renamed expectException() to assertThrows(). Added test cases. Change-Id: I13dff0007e35c2d2521a4ca40bb65e6820416ed1 Issue-ID: POLICY-1148 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'utils-test/src/main')
-rw-r--r--utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java b/utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java
index fdd098f6..43bb7792 100644
--- a/utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java
+++ b/utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java
@@ -34,21 +34,24 @@ public class PolicyAssert {
*
* @param clazz class of exception that is expected
* @param func function
- * @return object
+ * @return the exception that was thrown
+ * @throws AssertionError if the function does not throw an exception or throws the
+ * wrong type of exception
*/
- public static <T> T assertException(Class<T> clazz, RunnableWithEx func) {
+ public static <T extends Throwable> T assertThrows(Class<T> clazz, RunnableWithEx func) {
try {
func.run();
- throw new AssertionError("missing exception");
- } catch (Exception e) {
+ } catch (Throwable thrown) {
try {
- return clazz.cast(e);
+ return clazz.cast(thrown);
- } catch (ClassCastException e2) {
- throw new AssertionError("incorrect exception type", e2);
+ } catch (ClassCastException thrown2) {
+ throw new AssertionError("incorrect exception type", thrown2);
}
}
+
+ throw new AssertionError("missing exception");
}
/**
@@ -56,6 +59,6 @@ public class PolicyAssert {
*/
@FunctionalInterface
public static interface RunnableWithEx {
- public void run() throws Exception;
+ public void run() throws Throwable;
}
}