cucumber · mpkorstanje · Aug 28, 2018 · Aug 28, 2018
diff --git a/core/src/main/java/cucumber/runner/Runner.java b/core/src/main/java/cucumber/runner/Runner.java
@@ -65,10 +65,8 @@ private void addTestStepsForPickleSteps(List<PickleStepTestStep> testSteps, Pick
                 if (match == null) {
                     List<String> snippets = new ArrayList<>();
                     for (Backend backend : backends) {
-                        String snippet = backend.getSnippet(step, "**KEYWORD**", runtimeOptions.getSnippetType().getFunctionNameGenerator());
-                        if (snippet != null) {
-                            snippets.add(snippet);
-                        }
+                        List<String> snippet = backend.getSnippet(step, "**KEYWORD**", runtimeOptions.getSnippetType().getFunctionNameGenerator());
+                        snippets.addAll(snippet);
                     }
                     if (!snippets.isEmpty()) {
                         bus.send(new SnippetsSuggestedEvent(bus.getTime(), pickleEvent.uri, step.getLocations(), snippets));

diff --git a/core/src/main/java/cucumber/runtime/Backend.java b/core/src/main/java/cucumber/runtime/Backend.java
@@ -22,5 +22,5 @@ public interface Backend {
      */
     void disposeWorld();
 
-    String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator);
+    List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator);
 }
diff --git a/core/src/main/java/cucumber/runtime/snippets/SnippetGenerator.java b/core/src/main/java/cucumber/runtime/snippets/SnippetGenerator.java
@@ -11,12 +11,14 @@
 import io.cucumber.cucumberexpressions.ParameterTypeRegistry;
 
 import java.lang.reflect.Type;
-import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import static java.text.MessageFormat.format;
+
 public class SnippetGenerator {
     @SuppressWarnings("RegExpRedundantEscape") // Android can't parse unescaped braces.
     private static final ArgumentPattern[] DEFAULT_ARGUMENT_PATTERNS = new ArgumentPattern[]{
@@ -33,19 +35,23 @@ public SnippetGenerator(Snippet snippet, ParameterTypeRegistry parameterTypeRegi
         this.generator = new CucumberExpressionGenerator(parameterTypeRegistry);
     }
 
-    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-        List<GeneratedExpression> expressions = generator.generateExpressions(step.getText());
-        GeneratedExpression expression = expressions.get(0);
-
-        return MessageFormat.format(
-            snippet.template(),
-            keyword,
-            snippet.escapePattern(expression.getSource()),
-            functionName(expression.getSource(), functionNameGenerator),
-            snippet.arguments(arguments(step, expression.getParameterNames(), expression.getParameterTypes())),
-            REGEXP_HINT,
-            !step.getArgument().isEmpty() && step.getArgument().get(0) instanceof PickleTable ? snippet.tableHint() : ""
-        );
+    public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+        List<GeneratedExpression> generatedExpressions = generator.generateExpressions(step.getText());
+        List<String> snippets = new ArrayList<>(generatedExpressions.size());
+
+        for (GeneratedExpression expression : generatedExpressions) {
+            snippets.add(format(
+                snippet.template(),
+                keyword,
+                snippet.escapePattern(expression.getSource()),
+                functionName(expression.getSource(), functionNameGenerator),
+                snippet.arguments(arguments(step, expression.getParameterNames(), expression.getParameterTypes())),
+                REGEXP_HINT,
+                !step.getArgument().isEmpty() && step.getArgument().get(0) instanceof PickleTable ? snippet.tableHint() : ""
+            ));
+        }
+
+        return snippets;
     }
 
     private String functionName(String sentence, FunctionNameGenerator functionNameGenerator) {

diff --git a/core/src/test/java/cucumber/runner/TestBackendSupplier.java b/core/src/test/java/cucumber/runner/TestBackendSupplier.java
@@ -7,6 +7,9 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
+
+import static java.util.Collections.emptyList;
 
 public abstract class TestBackendSupplier implements Backend, BackendSupplier {
 
@@ -21,8 +24,8 @@ public void disposeWorld() {
     }
 
     @Override
-    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-        return null;
+    public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+        return emptyList();
     }
 
     @Override

diff --git a/core/src/test/java/cucumber/runner/TestRunnerSupplier.java b/core/src/test/java/cucumber/runner/TestRunnerSupplier.java
@@ -1,6 +1,5 @@
 package cucumber.runner;
 
-import cucumber.runner.EventBus;
 import cucumber.runtime.Backend;
 import cucumber.runtime.Glue;
 import cucumber.runtime.RuntimeOptions;
@@ -10,6 +9,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import static java.util.Collections.emptyList;
+
 public class TestRunnerSupplier implements Backend, RunnerSupplier {
 
     private final EventBus bus;
@@ -36,8 +37,8 @@ public void disposeWorld() {
     }
 
     @Override
-    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-        return null;
+    public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+        return emptyList();
     }
 
     @Override

diff --git a/core/src/test/java/cucumber/runtime/StubBackend.java b/core/src/test/java/cucumber/runtime/StubBackend.java
@@ -5,8 +5,11 @@
 import gherkin.pickles.PickleStep;
 import io.cucumber.stepexpression.TypeRegistry;
 
+import java.util.Collections;
 import java.util.List;
 
+import static java.util.Collections.emptyList;
+
 public class StubBackend implements Backend {
 
     @SuppressWarnings("unused") // reflection to create backend
@@ -30,7 +33,7 @@ public void disposeWorld() {
     }
 
     @Override
-    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-        return null;
+    public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+        return emptyList();
     }
 }
diff --git a/core/src/test/java/cucumber/runtime/formatter/JSONFormatterTest.java b/core/src/test/java/cucumber/runtime/formatter/JSONFormatterTest.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,8 +31,8 @@
 import static cucumber.runner.TestHelper.createWriteHookAction;
 import static cucumber.runner.TestHelper.result;
 import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertThat;
-import static org.mockito.ArgumentMatchers.anyListOf;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
@@ -1148,8 +1149,8 @@ public void loadGlue(cucumber.runtime.Glue glue, List<String> gluePaths) {
             }
 
             @Override
-            public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-                return "TEST SNIPPET";
+            public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+                return singletonList("TEST SNIPPET");
             }
         };
         final EventBus bus = new TimeServiceEventBus(new TimeServiceStub(1234));
