Use PyList instead of PyArray when converting DataTable for Jython. Ref cucumber#602.

Author: aslakhellesoy

History.md

@@ -1,5 +1,6 @@
 ## [1-1-6-SNAPSHOT (Git master)](https://github.com/cucumber/cucumber-jvm/compare/v1.1.5...master)
 
+* [Jython] Fix for DataTable as parameter in Jython steps ([#602](https://github.com/cucumber/cucumber-jvm/pull/602) lggroapa, Aslak Hellesøy)
 * [Core] Fix and improve CamelCaseFunctionNameSanitizer ([#603](https://github.com/cucumber/cucumber-jvm/pull/603) Frieder Bluemle)
 * [Core, Java] Log a warning when more than one IoC dependency is found in the classpath ([#594](https://github.com/cucumber/cucumber-jvm/pull/594) Ariel Kogan)
 * [JUnit,TestNG] Report summaries and `.cucumber/stepdefs.json` in the same way as the CLI (Aslak Hellesøy)

jython/src/main/java/cucumber/runtime/jython/JythonBackend.java

@@ -1,7 +1,7 @@
 package cucumber.runtime.jython;
 
-import cucumber.api.Scenario;
 import cucumber.api.DataTable;
+import cucumber.api.Scenario;
 import cucumber.runtime.Backend;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.Glue;
@@ -11,7 +11,12 @@
 import cucumber.runtime.snippets.FunctionNameSanitizer;
 import cucumber.runtime.snippets.SnippetGenerator;
 import gherkin.formatter.model.Step;
-import org.python.core.*;
+import org.python.core.Py;
+import org.python.core.PyException;
+import org.python.core.PyInstance;
+import org.python.core.PyList;
+import org.python.core.PyObject;
+import org.python.core.PyString;
 import org.python.util.PythonInterpreter;
 
 import java.io.IOException;
@@ -27,7 +32,7 @@ public class JythonBackend implements Backend {
     private PyObject pyWorld;
     private Glue glue;
 
-	public JythonBackend(ResourceLoader resourceLoader, PythonInterpreter jython) {
+    public JythonBackend(ResourceLoader resourceLoader, PythonInterpreter jython) {
         this.resourceLoader = resourceLoader;
         this.jython = jython;
         jython.set("backend", this);
@@ -109,27 +114,26 @@ private String getStacktrace(PyException e) {
         e.printStackTrace(pw);
         return sw.getBuffer().toString();
     }
-	
-    private PyObject argToPyObject(Object arg){
-        if (arg instanceof DataTable)
-            return dataTableToPyArray((DataTable)arg);	
-        return new PyString((String)arg);	
-    }
-	
-    private PyArray dataTableToPyArray(DataTable table){
-        List<List<String>> rawTable = table.raw();
-        PyArray pyDataTable = new PyArray( PyArray.class , 0);
-        PyArray pyDataRow ;
-        for(List<String> row : rawTable){
-            pyDataRow = new PyArray ( PyString.class , 0 );
-            for(String cell : row){
-                pyDataRow.append(new PyString(cell));
+
+    private PyObject argToPyObject(Object arg) {
+        if (arg instanceof DataTable) {
+            return dataTableToPyArray((DataTable) arg);
+        }
+        return new PyString((String) arg);
+    }
+
+    private PyObject dataTableToPyArray(DataTable table) {
+        PyList pyTable = new PyList();
+        for (List<String> row : table.raw()) {
+            PyList pyRow = new PyList();
+            for (String cell : row) {
+                pyRow.append(new PyString(cell));
             }
-            pyDataTable.append(pyDataRow);
+            pyTable.append(pyRow);
         }
-        return pyDataTable;
+        return pyTable;
     }
-	
+
     public void execute(PyInstance stepdef, Object[] args) throws Throwable {
 
         PyObject[] pyArgs = new PyObject[args.length + 1];

jython/src/test/resources/cucumber/runtime/jython/step_definitions/cuke_steps.py

@@ -27,10 +27,15 @@ def I_have_cukes_in_my_belly(self, arg1):
 @After()
 def we_can_get_the_scenario(self, scenario):
   if(scenario.getStatus() != 'passed'):
-    print("Oh no!")
+    print(Exception("Oh no!"))
 
 @Given('^the following users exist:$')
-def the_following_users_exit(self,dataTable):
-  for row in dataTable:
-    for cell in row:
-      print("Checking if cell: "+cell+" exists")
+def the_following_users_exit(self, dataTable):
+  expected = [
+    ["name",  "email",           "phone"],
+    ["Aslak", "aslak@email.com", "123"],
+    ["Matt",  "matt@email.com",  "234"],
+    ["Joe",   "joe@email.org",   "456"]
+  ]
+  if (expected != dataTable):
+    raise(Exception("Oh no!"))