[Rhino] Updated rhino for the use of Gherkin v4.0.0.

rhino/src/main/java/cucumber/runtime/rhino/RhinoBackend.java

@@ -8,7 +8,7 @@
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.snippets.FunctionNameGenerator;
 import cucumber.runtime.snippets.SnippetGenerator;
-import gherkin.formatter.model.Step;
+import gherkin.pickles.PickleStep;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.NativeFunction;
@@ -90,8 +90,8 @@ public void registerWorld(Function buildWorldFn, Function disposeWorldFn) {
     }
 
     @Override
-    public String getSnippet(Step step, FunctionNameGenerator functionNameGenerator) {
-        return snippetGenerator.getSnippet(step, functionNameGenerator);
+    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+        return snippetGenerator.getSnippet(step, keyword, functionNameGenerator);
     }
 
     private StackTraceElement jsLocation() {

rhino/src/main/java/cucumber/runtime/rhino/RhinoHookDefinition.java

@@ -1,8 +1,8 @@
 package cucumber.runtime.rhino;
 
 import static java.util.Arrays.asList;
-import gherkin.TagExpression;
-import gherkin.formatter.model.Tag;
+import cucumber.runtime.TagExpression;
+import gherkin.pickles.PickleTag;
 
 import java.util.Collection;
 
@@ -51,7 +51,7 @@ public Object call() throws Throwable {
     }
 
     @Override
-    public boolean matches(Collection<Tag> tags) {
+    public boolean matches(Collection<PickleTag> tags) {
         return tagExpression.evaluate(tags);
     }
 

rhino/src/main/java/cucumber/runtime/rhino/RhinoStepDefinition.java

@@ -2,9 +2,8 @@
 
 import cucumber.runtime.ParameterInfo;
 import cucumber.runtime.StepDefinition;
-import gherkin.I18n;
-import gherkin.formatter.Argument;
-import gherkin.formatter.model.Step;
+import cucumber.runtime.Argument;
+import gherkin.pickles.PickleStep;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.JavaScriptException;
 import org.mozilla.javascript.NativeFunction;
@@ -35,8 +34,8 @@ public RhinoStepDefinition(Context cx, Scriptable scope, Global jsStepDefinition
         this.argumentsFromFunc = argumentsFromFunc;
     }
 
-    public List<Argument> matchedArguments(Step step) {
-        NativeJavaObject args = (NativeJavaObject) argumentsFromFunc.call(cx, scope, jsStepDefinition, new Object[]{step.getName(), this});
+    public List<Argument> matchedArguments(PickleStep step) {
+        NativeJavaObject args = (NativeJavaObject) argumentsFromFunc.call(cx, scope, jsStepDefinition, new Object[]{step.getText(), this});
         return args == null ? null : unwrap(args);
     }
 
@@ -59,7 +58,7 @@ public ParameterInfo getParameterType(int n, Type argumentType) {
         return new ParameterInfo(argumentType, null, null, null);
     }
 
-    public void execute(I18n i18n, Object[] args) throws Throwable {
+    public void execute(String language, Object[] args) throws Throwable {
         try {
             bodyFunc.call(cx, scope, scope, args);
         } catch (JavaScriptException e) {

rhino/src/main/resources/cucumber/runtime/rhino/dsl.js

@@ -8,7 +8,7 @@ var registerStepDefinition = function(regexp, bodyFunc) {
             for (var i = 1; i < match.length; i++) {
                 var arg = match[i];
                 offset = s.indexOf(arg, offset);
-                arguments.add(new Packages.gherkin.formatter.Argument(offset, arg));
+                arguments.add(new Packages.cucumber.runtime.Argument(offset, arg));
             }
             return arguments;
         } else {

rhino/src/test/java/cucumber/runtime/rhino/JavaScriptSnippetTest.java

@@ -1,8 +1,9 @@
 package cucumber.runtime.rhino;
 
 import cucumber.runtime.snippets.SnippetGenerator;
-import gherkin.formatter.model.Comment;
-import gherkin.formatter.model.Step;
+import gherkin.pickles.Argument;
+import gherkin.pickles.PickleLocation;
+import gherkin.pickles.PickleStep;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -22,7 +23,7 @@ public void generatesPlainSnippet() {
     }
 
     private String snippetFor(String name) {
-        Step step = new Step(Collections.<Comment>emptyList(), "Given ", name, 0, null, null);
-        return new SnippetGenerator(new JavaScriptSnippet()).getSnippet(step, null);
+        PickleStep step = new PickleStep(name, Collections.<Argument>emptyList(), Collections.<PickleLocation>emptyList());
+        return new SnippetGenerator(new JavaScriptSnippet()).getSnippet(step, "Given", null);
     }
-}
+}

rhino/src/test/java/cucumber/runtime/rhino/RhinoHooksTest.java

@@ -4,7 +4,7 @@
 import cucumber.runtime.RuntimeGlue;
 import cucumber.runtime.io.MultiLoader;
 import cucumber.runtime.io.ResourceLoader;
-import gherkin.formatter.model.Tag;
+import gherkin.pickles.PickleTag;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -95,15 +95,15 @@ private void assertHook(HookDefinition hookDefinition, String[] tagExprs, int or
 
         RhinoHookDefinition rhinoHook = (RhinoHookDefinition) hookDefinition;
 
-        List<Tag> tags = new ArrayList<Tag>();
+        List<PickleTag> tags = new ArrayList<PickleTag>();
 
         for (String tagExpr : tagExprs) {
-            tags.add(new Tag(tagExpr, null));
+            tags.add(new PickleTag(null, tagExpr));
         }
 
         assertTrue(rhinoHook.getTagExpression().evaluate(tags));
         assertThat(rhinoHook.getOrder(), equalTo(order));
         assertThat(rhinoHook.getTimeout(), equalTo(timeoutMillis));
     }
 
-}
+}