Make @PendingFeature and @PendingFeatureIf play nicely together (#1120)

Author: Vampire

spock-core/src/main/java/org/spockframework/runtime/extension/builtin/PendingFeatureBaseInterceptor.java

@@ -24,8 +24,8 @@ protected boolean isExpected(Throwable e) {
     }
     return false;
   }
-  protected AssertionError featurePassedUnexpectedly(StackTraceElement[] stackTrace) {
-    AssertionError assertionError = new AssertionError("Feature is marked with " + annotationUsed + " but passes unexpectedly");
+  protected PendingFeatureSuccessfulError featurePassedUnexpectedly(StackTraceElement[] stackTrace) {
+    PendingFeatureSuccessfulError assertionError = new PendingFeatureSuccessfulError("Feature is marked with " + annotationUsed + " but passes unexpectedly");
     if (stackTrace != null) {
       assertionError.setStackTrace(stackTrace);
     }

spock-core/src/main/java/org/spockframework/runtime/extension/builtin/PendingFeatureInterceptor.java

@@ -16,7 +16,7 @@ public PendingFeatureInterceptor(Class<? extends Throwable>[] handledExceptions,
   public void intercept(IMethodInvocation invocation) throws Throwable {
     try {
       invocation.proceed();
-    } catch (TestAbortedException e) {
+    } catch (TestAbortedException | PendingFeatureSuccessfulError e) {
       throw e;
     } catch (AssertionError e) {
       throw testAborted(e.getStackTrace());

spock-core/src/main/java/org/spockframework/runtime/extension/builtin/PendingFeatureIterationInterceptor.java

@@ -64,6 +64,8 @@ public void intercept(IMethodInvocation invocation) throws Throwable {
       try {
         invocation.proceed();
         success.set(true);
+      } catch (PendingFeatureSuccessfulError e) {
+        throw e;
       } catch (TestAbortedException e) {
         // if no expected failure set a stack trace, set it from an abort
         // that is better than the stack trace in the base interceptor

spock-core/src/main/java/org/spockframework/runtime/extension/builtin/PendingFeatureSuccessfulError.java

@@ -0,0 +1,13 @@
+package org.spockframework.runtime.extension.builtin;
+
+import org.spockframework.util.Beta;
+
+/**
+ * @since 2.0
+ */
+@Beta
+public class PendingFeatureSuccessfulError extends AssertionError {
+  public PendingFeatureSuccessfulError(String detailMessage) {
+    super(detailMessage);
+  }
+}

spock-specs/src/test/groovy/org/spockframework/smoke/extension/PendingFeatureIfExtensionSpec.groovy

@@ -37,6 +37,100 @@ def bar() {
     e.message == "Feature is marked with @PendingFeatureIf but passes unexpectedly"
   }
 
+  def "@PendingFeatureIf marks passing feature as failed if the conditional expression returns true even if @PendingFeature is applied first"() {
+    when:
+    runner.runSpecBody """
+@PendingFeature
+@PendingFeatureIf({true})
+def bar() {
+  expect: true
+}
+"""
+
+    then:
+    AssertionError e = thrown()
+    e.message == "Feature is marked with @PendingFeatureIf but passes unexpectedly"
+  }
+
+  def "@PendingFeatureIf marks passing parameterized feature as failed if the conditional expression returns true even if @PendingFeature is applied first"() {
+    when:
+    runner.runSpecBody """
+@PendingFeature
+@PendingFeatureIf({true})
+def bar() {
+  expect: true
+  where: a = 1
+}
+"""
+
+    then:
+    AssertionError e = thrown()
+    e.message == "Feature is marked with @PendingFeatureIf but passes unexpectedly"
+  }
+
+  def "@PendingFeatureIf marks passing feature as failed if the data variable accessing conditional expression returns true even if @PendingFeature is applied first"() {
+    when:
+    runner.runSpecBody """
+@PendingFeature
+@PendingFeatureIf({a == 1})
+def bar() {
+  expect: true
+  where: a = 1
+}
+"""
+
+    then:
+    AssertionError e = thrown()
+    e.message == "Feature is marked with @PendingFeatureIf but passes unexpectedly"
+  }
+
+  def "@PendingFeatureIf marks passing feature as failed if the conditional expression returns true even if @PendingFeature is applied after it"() {
+    when:
+    runner.runSpecBody """
+@PendingFeatureIf({true})
+@PendingFeature
+def bar() {
+  expect: true
+}
+"""
+
+    then:
+    AssertionError e = thrown()
+    e.message == "Feature is marked with @PendingFeature but passes unexpectedly"
+  }
+
+  def "@PendingFeatureIf marks passing parameterized feature as failed if the conditional expression returns true even if @PendingFeature is applied after it"() {
+    when:
+    runner.runSpecBody """
+@PendingFeatureIf({true})
+@PendingFeature
+def bar() {
+  expect: true
+  where: a = 1
+}
+"""
+
+    then:
+    AssertionError e = thrown()
+    e.message == "Feature is marked with @PendingFeature but passes unexpectedly"
+  }
+
+  def "@PendingFeatureIf marks passing feature as failed if the data variable accessing conditional expression returns true even if @PendingFeature is applied after it"() {
+    when:
+    runner.runSpecBody """
+@PendingFeatureIf({a == 1})
+@PendingFeature
+def bar() {
+  expect: true
+  where: a = 1
+}
+"""
+
+    then:
+    AssertionError e = thrown()
+    e.message == "Feature is marked with @PendingFeatureIf but passes unexpectedly"
+  }
+
   def "@PendingFeatureIf marks failing feature as failed if the conditional expression returns false"() {
     when:
     runner.runSpecBody """