@@ -1184,8 +1185,8 @@ public void loadGlue(cucumber.runtime.Glue glue, List<String> gluePaths) {
             }
 
             @Override
-            public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-                return "TEST SNIPPET";
+            public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+                return singletonList("TEST SNIPPET");
             }
         };
         final EventBus bus = new TimeServiceEventBus(new TimeServiceStub(1234));

diff --git a/java/src/main/java/cucumber/runtime/java/JavaBackend.java b/java/src/main/java/cucumber/runtime/java/JavaBackend.java
@@ -132,7 +132,7 @@ public void disposeWorld() {
     }
 
     @Override
-    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+    public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
         return snippetGenerator.getSnippet(step, keyword, functionNameGenerator);
     }
 

diff --git a/java/src/test/java/cucumber/runtime/java/Java8SnippetTest.java b/java/src/test/java/cucumber/runtime/java/Java8SnippetTest.java
@@ -8,6 +8,7 @@
 import org.junit.Test;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 
 import static org.junit.Assert.assertEquals;
@@ -28,6 +29,7 @@ public void generatesPlainSnippet() {
 
     private String snippetFor(String name) {
         PickleStep step = new PickleStep(name, Collections.<Argument>emptyList(), Collections.<PickleLocation>emptyList());
-        return new SnippetGenerator(new Java8Snippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, null);
+        List<String> snippet = new SnippetGenerator(new Java8Snippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, null);
+        return StringJoiner.join("\n", snippet);
     }
 }
