Merge branch 'jsonformatter-only-executed-scenarios' of https://github.com/brasmusson/cucumber-jvm

Author: aslakhellesoy

core/src/main/java/cucumber/runtime/formatter/CucumberJSONFormatter.java

@@ -0,0 +1,38 @@
+package cucumber.runtime.formatter;
+
+import gherkin.formatter.JSONFormatter;
+import gherkin.formatter.model.Examples;
+import gherkin.formatter.model.Scenario;
+import gherkin.formatter.model.ScenarioOutline;
+import gherkin.formatter.model.Step;
+
+public class CucumberJSONFormatter extends JSONFormatter {
+    private boolean inScenarioOutline = false;
+
+    public CucumberJSONFormatter(Appendable out) {
+        super(out);
+    }
+
+    @Override
+    public void scenarioOutline(ScenarioOutline scenarioOutline) {
+        inScenarioOutline = true;
+    }
+
+    @Override
+    public void examples(Examples examples) {
+        // NoOp
+    }
+
+    @Override
+    public void startOfScenarioLifeCycle(Scenario scenario) {
+        inScenarioOutline = false;
+        super.startOfScenarioLifeCycle(scenario);
+    }
+
+    @Override
+    public void step(Step step) {
+        if (!inScenarioOutline) {
+            super.step(step);
+        }
+    }
+}

core/src/main/java/cucumber/runtime/formatter/FormatterFactory.java

@@ -4,7 +4,6 @@
 import cucumber.runtime.io.URLOutputStream;
 import cucumber.runtime.io.UTF8OutputStreamWriter;
 import gherkin.formatter.Formatter;
-import gherkin.formatter.JSONFormatter;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,7 +45,7 @@ public class FormatterFactory {
         put("html", HTMLFormatter.class);
         put("pretty", CucumberPrettyFormatter.class);
         put("progress", ProgressFormatter.class);
-        put("json", JSONFormatter.class);
+        put("json", CucumberJSONFormatter.class);
         put("usage", UsageFormatter.class);
         put("rerun", RerunFormatter.class);
     }};

core/src/test/java/cucumber/runtime/RuntimeTest.java

@@ -2,6 +2,7 @@
 
 import cucumber.api.PendingException;
 import cucumber.api.Scenario;
+import cucumber.runtime.formatter.CucumberJSONFormatter;
 import cucumber.runtime.io.ClasspathResourceLoader;
 import cucumber.runtime.io.Resource;
 import cucumber.runtime.io.ResourceLoader;
@@ -51,7 +52,7 @@ public void runs_feature_with_json_formatter() throws Exception {
                 "  Scenario: scenario name\n" +
                 "    When s\n");
         StringBuilder out = new StringBuilder();
-        JSONFormatter jsonFormatter = new JSONFormatter(out);
+        JSONFormatter jsonFormatter = new CucumberJSONFormatter(out);
         List<Backend> backends = asList(mock(Backend.class));
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         RuntimeOptions runtimeOptions = new RuntimeOptions("");

core/src/test/resources/cucumber/runtime/formatter/JSONPrettyFormatterTest.json

@@ -97,69 +97,6 @@
         ],
         "type": "scenario"
       },
-      {
-        "id": "feature-3;scenariooutline-1",
-        "description": "",
-        "name": "ScenarioOutline_1",
-        "keyword": "Scenario Outline",
-        "line": 14,
-        "steps": [
-          {
-            "name": "so_1 \u003ca\u003e",
-            "keyword": "Given ",
-            "line": 15
-          },
-          {
-            "name": "so_2 \u003cc\u003e cucumbers",
-            "keyword": "When ",
-            "line": 16
-          },
-          {
-            "name": "\u003cb\u003e so_3",
-            "keyword": "Then ",
-            "line": 17
-          }
-        ],
-        "examples": [
-          {
-            "id": "feature-3;scenariooutline-1;",
-            "description": "",
-            "name": "",
-            "keyword": "Examples",
-            "line": 19,
-            "rows": [
-              {
-                "id": "feature-3;scenariooutline-1;;1",
-                "cells": [
-                  "a",
-                  "b",
-                  "c"
-                ],
-                "line": 20
-              },
-              {
-                "id": "feature-3;scenariooutline-1;;2",
-                "cells": [
-                  "12",
-                  "5",
-                  "7"
-                ],
-                "line": 21
-              },
-              {
-                "id": "feature-3;scenariooutline-1;;3",
-                "cells": [
-                  "20",
-                  "5",
-                  "15"
-                ],
-                "line": 22
-              }
-            ]
-          }
-        ],
-        "type": "scenario_outline"
-      },
       {
         "description": "",
         "name": "",