Fixed regression: PendingException was causing steps to fail instead of pending. Closes #328

Author: aslakhellesoy

History.md

@@ -1,5 +1,6 @@
 ## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.7...master)
 
+* [Core] Fixed regression: PendingException was causing steps to fail instead of pending. ([#328](https://github.com/cucumber/cucumber-jvm/issues/328) Aslak Hellesøy)
 * [Java] Missing String.format parameters in DefaultJavaObjectFactory ([#336](https://github.com/cucumber/cucumber-jvm/issues/336) paulkrause88, Aslak Hellesøy)
 * [Core] Exceptions being swallowed if reported in a Hook ([#133](https://github.com/cucumber/cucumber-jvm/issues/133) David Kowis, Aslak Hellesøy)
 * [Core] Added `DataTable.asMaps()` and made all returned lists immutable. (Aslak Hellesøy).

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

@@ -33,11 +33,16 @@ public static Object invoke(Object target, Method method, Object... args) {
         try {
             return method.invoke(target, args);
         } catch (IllegalArgumentException e) {
-            throw new CucumberException("Can't invoke " + MethodFormat.FULL.format(method), e);
+            throw new CucumberException("Failed to invoke " + MethodFormat.FULL.format(method), e);
         } catch (InvocationTargetException e) {
-            throw new CucumberException("Can't invoke " + MethodFormat.FULL.format(method), e.getTargetException());
+            Throwable targetException = e.getTargetException();
+            if(targetException instanceof PendingException) {
+                throw (PendingException) targetException;
+            } else {
+                throw new CucumberException("Failed to invoke " + MethodFormat.FULL.format(method), targetException);
+            }
         } catch (IllegalAccessException e) {
-            throw new CucumberException("Can't invoke " + MethodFormat.FULL.format(method), e);
+            throw new CucumberException("Failed to invoke " + MethodFormat.FULL.format(method), e);
         }
     }
 }

picocontainer/src/test/java/cucumber/runtime/java/picocontainer/StepDefs.java

@@ -4,6 +4,7 @@
 import cucumber.annotation.Before;
 import cucumber.annotation.en.Given;
 import cucumber.annotation.en.Then;
+import cucumber.runtime.PendingException;
 import cucumber.runtime.ScenarioResult;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public void before() {
     public void gh20() {
     }
 
-    @Given(value = "^I have (\\d+) (.*) in my belly$")
+    @Given("^I have (\\d+) (.*) in my belly$")
     public void I_have_n_things_in_my_belly(int amount, String what) {
         this.amount = amount;
     }
@@ -30,6 +31,11 @@ public void I_have_n_things_in_my_belly(int amount, String what) {
     public void I_have_this_in_my_basket(List<List<String>> stuff) {
     }
 
+    @Given("something pending")
+    public void throw_pending() {
+        throw new PendingException("This should not fail");
+    }
+
     @Then("^there are (\\d+) cukes in my belly")
     public void checkCukes(int n) {
         assertEquals(amount, n);

picocontainer/src/test/resources/.cucumber/stepdefs.json

@@ -161,6 +161,16 @@
       }
     ]
   },
+  {
+    "source": "something pending",
+    "flags": "",
+    "steps": [
+      {
+        "name": "something pending",
+        "args": []
+      }
+    ]
+  },
   {
     "source": "this is not used",
     "flags": "",

picocontainer/src/test/resources/cucumber/runtime/java/picocontainer/cukes.feature

@@ -26,3 +26,8 @@ Feature: Cukes
     And a big basket with cukes
     And I have 12 cukes in my belly
 
+  Scenario: An undefined step
+    Given something undefined
+
+  Scenario: A pending step
+    Given something pending

picocontainer/src/test/resources/cucumber/runtime/java/picocontainer/dates.feature

@@ -1,6 +1,5 @@
 Feature: Dates
 
-
   Scenario Outline: Parsing dates with simple a format (yyyy/MM/dd)
     Given the simple date is <input date>
     Then the date should be viewed in <timezone> as <year>, <month>, <day>, <hours>, <minutes>, <seconds>