Merge pull request #1078 from avokin/snippet-for-outline-param

SnippetGenerator recognises parameters from Scenario Outline (<param>)

Author: mpkorstanje

core/src/main/java/cucumber/runtime/snippets/ArgumentPattern.java

@@ -7,9 +7,15 @@ public class ArgumentPattern {
 
     private final Pattern pattern;
     private final Class<?> type;
+    private final String replacement;
 
     public ArgumentPattern(Pattern pattern, Class<?> type) {
+        this(pattern, pattern.pattern(), type);
+    }
+
+    public ArgumentPattern(Pattern pattern, String replacement, Class<?> type) {
         this.pattern = pattern;
+        this.replacement = replacement;
         this.type = type;
     }
 
@@ -22,7 +28,7 @@ public Class<?> type() {
     }
 
     public String replaceMatchesWithGroups(String name) {
-        return replaceMatchWith(name, pattern.pattern());
+        return replaceMatchWith(name, replacement);
     }
 
     public String replaceMatchesWithSpace(String name) {

core/src/main/java/cucumber/runtime/snippets/SnippetGenerator.java

@@ -15,7 +15,8 @@
 public class SnippetGenerator {
     private static final ArgumentPattern[] DEFAULT_ARGUMENT_PATTERNS = new ArgumentPattern[]{
             new ArgumentPattern(Pattern.compile("\"([^\"]*)\""), String.class),
-            new ArgumentPattern(Pattern.compile("(\\d+)"), Integer.TYPE)
+            new ArgumentPattern(Pattern.compile("(\\d+)"), Integer.TYPE),
+            new ArgumentPattern(Pattern.compile("<([^>]*)>"), "(.*)", String.class)
     };
     private static final Pattern GROUP_PATTERN = Pattern.compile("\\(");
     private static final Pattern[] ESCAPE_PATTERNS = new Pattern[]{

java/src/test/java/cucumber/runtime/java/JavaSnippetTest.java

@@ -160,6 +160,18 @@ public void generatesSnippetWithDataTable() {
         assertEquals(expected, snippetForDataTable("I have:", dataTable));
     }
 
+    @Test
+    public void generateSnippetWithOutlineParam() {
+        String expected = "" +
+                "@Given(\"^Then it responds (.*)$\")\n" +
+                "public void then_it_responds(String arg1) throws Throwable {\n" +
+                "    // Write code here that turns the phrase above into concrete actions\n" +
+                "    throw new PendingException();\n" +
+                "}\n";
+
+        assertEquals(expected, snippetFor("Then it responds <param>"));
+    }
+
     private String snippetFor(String name) {
         PickleStep step = new PickleStep(name, Collections.<Argument>emptyList(), Collections.<PickleLocation>emptyList());
         return new SnippetGenerator(new JavaSnippet()).getSnippet(step, GIVEN_KEYWORD, functionNameGenerator);