diff --git a/java/src/test/java/cucumber/runtime/java/JavaSnippetTest.java b/java/src/test/java/cucumber/runtime/java/JavaSnippetTest.java
@@ -13,7 +13,6 @@
 import io.cucumber.cucumberexpressions.CaptureGroupTransformer;
 import io.cucumber.cucumberexpressions.ParameterType;
 import io.cucumber.cucumberexpressions.ParameterTypeRegistry;
-import io.cucumber.cucumberexpressions.Transformer;
 import io.cucumber.cucumberexpressions.TypeReference;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -209,6 +208,12 @@ public String transform(String... strings) {
             "public void i_have_a(String docString, String docString1) {\n" +
             "    // Write code here that turns the phrase above into concrete actions\n" +
             "    throw new cucumber.api.PendingException();\n" +
+            "}\n" +
+            "\n" +
+            "@Given(\"I have a {string}:\")\n" +
+            "public void i_have_a(String string, String docString) {\n" +
+            "    // Write code here that turns the phrase above into concrete actions\n" +
+            "    throw new cucumber.api.PendingException();\n" +
             "}\n";
         assertEquals(expected, snippetForDocString("I have a \"Documentation String\":", new PickleString(null, "hello"), customParameterType));
     }
@@ -268,8 +273,18 @@ public String transform(String... strings) {
             "    // Double, Byte, Short, Long, BigInteger or BigDecimal.\n" +
             "    //\n" +
             "    // For other transformations you can register a DataTableType.\n" +
-//            "    //\n" +
-//            "    // See: TODO URL\n" +
+            "    throw new cucumber.api.PendingException();\n" +
+            "}\n" +
+            "\n" +
+            "@Given(\"I have in table {string}:\")\n" +
+            "public void i_have_in_table(String string, DataTable dataTable) {\n" +
+            "    // Write code here that turns the phrase above into concrete actions\n" +
+            "    // For automatic transformation, change DataTable to one of\n" +
+            "    // E, List<E>, List<List<E>>, List<Map<K,V>>, Map<K,V> or\n" +
+            "    // Map<K, List<V>>. E,K,V must be a String, Integer, Float,\n" +
+            "    // Double, Byte, Short, Long, BigInteger or BigDecimal.\n" +
+            "    //\n" +
+            "    // For other transformations you can register a DataTableType.\n" +
             "    throw new cucumber.api.PendingException();\n" +
             "}\n";
         PickleTable dataTable = new PickleTable(asList(new PickleRow(asList(new PickleCell(null, "col1")))));
@@ -290,42 +305,48 @@ public void generateSnippetWithOutlineParam() {
 
     private String snippetFor(String name) {
         PickleStep step = new PickleStep(name, Collections.<Argument>emptyList(), Collections.<PickleLocation>emptyList());
-        return new SnippetGenerator(new JavaSnippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        List<String> snippet = new SnippetGenerator(new JavaSnippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        return StringJoiner.join("\n", snippet);
     }
 
 
     private String snippetFor(String name, ParameterType<?> parameterType) {
         PickleStep step = new PickleStep(name, Collections.<Argument>emptyList(), Collections.<PickleLocation>emptyList());
         ParameterTypeRegistry parameterTypeRegistry = new ParameterTypeRegistry(Locale.ENGLISH);
         parameterTypeRegistry.defineParameterType(parameterType);
-        return new SnippetGenerator(new JavaSnippet(), parameterTypeRegistry).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        List<String> snippet = new SnippetGenerator(new JavaSnippet(), parameterTypeRegistry).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        return StringJoiner.join("\n", snippet);
     }
 
     private String snippetForDocString(String name, PickleString docString) {
         PickleStep step = new PickleStep(name, asList((Argument) docString), Collections.<PickleLocation>emptyList());
-        return new SnippetGenerator(new JavaSnippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        List<String> snippet = new SnippetGenerator(new JavaSnippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        return StringJoiner.join("\n", snippet);
     }
 
 
     private String snippetForDocString(String name, PickleString docString, ParameterType<String> parameterType) {
         PickleStep step = new PickleStep(name, asList((Argument) docString), Collections.<PickleLocation>emptyList());
         ParameterTypeRegistry parameterTypeRegistry = new ParameterTypeRegistry(Locale.ENGLISH);
         parameterTypeRegistry.defineParameterType(parameterType);
-        return new SnippetGenerator(new JavaSnippet(), parameterTypeRegistry).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        List<String> snippet = new SnippetGenerator(new JavaSnippet(), parameterTypeRegistry).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        return StringJoiner.join("\n", snippet);
     }
 
 
     private String snippetForDataTable(String name, PickleTable dataTable) {
         PickleStep step = new PickleStep(name, asList((Argument) dataTable), Collections.<PickleLocation>emptyList());
-        return new SnippetGenerator(new JavaSnippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        List<String> snippet = new SnippetGenerator(new JavaSnippet(), new ParameterTypeRegistry(Locale.ENGLISH)).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        return StringJoiner.join("\n", snippet);
     }
 
 
     private String snippetForDataTable(String name, PickleTable dataTable, ParameterType<String> parameterType) {
         PickleStep step = new PickleStep(name, asList((Argument) dataTable), Collections.<PickleLocation>emptyList());
         ParameterTypeRegistry parameterTypeRegistry = new ParameterTypeRegistry(Locale.ENGLISH);
         parameterTypeRegistry.defineParameterType(parameterType);
-        return new SnippetGenerator(new JavaSnippet(), parameterTypeRegistry).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        List<String> snippet = new SnippetGenerator(new JavaSnippet(), parameterTypeRegistry).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);
+        return StringJoiner.join("\n", snippet);
     }
 
     private static class Size {

diff --git a/java/src/test/java/cucumber/runtime/java/StringJoiner.java b/java/src/test/java/cucumber/runtime/java/StringJoiner.java
@@ -0,0 +1,18 @@
+package cucumber.runtime.java;
+
+public class StringJoiner {
+    public static String join(String delimiter, Iterable<String> strings){
+        //TODO: Java8 replace with StringJoiner.
+        StringBuilder builder = new StringBuilder();
+        boolean first = true;
+        for (String string : strings) {
+            if (first) {
+                first = false;
+            } else {
+                builder.append(delimiter);
+            }
+            builder.append(string);
+        }
+        return builder.toString();
+    }
+}
diff --git a/junit/src/test/java/cucumber/runtime/stub/StubBackend.java b/junit/src/test/java/cucumber/runtime/stub/StubBackend.java
@@ -12,6 +12,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import static java.util.Collections.singletonList;
+
 /**
  * We need an implementation of Backend to prevent Runtime from blowing up.
  */
@@ -82,7 +84,7 @@ public void disposeWorld() {
     }
 
     @Override
-    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-        return "STUB SNIPPET";
+    public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+        return singletonList("STUB SNIPPET");
     }
 }
diff --git a/testng/src/test/java/cucumber/runtime/stub/StubBackend.java b/testng/src/test/java/cucumber/runtime/stub/StubBackend.java
@@ -7,8 +7,11 @@
 import cucumber.runtime.snippets.FunctionNameGenerator;
 import gherkin.pickles.PickleStep;
 
+import java.util.Collections;
 import java.util.List;
 
+import static java.util.Collections.singletonList;
+
 /**
  * We need an implementation of Backend to prevent Runtime from blowing up.
  */
@@ -31,7 +34,7 @@ public void disposeWorld() {
     }
 
     @Override
-    public String getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
-        return "STUB SNIPPET";
+    public List<String> getSnippet(PickleStep step, String keyword, FunctionNameGenerator functionNameGenerator) {
+        return singletonList("STUB SNIPPET");
     }
 }