Add test case for CDATA

Author: mpkorstanje

java/src/main/java/io/cucumber/junitxmlformatter/XmlReportData.java

@@ -8,7 +8,6 @@
 import io.cucumber.messages.types.TestCaseFinished;
 import io.cucumber.messages.types.TestCaseStarted;
 import io.cucumber.messages.types.TestRunFinished;
-import io.cucumber.messages.types.TestRunStarted;
 import io.cucumber.messages.types.TestStep;
 import io.cucumber.messages.types.TestStepFinished;
 import io.cucumber.messages.types.TestStepResult;
@@ -51,7 +50,7 @@ class XmlReportData {
     private final Map<String, String> stepAstNodeIdToStepKeyWord = new ConcurrentHashMap<>();
 
     void collect(Envelope envelope) {
-        envelope.getTestRunStarted().ifPresent(this::testRunStarted);
+        envelope.getTestRunStarted().ifPresent(event -> this.testRunStarted = timestampToJavaInstant(event.getTimestamp()));
         envelope.getTestRunFinished().ifPresent(this::testRunFinished);
         envelope.getTestCaseStarted().ifPresent(this::testCaseStarted);
         envelope.getTestCaseFinished().ifPresent(this::testCaseFinished);
@@ -61,26 +60,22 @@ void collect(Envelope envelope) {
         envelope.getTestCase().ifPresent(this::testCase);
     }
 
-    void testRunStarted(TestRunStarted event) {
-        this.testRunStarted = timestampToJavaInstant(event.getTimestamp());
-    }
-
-    void testRunFinished(TestRunFinished event) {
+    private void testRunFinished(TestRunFinished event) {
         this.testRunFinished = timestampToJavaInstant(event.getTimestamp());
     }
 
-    void testCaseStarted(TestCaseStarted event) {
+    private void testCaseStarted(TestCaseStarted event) {
         this.testCaseStartedIds.add(event.getId());
         this.testCaseStartedIdToStartedInstant.put(event.getId(), timestampToJavaInstant(event.getTimestamp()));
         this.testCaseStartedIdToTestCaseId.put(event.getId(), event.getTestCaseId());
     }
 
-    void testCaseFinished(TestCaseFinished event) {
+    private void testCaseFinished(TestCaseFinished event) {
         this.testCaseStartedIdToFinishedInstant.put(event.getTestCaseStartedId(),
                 timestampToJavaInstant(event.getTimestamp()));
     }
 
-    void testStepFinished(TestStepFinished event) {
+    private void testStepFinished(TestStepFinished event) {
         testStepIdToTestStepResultStatus.put(event.getTestStepId(), event.getTestStepResult().getStatus());
         testCaseStartedIdToResult.compute(event.getTestCaseStartedId(),
                 (__, previousStatus) -> mostSevereResult(previousStatus, event.getTestStepResult()));
@@ -90,7 +85,7 @@ private TestStepResult mostSevereResult(TestStepResult a, TestStepResult b) {
         return testStepResultComparator.compare(a, b) >= 0 ? a : b;
     }
 
-    void source(GherkinDocument event) {
+    private void source(GherkinDocument event) {
         event.getFeature().ifPresent(feature -> {
             feature.getChildren().forEach(featureChild -> {
                 featureChild.getRule().ifPresent(rule -> {
@@ -113,7 +108,7 @@ void source(GherkinDocument event) {
         });
     }
 
-    void pickle(Pickle event) {
+    private void pickle(Pickle event) {
         pickleIdToPickle.put(event.getId(), event);
         // @formatter:off
         event.getAstNodeIds().stream()
@@ -122,7 +117,7 @@ void pickle(Pickle event) {
         // @formatter:on
     }
 
-    void testCase(TestCase testCase) {
+    private void testCase(TestCase testCase) {
         testCaseIdToTestCase.put(testCase.getId(), testCase);
     }
 
@@ -168,7 +163,7 @@ public String getFeatureName(String testCaseStartedId) {
         return scenarioAstNodeIdToFeatureName.get(astNodeId);
     }
 
-    public LinkedHashMap<String, String> getStepsAndResult(String testCaseStartedId) {
+    LinkedHashMap<String, String> getStepsAndResult(String testCaseStartedId) {
         String testCaseId = testCaseStartedIdToTestCaseId.get(testCaseStartedId);
         TestCase testCase = testCaseIdToTestCase.get(testCaseId);
         Pickle pickle = pickleIdToPickle.get(testCase.getPickleId());
@@ -208,16 +203,16 @@ private Function<TestStep, String> renderTestStepText(Pickle pickle) {
         };
     }
 
-    public Deque<String> testCaseStartedIds() {
+    Deque<String> testCaseStartedIds() {
         return testCaseStartedIds;
     }
 
-    private static final io.cucumber.messages.types.Duration ZERO_DURATION = new io.cucumber.messages.types.Duration(
-            0L, 0L);
+    private static final io.cucumber.messages.types.Duration ZERO_DURATION =
+            new io.cucumber.messages.types.Duration(0L, 0L);
     // By definition, but see https://github.com/cucumber/gherkin/issues/11
     private static final TestStepResult SCENARIO_WITH_NO_STEPS = new TestStepResult(ZERO_DURATION, null, PASSED);
 
-    public TestStepResult getTestCaseStatus(String testCaseStartedId) {
+    TestStepResult getTestCaseStatus(String testCaseStartedId) {
         return testCaseStartedIdToResult.getOrDefault(testCaseStartedId, SCENARIO_WITH_NO_STEPS);
     }
 

testdata/minimal-with-cdata.feature.ndjson

@@ -0,0 +1,12 @@
+{"meta":{"ci":{"buildNumber":"154666429","git":{"remote":"https://github.com/cucumber-ltd/shouty.rb.git","revision":"99684bcacf01d95875834d87903dcb072306c9ad"},"name":"GitHub Actions","url":"https://github.com/cucumber-ltd/shouty.rb/actions/runs/154666429"},"cpu":{"name":"x64"},"implementation":{"name":"fake-cucumber","version":"16.0.0"},"os":{"name":"linux","version":"5.10.102.1-microsoft-standard-WSL2"},"protocolVersion":"19.1.2","runtime":{"name":"node.js","version":"16.4.0"}}}
+{"source":{"data":"Feature: minimal\n  \n  Cucumber doesn't execute this markdown, but @cucumber/react renders it\n  \n  * This is\n  * a bullet\n  * list\n  \n  Scenario: cukes\n    Given I have 42 cukes in my belly\n","mediaType":"text/x.cucumber.gherkin+plain","uri":"samples/minimal/minimal.feature"}}
+{"gherkinDocument":{"comments":[],"feature":{"children":[{"scenario":{"description":"","examples":[],"id":"2","keyword":"Scenario","location":{"column":3,"line":9},"name":"cukes","steps":[{"id":"1","keyword":"Given ","keywordType":"Context","location":{"column":5,"line":10},"text":"I have 42 ![CDATA[cukes]] in my belly"}],"tags":[]}}],"description":"  Cucumber doesn't execute this markdown, but @cucumber/react renders it\n  \n  * This is\n  * a bullet\n  * list","keyword":"Feature","language":"en","location":{"column":1,"line":1},"name":"minimal","tags":[]},"uri":"samples/minimal/minimal.feature"}}
+{"pickle":{"astNodeIds":["2"],"id":"4","language":"en","name":"cukes","steps":[{"astNodeIds":["1"],"id":"3","text":"I have <![CDATA[42]]> cukes in my belly","type":"Context"}],"tags":[],"uri":"samples/minimal/minimal.feature"}}
+{"stepDefinition":{"id":"0","pattern":{"source":"I have {int} cukes in my belly","type":"CUCUMBER_EXPRESSION"},"sourceReference":{"location":{"line":4},"uri":"samples/minimal/minimal.feature.ts"}}}
+{"testRunStarted":{"timestamp":{"nanos":0,"seconds":0}}}
+{"testCase":{"id":"6","pickleId":"4","testSteps":[{"id":"5","pickleStepId":"3","stepDefinitionIds":["0"],"stepMatchArgumentsLists":[{"stepMatchArguments":[{"group":{"children":[],"start":7,"value":"42"},"parameterTypeName":"int"}]}]}]}}
+{"testCaseStarted":{"attempt":0,"id":"7","testCaseId":"6","timestamp":{"nanos":1000000,"seconds":0}}}
+{"testStepStarted":{"testCaseStartedId":"7","testStepId":"5","timestamp":{"nanos":2000000,"seconds":0}}}
+{"testStepFinished":{"testCaseStartedId":"7","testStepId":"5","testStepResult":{"duration":{"nanos":1000000,"seconds":0},"status":"PASSED"},"timestamp":{"nanos":3000000,"seconds":0}}}
+{"testCaseFinished":{"testCaseStartedId":"7","timestamp":{"nanos":4000000,"seconds":0},"willBeRetried":false}}
+{"testRunFinished":{"success":true,"timestamp":{"nanos":5000000,"seconds":0}}}