Bump Cucumber to version 7.11.1 (#145)

Author: CGUYOT26

pom.xml

@@ -39,7 +39,7 @@
         <lombok.version>1.18.22</lombok.version>
         <testcontainer.version>1.16.2</testcontainer.version>
         <mockserver.version>5.13.2</mockserver.version>
-        <cucumber.version>7.2.3</cucumber.version>
+        <cucumber.version>7.11.1</cucumber.version>
         <commonstext.version>1.10.0</commonstext.version>
         <sonar.organization>decathlon</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

tzatziki-core/src/main/java/com/decathlon/tzatziki/steps/ObjectSteps.java

@@ -248,7 +248,7 @@ private Map<String, String> getExamples(Scenario scenario) {
                                 .filter(stack -> stack.getClass().getSimpleName().equals("GherkinMessagesExamples"))
                                 .map(o -> getValue(o, "examples"))
                                 .map(Examples.class::cast)
-                                .map(examples -> examples.getTableHeader().getCells())
+                                .flatMap(examples -> examples.getTableHeader().map(TableRow::getCells).stream())
                                 .findFirst().orElseThrow();
                         List<TableCell> values = currentStack.stream()
                                 .filter(stack -> stack.getClass().getSimpleName().equals("GherkinMessagesExample"))

tzatziki-core/src/main/java/io/cucumber/core/plugin/JsonFormatter.java

@@ -2,7 +2,6 @@
 
 import com.decathlon.tzatziki.utils.Guard;
 import com.decathlon.tzatziki.utils.Patterns;
-import io.cucumber.messages.JSON;
 import io.cucumber.messages.types.Background;
 import io.cucumber.messages.types.Feature;
 import io.cucumber.messages.types.Scenario;
@@ -159,7 +158,7 @@ private void finishReport(TestRunFinished event) {
         // ↑
 
         try {
-            JSON.writeValue(writer, featureMaps);
+            Jackson.OBJECT_MAPPER.writeValue(writer, featureMaps);
             writer.close();
         } catch (IOException e) {
             throw new RuntimeException(e);

tzatziki-core/src/main/java/io/cucumber/core/plugin/PrettyFormatter.java

@@ -41,11 +41,11 @@ public final class PrettyFormatter implements ConcurrentEventListener, ColorAwar
     private final ThreadLocal<List<Node>> currentStack = ThreadLocal.withInitial(ArrayList::new);
     // ↑
 
-    private final NiceAppendable out;
+    private final UTF8PrintWriter out;
     private Formats formats = ansi();
 
     public PrettyFormatter(OutputStream out) {
-        this.out = new NiceAppendable(new UTF8OutputStreamWriter(out));
+        this.out = new UTF8PrintWriter(out);
     }
 
     @Override
@@ -203,14 +203,20 @@ private void printError(Result result) {
     }
 
     private void printText(WriteEvent event) {
+        // Prevent interleaving when multiple threads write to System.out
+        StringBuilder builder = new StringBuilder();
         try (BufferedReader lines = new BufferedReader(new StringReader(event.getText()))) {
             String line;
             while ((line = lines.readLine()) != null) {
-                out.println(STEP_SCENARIO_INDENT + line);
+                builder.append(STEP_SCENARIO_INDENT)
+                        .append(line)
+                        // Add system line separator - \n won't do it!
+                        .append(System.lineSeparator());
             }
         } catch (IOException e) {
             throw new CucumberException(e);
         }
+        out.append(builder);
     }
 
     private void printEmbedding(EmbedEvent event) {

tzatziki-core/src/main/java/io/cucumber/core/runner/TestStep.java

@@ -4,11 +4,8 @@
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.messages.types.Envelope;
 import io.cucumber.messages.types.TestStepResult;
-import io.cucumber.plugin.event.Result;
-import io.cucumber.plugin.event.Status;
 import io.cucumber.plugin.event.TestCase;
-import io.cucumber.plugin.event.TestStepFinished;
-import io.cucumber.plugin.event.TestStepStarted;
+import io.cucumber.plugin.event.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -21,9 +18,8 @@
 import static io.cucumber.core.exception.UnrecoverableExceptions.rethrowIfUnrecoverable;
 import static io.cucumber.core.runner.ExecutionMode.SKIP;
 import static io.cucumber.core.runner.TestAbortedExceptions.createIsTestAbortedExceptionPredicate;
-import static io.cucumber.core.runner.TestStepResultStatus.from;
-import static io.cucumber.messages.TimeConversion.javaDurationToDuration;
-import static io.cucumber.messages.TimeConversion.javaInstantToTimestamp;
+import static io.cucumber.core.runner.TestStepResultStatusMapper.from;
+import static io.cucumber.messages.Convertor.toMessage;
 import static java.time.Duration.ZERO;
 
 abstract class TestStep implements io.cucumber.plugin.event.TestStep {
@@ -72,11 +68,10 @@ ExecutionMode run(TestCase testCase, EventBus bus, TestCaseState state, Executio
 
     private void emitTestStepStarted(TestCase testCase, EventBus bus, UUID textExecutionId, Instant startTime) {
         bus.send(new TestStepStarted(startTime, testCase, this));
-        Envelope envelope = new Envelope();
-        envelope.setTestStepStarted(new io.cucumber.messages.types.TestStepStarted(
-            textExecutionId.toString(),
-            id.toString(),
-            javaInstantToTimestamp(startTime)));
+        Envelope envelope = Envelope.of(new io.cucumber.messages.types.TestStepStarted(
+                textExecutionId.toString(),
+                id.toString(),
+                toMessage(startTime)));
         bus.send(envelope);
     }
 
@@ -117,19 +112,18 @@ private void emitTestStepFinished(
     ) {
         bus.send(new TestStepFinished(stopTime, testCase, this, result));
 
-        TestStepResult testStepResult = new TestStepResult();
-        if (result.getError() != null) {
-            testStepResult.setMessage(extractStackTrace(result.getError()));
-        }
-        testStepResult.setStatus(from(result.getStatus()));
-        testStepResult.setDuration(javaDurationToDuration(duration));
-
-        Envelope envelope = new Envelope();
-        envelope.setTestStepFinished(new io.cucumber.messages.types.TestStepFinished(
-            textExecutionId.toString(),
-            id.toString(),
-            testStepResult,
-            javaInstantToTimestamp(stopTime)));
+        TestStepResult testStepResult = new TestStepResult(
+                toMessage(duration),
+                result.getError() != null ? extractStackTrace(result.getError()) : null,
+                from(result.getStatus()),
+                result.getError() != null ? toMessage(result.getError()) : null
+        );
+
+        Envelope envelope = Envelope.of(new io.cucumber.messages.types.TestStepFinished(
+                textExecutionId.toString(),
+                id.toString(),
+                testStepResult,
+                toMessage(stopTime)));
         bus.send(envelope);
     }