Fix #3141 #2920 - Make Junit recognise and report assertion failures (#…

…3158) * Make Junit recognise and report assertion failures * resolved formatting issues --------- Co-authored-by: Dipak Bachhav <[email protected]>
serenity-bdd · Jul 10, 2023 · c32b68e · c32b68e
1 parent 8c2e5ff
commit c32b68e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/serenity-core/src/main/java/net/serenitybdd/core/Serenity.java b/serenity-core/src/main/java/net/serenitybdd/core/Serenity.java
@@ -329,6 +329,10 @@ public static void throwExceptionsImmediately() {
         throwExceptionsImmediately = true;
     }
 
+    public static boolean shouldThrowExceptionsImmediately() {
+        return throwExceptionsImmediately = true;
+    }
+
     public static boolean shouldThrowErrorsImmediately() {
         return throwExceptionsImmediately;
     }

diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/StepInterceptor.java b/serenity-core/src/main/java/net/thucydides/core/steps/StepInterceptor.java
@@ -606,7 +606,7 @@ private void notifyOfStepFailure(final Object object, final Method method, final
         else {
             StepEventBus.getParallelEventBus().stepFailed(failure);
         }
-        if (shouldThrowExceptionImmediately()) {
+        if (shouldThrowExceptionsImmediately()) {
             finishAnyCucumberSteps();
             throw cause;
         }
@@ -623,8 +623,8 @@ private void finishAnyCucumberSteps() {
         }
     }
 
-    private boolean shouldThrowExceptionImmediately() {
-        return Serenity.shouldThrowErrorsImmediately();
+    private boolean shouldThrowExceptionsImmediately() {
+        return Serenity.shouldThrowExceptionsImmediately();
     }
 
     private void notifyStepStarted(final Object object, final Method method, final Object[] args) {

diff --git a/...java/net/serenitybdd/junit5/samples/integration/displayName/JUnit5DisplayNameExample.java b/...java/net/serenitybdd/junit5/samples/integration/displayName/JUnit5DisplayNameExample.java
@@ -1,7 +1,8 @@
 package net.serenitybdd.junit5.samples.integration.displayName;
 
 import net.serenitybdd.junit5.SerenityJUnit5Extension;
-import org.junit.jupiter.api.DisplayName;
+import net.serenitybdd.junit5.samples.integration.displayName.steps.TestExample;
+import net.thucydides.core.annotations.Steps;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -12,11 +13,16 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 public class JUnit5DisplayNameExample {
 
+    @Steps
+    TestExample testExample;
+
+
     @Test
     void test_spaces_ok() {
     }
 
     @Test
     void test_spaces_fail() {
+        testExample.test_spaces_fail();
     }
 }
diff --git a/...c/test/java/net/serenitybdd/junit5/samples/integration/displayName/steps/TestExample.java b/...c/test/java/net/serenitybdd/junit5/samples/integration/displayName/steps/TestExample.java
@@ -0,0 +1,10 @@
+package net.serenitybdd.junit5.samples.integration.displayName.steps;
+
+import net.thucydides.core.steps.ScenarioSteps;
+import org.junit.Assert;
+
+public class TestExample extends ScenarioSteps {
+    public void test_spaces_fail() {
+        Assert.assertTrue(false);
+    }
+}