Fixed StepDefinitionMatch to work with StepDefinitions that return nu…

…ll for getParameterTypes (e.g. ClojureStepDefinition)
cucumber · Mar 12, 2012 · 47aaf2f · 47aaf2f
1 parent 2f8ec01
commit 47aaf2f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/clojure/src/test/resources/cucumber/runtime/clojure/cukes.feature b/clojure/src/test/resources/cucumber/runtime/clojure/cukes.feature
@@ -2,3 +2,8 @@ Feature: Cukes
   Scenario: in the belly
     Given I have 4 cukes in my belly
     Then there are 4 cukes in my belly
+
+  Scenario: in the belly (list)
+    Given I have this many cukes in my belly:
+    | 13 |
+    Then there are 13 cukes in my belly
diff --git a/clojure/src/test/resources/cucumber/runtime/clojure/stepdefs.clj b/clojure/src/test/resources/cucumber/runtime/clojure/stepdefs.clj
@@ -6,6 +6,9 @@
 (Given #"^I have (\d+) cukes in my belly$"
   #(eat (Float. %1)))
 
+(Given #"^I have this many cukes in my belly:$"
+  #(doseq [x (.raw %1)] (eat (Float. (first x)))))
+
 (When #"^there are (\d+) cukes in my belly$"
   (fn [expected]
     (assert (= (last-meal) (Float. expected)))))

diff --git a/core/src/main/java/cucumber/runtime/StepDefinitionMatch.java b/core/src/main/java/cucumber/runtime/StepDefinitionMatch.java
@@ -142,9 +142,16 @@ private Object tableArgument(Step step, int argIndex, XStream xStream, String da
     }
 
     private Type getGenericListType(int argIndex) {
-        ParameterType parameterType = stepDefinition.getParameterTypes().get(argIndex);
-        Type[] actualTypeArguments = parameterType.getActualTypeArguments();
-        return actualTypeArguments != null && actualTypeArguments.length > 0 ? actualTypeArguments[0] : null;
+        Type result = null;
+        List<ParameterType> parameterTypes = stepDefinition.getParameterTypes();
+        if (parameterTypes != null) {
+            ParameterType parameterType = parameterTypes.get(argIndex);
+            Type[] actualTypeArguments = parameterType.getActualTypeArguments();
+            if (actualTypeArguments != null && actualTypeArguments.length > 0) {
+                result = actualTypeArguments[0];
+            }
+        }
+        return result;
     }
 
     public Throwable removeFrameworkFramesAndAppendStepLocation(Throwable error, StackTraceElement stepLocation) {