Pass outline scenarios to formatters also from the JUnit runner

Author: brasmusson

core/src/main/java/cucumber/runtime/model/CucumberScenarioOutline.java

@@ -38,7 +38,7 @@ public List<CucumberExamples> getCucumberExamplesList() {
 
     @Override
     public void run(Formatter formatter, Reporter reporter, Runtime runtime) {
-        format(formatter);
+        formatOutlineScenario(formatter);
         for (CucumberExamples cucumberExamples : cucumberExamplesList) {
             cucumberExamples.format(formatter);
             List<CucumberScenario> exampleScenarios = cucumberExamples.createExampleScenarios();
@@ -48,6 +48,10 @@ public void run(Formatter formatter, Reporter reporter, Runtime runtime) {
         }
     }
 
+    public void formatOutlineScenario(Formatter formatter) {
+        format(formatter);
+    }
+
     CucumberScenario createExampleScenario(ExamplesTableRow header, ExamplesTableRow example, List<Tag> examplesTags) {
         // Make sure we replace the tokens in the name of the scenario
         String exampleScenarioName = replaceTokens(new HashSet<Integer>(), header.getCells(), example.getCells(), getGherkinModel().getName());

junit/src/main/java/cucumber/runtime/junit/JUnitReporter.java

@@ -32,6 +32,7 @@ public class JUnitReporter implements Reporter, Formatter {
     private RunNotifier runNotifier;
     EachTestNotifier executionUnitNotifier;
     private boolean ignoredStep;
+    private boolean inScenarioLifeCycle;
 
     public JUnitReporter(Reporter reporter, Formatter formatter, boolean strict) {
         this.reporter = reporter;
@@ -186,7 +187,9 @@ public void examples(Examples examples) {
 
     @Override
     public void step(Step step) {
-        steps.add(step);
+        if (inScenarioLifeCycle) {
+            steps.add(step);
+        }
         formatter.step(step);
     }
 
@@ -212,11 +215,13 @@ public void close() {
 
     @Override
     public void startOfScenarioLifeCycle(Scenario scenario) {
+        inScenarioLifeCycle = true;
         formatter.startOfScenarioLifeCycle(scenario);
     }
 
     @Override
     public void endOfScenarioLifeCycle(Scenario scenario) {
         formatter.endOfScenarioLifeCycle(scenario);
+        inScenarioLifeCycle = false;
     }
 }

junit/src/main/java/cucumber/runtime/junit/ScenarioOutlineRunner.java

@@ -5,18 +5,21 @@
 import cucumber.runtime.model.CucumberScenarioOutline;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
+import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.Suite;
 import org.junit.runners.model.InitializationError;
 
 import java.util.ArrayList;
 
 class ScenarioOutlineRunner extends Suite {
     private final CucumberScenarioOutline cucumberScenarioOutline;
+    private final JUnitReporter jUnitReporter;
     private Description description;
 
     public ScenarioOutlineRunner(Runtime runtime, CucumberScenarioOutline cucumberScenarioOutline, JUnitReporter jUnitReporter) throws InitializationError {
         super(null, new ArrayList<Runner>());
         this.cucumberScenarioOutline = cucumberScenarioOutline;
+        this.jUnitReporter = jUnitReporter;
         for (CucumberExamples cucumberExamples : cucumberScenarioOutline.getCucumberExamplesList()) {
             getChildren().add(new ExamplesRunner(runtime, cucumberExamples, jUnitReporter));
         }
@@ -37,4 +40,10 @@ public Description getDescription() {
         }
         return description;
     }
+
+    @Override
+    public void run(final RunNotifier notifier) {
+        cucumberScenarioOutline.formatOutlineScenario(jUnitReporter);
+        super.run(notifier);
+    }
 }

junit/src/test/java/cucumber/runtime/junit/FeatureRunnerTest.java

@@ -82,6 +82,9 @@ public void should_call_formatter_for_scenario_outline_with_two_examples_table_a
         assertEquals("" +
                 "uri\n" +
                 "feature\n" +
+                "  scenarioOutline\n" +
+                "    step\n" +
+                "    step\n" +
                 "  examples\n" +
                 "  startOfScenarioLifeCycle\n" +
                 "  background\n" +

junit/src/test/java/cucumber/runtime/junit/JUnitReporterTest.java

@@ -216,6 +216,7 @@ public void forward_calls_to_reporter_interface_methods() throws Exception {
         jUnitReporter = new JUnitReporter(reporter, mock(Formatter.class), false);
 
         jUnitReporter.startExecutionUnit(executionUnitRunner, mock(RunNotifier.class));
+        jUnitReporter.startOfScenarioLifeCycle(mock(Scenario.class));
         jUnitReporter.before(match, result);
         jUnitReporter.step(mockStep());
         jUnitReporter.match(match);
@@ -242,6 +243,7 @@ public void creates_step_notifier_with_step_from_execution_unit_runner() throws
         jUnitReporter = new JUnitReporter(mock(Reporter.class), mock(Formatter.class), false);
 
         jUnitReporter.startExecutionUnit(executionUnitRunner, notifier);
+        jUnitReporter.startOfScenarioLifeCycle(mock(Scenario.class));
         jUnitReporter.step(mockStep("Step Name"));
         jUnitReporter.match(mock(Match.class));
         jUnitReporter.result(mockResult());
@@ -256,6 +258,7 @@ public void throws_exception_when_runner_step_name_do_no_match_scenario_step_nam
         jUnitReporter = new JUnitReporter(mock(Reporter.class), mock(Formatter.class), false);
 
         jUnitReporter.startExecutionUnit(executionUnitRunner, mock(RunNotifier.class));
+        jUnitReporter.startOfScenarioLifeCycle(mock(Scenario.class));
         jUnitReporter.step(mockStep("Scenario Step Name"));
         try {
             jUnitReporter.match(mock(Match.class));