Merge pull request #557 from brasmusson/all-steps-first-execution

Merge pull request #557 Make the PrettyFormatter work by revering to
all-steps-first execution. This fixes #491 and the other reports of
IndexOutOfBoundsException when using the PrettyFormatter.
Update the History.md

Author: brasmusson

History.md

@@ -17,6 +17,7 @@
 * [Core] Throw exception when unsupported command line options are used. ([#482](https://github.com/cucumber/cucumber-jvm/pull/482), [#463](https://github.com/cucumber/cucumber-jvm/issues/463) Klaus Bayrhammer)
 * [Scala] Release cucumber-scala for the two most recent minor releases (currently 2.10.2 and 2.9.3) ([#432](https://github.com/cucumber/cucumber-jvm/issues/432), [#462](https://github.com/cucumber/cucumber-jvm/pull/462) Chris Turner)
 * [Core] JUnitFormatter: Fix indentation, hook handling and support all-steps-first execution ([#556](https://github.com/cucumber/cucumber-jvm/pull/556) Björn Rasmusson)
+* [Core] Make the PrettyFormatter work by revering to all-steps-first execution ([#557](https://github.com/cucumber/cucumber-jvm/pull/557) Björn Rasmusson)
 
 ## [1.1.3](https://github.com/cucumber/cucumber-jvm/compare/v1.1.2...v1.1.3) (2013-03-10)
 

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

@@ -37,7 +37,7 @@ public void run(Formatter formatter, Reporter reporter, Runtime runtime) {
 
         runBackground(formatter, reporter, runtime);
         format(formatter);
-        runSteps(formatter, reporter, runtime);
+        runSteps(reporter, runtime);
 
         runtime.runAfterHooks(reporter, tags);
         runtime.disposeBackendWorlds();
@@ -46,7 +46,7 @@ public void run(Formatter formatter, Reporter reporter, Runtime runtime) {
     private void runBackground(Formatter formatter, Reporter reporter, Runtime runtime) {
         if (cucumberBackground != null) {
             cucumberBackground.format(formatter);
-            cucumberBackground.runSteps(formatter, reporter, runtime);
+            cucumberBackground.runSteps(reporter, runtime);
         }
     }
 }

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

@@ -38,7 +38,6 @@ public List<CucumberExamples> getCucumberExamplesList() {
     @Override
     public void run(Formatter formatter, Reporter reporter, Runtime runtime) {
         format(formatter);
-        formatSteps(formatter);
         for (CucumberExamples cucumberExamples : cucumberExamplesList) {
             cucumberExamples.format(formatter);
             List<CucumberScenario> exampleScenarios = cucumberExamples.createExampleScenarios();

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

@@ -29,22 +29,18 @@ public void step(Step step) {
 
     void format(Formatter formatter) {
         statement.replay(formatter);
-    }
-
-    void formatSteps(Formatter formatter) {
         for (Step step : getSteps()) {
             formatter.step(step);
         }
     }
 
-    void runSteps(Formatter formatter, Reporter reporter, Runtime runtime) {
+    void runSteps(Reporter reporter, Runtime runtime) {
         for (Step step : getSteps()) {
-            runStep(step, formatter, reporter, runtime);
+            runStep(step, reporter, runtime);
         }
     }
 
-    void runStep(Step step, Formatter formatter, Reporter reporter, Runtime runtime) {
-        formatter.step(step);
+    void runStep(Step step, Reporter reporter, Runtime runtime) {
         runtime.runStep(cucumberFeature.getUri(), step, reporter, cucumberFeature.getI18n());
     }
 }