Prevent assertions in helper methods from being wrapped in `Condition…

…FailedWithExceptionError` Signed-off-by: Pavlo Shevchenko <[email protected]>
spockframework · Feb 24, 2025 · cf60234 · cf60234
1 parent 808616e
commit cf60234
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/spock-core/src/main/java/org/spockframework/runtime/SpockRuntime.java b/spock-core/src/main/java/org/spockframework/runtime/SpockRuntime.java
@@ -77,6 +77,11 @@ public static void conditionFailedWithException(ErrorCollector errorCollector, @
         errorCollector.collectOrThrow(spockException); // this is our exception - it already has good message
         return;
       }
+      if (throwable instanceof MultipleFailuresError) {
+        final MultipleFailuresError multipleFailuresError = (MultipleFailuresError) throwable;
+        errorCollector.collectOrThrow(multipleFailuresError); // this is our exception - it already has good message
+        return;
+      }
     final ConditionFailedWithExceptionError conditionNotSatisfiedError = new ConditionFailedWithExceptionError(
         new Condition(
             getValues(recorder),

diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/VerifyAllMethodsSpecification.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/VerifyAllMethodsSpecification.groovy
@@ -17,6 +17,7 @@ package org.spockframework.smoke
 import org.opentest4j.MultipleFailuresError
 import org.spockframework.EmbeddedSpecification
 import org.spockframework.runtime.ConditionNotSatisfiedError
+import org.spockframework.runtime.SpockComparisonFailure
 
 class VerifyAllMethodsSpecification extends EmbeddedSpecification {
 
@@ -59,13 +60,14 @@ def "feature"() {
 
     then:
     result.failures.size() == 1
-    with(result.failures[0].exception.cause, MultipleFailuresError) {
+    with(result.failures[0].exception, MultipleFailuresError) {
       failures.size() == 2
       with(failures[0], ConditionNotSatisfiedError) {
         condition.text == 'x > 0'
       }
-      with(failures[1], ConditionNotSatisfiedError) {
-        condition.text == 'x % 2 == 0'
+      with(failures[1], SpockComparisonFailure) {
+        expected.stringRepresentation.trim() == "0"
+        actual.stringRepresentation.trim() == "-1"
       }
     }
   }
@@ -91,13 +93,14 @@ class SpecWithHelpers extends Specification {
 
     then:
     result.failures.size() == 1
-    with(result.failures[0].exception.cause, MultipleFailuresError) {
+    with(result.failures[0].exception, MultipleFailuresError) {
       failures.size() == 2
       with(failures[0], ConditionNotSatisfiedError) {
         condition.text == 'x > 0'
       }
-      with(failures[1], ConditionNotSatisfiedError) {
-        condition.text == 'x % 2 == 0'
+      with(failures[1], SpockComparisonFailure) {
+        expected.stringRepresentation.trim() == "0"
+        actual.stringRepresentation.trim() == "-1"
       }
     }
   }