JUnit assume failures behaves just like pending. Closes #359.

Author: aslakhellesoy

History.md

@@ -1,5 +1,6 @@
 ## [master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.11...master)
 
+* [Core] JUnit assume failures (`AssumptionViolatedException`) behaves in the same way as pending (`cucumber.runtime.PendingException`) ([#359](https://github.com/cucumber/cucumber-jvm/issues/359) Aslak Hellesøy, Kim Saabye Pedersen)
 * [Core] Extend url protocols. This makes it possible to load features and glue from within a container such as Arquilian. ([#360](https://github.com/cucumber/cucumber-jvm/issues/360), [#361](https://github.com/cucumber/cucumber-jvm/pull/361) Logan McGrath)
 * [Jython] Jython Before/After Annotations ([#362](https://github.com/cucumber/cucumber-jvm/pull/362) Stephen Abrams)
 * [Java] Support for delimited lists in step parameters ([#364](https://github.com/cucumber/cucumber-jvm/issues/364), [#371](https://github.com/cucumber/cucumber-jvm/pull/371) Marquis Wang)

core/src/main/java/cucumber/runtime/Runtime.java

@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -29,6 +30,15 @@
  */
 public class Runtime implements UnreportedStepExecutor {
 
+    private static final String[] PENDING_EXCEPTIONS = new String[]{
+            PendingException.class.getName(),
+            "org.junit.internal.AssumptionViolatedException"
+    };
+
+    static {
+        Arrays.sort(PENDING_EXCEPTIONS);
+    }
+
     private static final Object DUMMY_ARG = new Object();
     private static final byte ERRORS = 0x1;
 
@@ -146,7 +156,7 @@ private boolean hasPendingSteps() {
 
     private boolean hasErrors() {
         for (Throwable error : errors) {
-            if (!(error instanceof PendingException)) {
+            if (!isPending(error)) {
                 return true;
             }
         }
@@ -184,7 +194,8 @@ private void runHookIfTagsMatch(HookDefinition hook, Reporter reporter, Set<Tag>
                 skipNextStep = true;
                 long duration = System.nanoTime() - start;
 
-                Result result = new Result(Result.FAILED, duration, t, DUMMY_ARG);
+                String status = isPending(t) ? "pending" : Result.FAILED;
+                Result result = new Result(status, duration, t, DUMMY_ARG);
                 scenarioResult.add(result);
                 addError(t);
 
@@ -256,7 +267,7 @@ public void runStep(String uri, Step step, Reporter reporter, I18n i18n) {
                 match.runStep(i18n);
             } catch (Throwable t) {
                 error = t;
-                status = (t instanceof PendingException) ? "pending" : Result.FAILED;
+                status = isPending(t) ? "pending" : Result.FAILED;
                 addError(t);
                 skipNextStep = true;
             } finally {
@@ -268,6 +279,10 @@ public void runStep(String uri, Step step, Reporter reporter, I18n i18n) {
         }
     }
 
+    private static boolean isPending(Throwable t) {
+        return Arrays.binarySearch(PENDING_EXCEPTIONS, t.getClass().getName()) >= 0;
+    }
+
     public void writeStepdefsJson() throws IOException {
         glue.writeStepdefsJson(runtimeOptions.featurePaths, runtimeOptions.dotCucumber);
     }

core/src/test/java/cucumber/runtime/RuntimeTest.java

@@ -8,6 +8,7 @@
 import gherkin.formatter.model.Step;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.internal.AssumptionViolatedException;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -137,6 +138,14 @@ public void non_strict_with_pending_steps() {
         assertEquals(0x0, runtime.exitStatus());
     }
 
+    @Test
+    public void non_strict_with_failed_junit_assumption() {
+        Runtime runtime = createNonStrictRuntime();
+        runtime.addError(new AssumptionViolatedException("should be treated like pending"));
+
+        assertEquals(0x0, runtime.exitStatus());
+    }
+
     @Test
     public void non_strict_with_errors() {
         Runtime runtime = createNonStrictRuntime();