fix: included in serenity report Exception/assertion message for #321

serenity-bdd · Mar 1, 2016 · f6fd880 · f6fd880
1 parent 8e4b8b9
commit f6fd880
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/serenity-core/src/main/java/net/thucydides/core/model/stacktrace/FailureCause.java b/serenity-core/src/main/java/net/thucydides/core/model/stacktrace/FailureCause.java
@@ -142,16 +142,16 @@ private Optional<? extends Throwable> restoreExceptionFrom(String testFailureCla
 
     private <T extends Throwable> T buildThrowable(String testFailureMessage, Class failureClass) throws Exception {
 
-        if (defaultConstructorFor(failureClass).isPresent()) {
-            return (T) defaultConstructorFor(failureClass).get().newInstance();
-        } else if (stringConstructorFor(failureClass).isPresent()) {
+        if (stringConstructorFor(failureClass).isPresent()) {
             return (T) stringConstructorFor(failureClass).get().newInstance(testFailureMessage);
         } else if (stringThrowableConstructorFor(failureClass).isPresent()) {
             return (T) stringThrowableConstructorFor(failureClass).get().newInstance(testFailureMessage, null);
         } else if (throwableConstructorFor(failureClass).isPresent()) {
             return (T) throwableConstructorFor(failureClass).get().newInstance(new AssertionError(testFailureMessage));
         } else if (AssertionError.class.isAssignableFrom(failureClass)) {
             return (T) new AssertionError(testFailureMessage);
+        } else if (defaultConstructorFor(failureClass).isPresent()) {
+            return (T) defaultConstructorFor(failureClass).get().newInstance();
         }
         return null;
     }