test case attrs with basic names

Author: davidjgoss

javascript/src/ExtendedQuery.ts

@@ -1,7 +1,9 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import * as assert from 'node:assert'
+
 import {
   Envelope,
   getWorstTestStepResult,
+  Pickle,
   TestCase,
   TestCaseFinished,
   TestCaseStarted,
@@ -15,48 +17,82 @@ import { Query as CucumberQuery } from '@cucumber/query'
 export class ExtendedQuery extends CucumberQuery {
   private testRunStarted: TestRunStarted
   private testRunFinished: TestRunFinished
+  private testCaseStarted: Array<TestCaseStarted> = []
+  private readonly pickleById: Map<string, Pickle> = new Map()
   private readonly testCaseById: Map<string, TestCase> = new Map()
-  private readonly testCaseStartedById: Map<string, TestCaseStarted> = new Map()
   private readonly testCaseFinishedByTestCaseStartedId: Map<string, TestCaseFinished> = new Map()
-  private readonly finalAttemptByTestCaseId: Map<
-    string,
-    [TestCase, TestCaseStarted, TestCaseFinished]
-  > = new Map()
 
   update(envelope: Envelope) {
     super.update(envelope)
 
+    if (envelope.pickle) {
+      this.pickleById.set(envelope.pickle.id, envelope.pickle)
+    }
     if (envelope.testRunStarted) {
       this.testRunStarted = envelope.testRunStarted
     }
     if (envelope.testCase) {
       this.testCaseById.set(envelope.testCase.id, envelope.testCase)
     }
     if (envelope.testCaseStarted) {
-      this.testCaseStartedById.set(envelope.testCaseStarted.id, envelope.testCaseStarted)
+      this.updateTestCaseStarted(envelope.testCaseStarted)
     }
     if (envelope.testCaseFinished) {
-      this.testCaseFinishedByTestCaseStartedId.set(
-        envelope.testCaseFinished.testCaseStartedId,
-        envelope.testCaseFinished
-      )
-      if (!envelope.testCaseFinished.willBeRetried) {
-        const testCaseStarted = this.testCaseStartedById.get(
-          envelope.testCaseFinished.testCaseStartedId
-        )!
-        const testCase = this.testCaseById.get(testCaseStarted.testCaseId)!
-        this.finalAttemptByTestCaseId.set(testCase.id, [
-          testCase,
-          testCaseStarted,
-          envelope.testCaseFinished,
-        ])
-      }
+      this.updateTestCaseFinished(envelope.testCaseFinished)
     }
     if (envelope.testRunFinished) {
       this.testRunFinished = envelope.testRunFinished
     }
   }
 
+  private updateTestCaseStarted(testCaseStarted: TestCaseStarted) {
+    // ensure this replaces any previous attempt for the same test case
+    this.testCaseStarted = [
+      ...this.testCaseStarted.filter(
+        (existing) => existing.testCaseId !== testCaseStarted.testCaseId
+      ),
+      testCaseStarted,
+    ]
+  }
+
+  private updateTestCaseFinished(testCaseFinished: TestCaseFinished) {
+    this.testCaseFinishedByTestCaseStartedId.set(
+      testCaseFinished.testCaseStartedId,
+      testCaseFinished
+    )
+  }
+
+  findPickleBy(testCaseStarted: TestCaseStarted) {
+    const testCase = this.findTestCaseBy(testCaseStarted)
+    if (!testCase) {
+      return undefined
+    }
+    return this.pickleById.get(testCase.pickleId)
+  }
+
+  findAllTestCaseStarted(): ReadonlyArray<TestCaseStarted> {
+    return [...this.testCaseStarted]
+  }
+
+  findTestCaseBy(testCaseStarted: TestCaseStarted) {
+    return this.testCaseById.get(testCaseStarted.testCaseId)
+  }
+
+  findTestCaseFinishedBy(testCaseStarted: TestCaseStarted) {
+    return this.testCaseFinishedByTestCaseStartedId.get(testCaseStarted.id)
+  }
+
+  findTestCaseDurationBy(testCaseStarted: TestCaseStarted) {
+    const testCaseFinished = this.findTestCaseFinishedBy(testCaseStarted)
+    if (!testCaseFinished) {
+      return undefined
+    }
+    return TimeConversion.millisecondsToDuration(
+      TimeConversion.timestampToMillisecondsSinceEpoch(testCaseFinished.timestamp) -
+        TimeConversion.timestampToMillisecondsSinceEpoch(testCaseStarted.timestamp)
+    )
+  }
+
   findTestRunDuration() {
     if (!this.testRunStarted || !this.testRunFinished) {
       return undefined
@@ -77,7 +113,9 @@ export class ExtendedQuery extends CucumberQuery {
       [TestStepResultStatus.UNDEFINED]: 0,
       [TestStepResultStatus.UNKNOWN]: 0,
     }
-    for (const [testCase] of this.finalAttemptByTestCaseId.values()) {
+    for (const testCaseStarted of this.testCaseStarted) {
+      const testCase = this.findTestCaseBy(testCaseStarted)
+      assert.ok(testCase, 'Expected to find TestCase for TestCaseStarted')
       const statusesFromSteps = testCase.testSteps.map((testStep) => {
         return getWorstTestStepResult(this.getTestStepResults(testStep.id))
       })

javascript/src/index.ts

@@ -1,3 +1,5 @@
+import * as assert from 'node:assert'
+
 import { Query as GherkinQuery } from '@cucumber/gherkin-utils'
 import { Envelope, TestStepResultStatus } from '@cucumber/messages'
 import xmlbuilder from 'xmlbuilder'
@@ -41,6 +43,17 @@ export default {
           )
         )
         builder.att('errors', 0)
+
+        for (const testCaseStarted of cucumberQuery.findAllTestCaseStarted()) {
+          const pickle = cucumberQuery.findPickleBy(testCaseStarted)
+          assert.ok(pickle, 'Expected to find Pickle for TestCaseStarted')
+          builder.ele('testcase', {
+            classname: pickle.uri,
+            name: pickle.name,
+            time: durationToSeconds(cucumberQuery.findTestCaseDurationBy(testCaseStarted)),
+          })
+        }
+
         write(builder.end({ pretty: true }))
       }
     })