add method to calculate test case id

allure-framework · Aug 14, 2023 · 2a6e165 · 2a6e165
1 parent 5dcc4aa
commit 2a6e165
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/packages/allure-cucumberjs/src/CucumberJSAllureReporter.ts b/packages/allure-cucumberjs/src/CucumberJSAllureReporter.ts
@@ -300,7 +300,6 @@ export class CucumberJSAllureFormatter extends Formatter {
     currentTest.name = pickle.name;
     currentTest.fullName = fullName;
     currentTest.testCaseId = testCaseId;
-    currentTest.historyId = testCaseId;
 
     currentTest.addLabel(LabelName.HOST, this.hostname);
     currentTest.addLabel(LabelName.LANGUAGE, "javascript");

diff --git a/packages/allure-hermione/src/index.ts b/packages/allure-hermione/src/index.ts
@@ -87,7 +87,6 @@ const hermioneAllureReporter = (hermione: Hermione, opts: AllureReportOptions) =
 
     currentTest.name = test.title;
     currentTest.fullName = test.fullTitle();
-    currentTest.historyId = md5(test.fullTitle());
     currentTest.stage = Stage.RUNNING;
 
     currentTest.addLabel(LabelName.HOST, hostnameLabel);
@@ -341,6 +340,8 @@ const hermioneAllureReporter = (hermione: Hermione, opts: AllureReportOptions) =
       handleTestError(test, test.err);
     }
 
+    currentTest.calculateTestCaseId();
+    currentTest.calculateHistoryId();
     currentTest.stage = Stage.FINISHED;
     currentTest.endTest(Date.now());
     loadedTests.delete(testId());

diff --git a/packages/allure-js-commons/src/AllureTest.ts b/packages/allure-js-commons/src/AllureTest.ts
@@ -51,22 +51,38 @@ export class AllureTest extends ExecutableItemWrapper {
     this.addLink(url, name, LinkType.TMS);
   }
 
+  calculateTestCaseId(): void {
+    if (!this.testResult.fullName) {
+      return;
+    }
+
+    const paramsString = this.testResult.parameters
+      .filter((p) => !p?.excluded)
+      .sort((a, b) => a.name?.localeCompare(b?.name) || a.value?.localeCompare(b?.value))
+      .map((p) => p.name)
+      .join(",");
+
+    this.testCaseId = md5(`${this.testResult.fullName}:${paramsString}`);
+  }
+
   calculateHistoryId(): void {
     const tcId = this.testResult.testCaseId
       ? this.testResult.testCaseId
       : this.testResult.fullName
       ? md5(this.testResult.fullName)
       : null;
 
-    if (tcId) {
-      const paramsString = this.testResult.parameters
-        .filter((p) => !p?.excluded)
-        .sort((a, b) => a.name?.localeCompare(b?.name) || a.value?.localeCompare(b?.value))
-        .map((p) => `${p.name ?? "null"}:${p.value ?? "null"}`)
-        .join(",");
-
-      const paramsHash = md5(paramsString);
-      this.historyId = `${tcId}:${paramsHash}`;
+    if (!tcId) {
+      return;
     }
+
+    const paramsString = this.testResult.parameters
+      .filter((p) => !p?.excluded)
+      .sort((a, b) => a.name?.localeCompare(b?.name) || a.value?.localeCompare(b?.value))
+      .map((p) => `${p.name ?? "null"}:${p.value ?? "null"}`)
+      .join(",");
+    const paramsHash = md5(paramsString);
+
+    this.historyId = `${tcId}:${paramsHash}`;
   }
 }