Include hooks in progress formatter

Author: mpkorstanje

cucumber-core/src/main/java/io/cucumber/core/plugin/ProgressFormatter.java

@@ -1,9 +1,7 @@
 package io.cucumber.core.plugin;
 
 import io.cucumber.messages.types.Envelope;
-import io.cucumber.messages.types.TestCase;
 import io.cucumber.messages.types.TestRunFinished;
-import io.cucumber.messages.types.TestStep;
 import io.cucumber.messages.types.TestStepFinished;
 import io.cucumber.messages.types.TestStepResultStatus;
 import io.cucumber.plugin.ColorAware;
@@ -15,7 +13,6 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
 
 import static io.cucumber.messages.types.TestStepResultStatus.AMBIGUOUS;
@@ -28,15 +25,14 @@
 
 public final class ProgressFormatter implements ConcurrentEventListener, ColorAware {
 
-    private final Map<String, TestStep> testStepById = new HashMap<>();
     private final Map<TestStepResultStatus, String> chars = new EnumMap<>(TestStepResultStatus.class);
     private final Map<TestStepResultStatus, AnsiEscapes> escapes = new EnumMap<>(TestStepResultStatus.class);
     private final PrintWriter writer;
     private boolean monochrome = false;
-    
+
     public ProgressFormatter(OutputStream out) {
         this.writer = createPrintWriter(out);
-        
+
         chars.put(PASSED, ".");
         chars.put(UNDEFINED, "U");
         chars.put(PENDING, "P");
@@ -69,20 +65,12 @@ public void setMonochrome(boolean monochrome) {
     @Override
     public void setEventPublisher(EventPublisher publisher) {
         publisher.registerHandlerFor(Envelope.class, event -> {
-            event.getTestCase().ifPresent(this::updateTestCase);
             event.getTestStepFinished().ifPresent(this::handleTestStepFinished);
             event.getTestRunFinished().ifPresent(this::handleTestRunFinished);
         });
     }
 
-    private void updateTestCase(TestCase event) {
-        event.getTestSteps().forEach(testStep -> testStepById.put(testStep.getId(), testStep));
-    }
-
     private void handleTestStepFinished(TestStepFinished event) {
-        if (!includeStep(event)) {
-            return;
-        }
         TestStepResultStatus status = event.getTestStepResult().getStatus();
         // Prevent tearing in output when multiple threads write to System.out
         StringBuilder buffer = new StringBuilder();
@@ -97,15 +85,6 @@ private void handleTestStepFinished(TestStepFinished event) {
         writer.flush();
     }
 
-    private boolean includeStep(TestStepFinished testStepFinished) {
-        TestStepResultStatus status = testStepFinished.getTestStepResult().getStatus();
-        if (status == FAILED) {
-            return true;
-        }
-        TestStep testStep = testStepById.get(testStepFinished.getTestStepId());
-        return testStep != null && testStep.getPickleStepId().isPresent();
-    }
-
     private void handleTestRunFinished(TestRunFinished testRunFinished) {
         writer.println();
         writer.close();

cucumber-core/src/test/java/io/cucumber/core/plugin/ProgressFormatterTest.java

@@ -72,7 +72,7 @@ void print_yellow_U_for_undefined_step() {
     }
 
     @Test
-    void print_nothing_for_passed_hook() {
+    void prints_passed_hook() {
         Feature feature = TestFeatureParser.parse("classpath:path/test.feature", "" +
                 "Feature: feature name\n" +
                 "  Scenario: passed scenario\n" +
@@ -89,7 +89,7 @@ void print_nothing_for_passed_hook() {
                 .build()
                 .run();
 
-        assertThat(out, bytes(equalCompressingLineSeparators(AnsiEscapes.GREEN + "." + AnsiEscapes.RESET + "\n")));
+        assertThat(out, bytes(equalCompressingLineSeparators(AnsiEscapes.GREEN + "." + AnsiEscapes.RESET + AnsiEscapes.GREEN + "." + AnsiEscapes.RESET + "\n")));
     }
 
     @Test