Merge pull request quarkusio#6732 from stuartwdouglas/test-exceptions

Fix test exception handling
machi1990 · Jan 23, 2020 · 1e222f0 · 1e222f0
2 parents d5204c6 + f45cc79
commit 1e222f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
@@ -275,7 +275,12 @@ private void runExtensionMethod(ReflectiveInvocationContext<Method> invocationCo
         try {
             newMethod.setAccessible(true);
             newMethod.invoke(actualTestInstance, invocationContext.getArguments().toArray());
-        } catch (IllegalAccessException | InvocationTargetException e) {
+        } catch (InvocationTargetException e) {
+            if (e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            }
+            throw new RuntimeException(e.getCause());
+        } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
         }
     }

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -351,7 +351,12 @@ private void runExtensionMethod(ReflectiveInvocationContext<Method> invocationCo
             }
             newMethod.setAccessible(true);
             newMethod.invoke(actualTestInstance, invocationContext.getArguments().toArray());
-        } catch (Exception e) {
+        } catch (InvocationTargetException e) {
+            if (e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            }
+            throw new RuntimeException(e.getCause());
+        } catch (IllegalAccessException | ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
     }