@allurereport/reader 3.0.0-beta.7 → 3.0.0-beta.9

package/dist/allure2/index.js

@@ -18,7 +18,7 @@ const xmlParser = new XMLParser({
 const readerId = "allure2";
 export const allure2 = {
     read: async (visitor, data) => {
-        if (data.getOriginalFileName().match(/.*-attachment(\..+)?/)) {
+        if (data.getOriginalFileName().match(/-attachment(?:\..+)?/)) {
             await visitor.visitAttachmentFile(data, { readerId });
             return true;
         }

package/dist/junitxml/index.js

@@ -1,7 +1,17 @@
+import { BufferResultFile } from "@allurereport/reader-api";
 import { XMLParser } from "fast-xml-parser";
 import * as console from "node:console";
+import { randomUUID } from "node:crypto";
 import { ensureString } from "../utils.js";
 import { isEmptyElement, isStringAnyRecord, isStringAnyRecordArray } from "../xml-utils.js";
+const MS_IN_S = 1000;
+const DEFAULT_TEST_NAME = "The test's name is not defined";
+const STDOUT_ATTACHMENT_NAME = "System output";
+const STDERR_ATTACHMENT_NAME = "System error";
+const SUITE_PACKAGE_NAME = "package";
+const SUITE_PARENT_LABEL_NAME = "parentSuite";
+const SUITE_LABEL_NAME = "suite";
+const TEST_CLASS_LABEL_NAME = "testClass";
 const arrayTags = new Set(["testsuite.testcase", "testsuites.testsuite", "testsuites.testsuite.testcase"]);
 const xmlParser = new XMLParser({
     parseTagValue: false,
@@ -56,49 +66,93 @@ const parseRootElement = async (visitor, xml) => {
             return false;
         }
         for (const testSuitesArrayElement of testSuitesArray) {
-            await parseTestSuite(visitor, testSuitesArrayElement);
+            await parseTestSuite(visitor, testSuitesArrayElement, true);
         }
         return true;
     }
     if (!isStringAnyRecord(testSuite)) {
         return false;
     }
-    await parseTestSuite(visitor, testSuite);
+    await parseTestSuite(visitor, testSuite, false);
     return true;
 };
-const parseTestSuite = async (visitor, testSuite) => {
-    const { name, testcase } = testSuite;
+const parseTestSuite = async (visitor, testSuite, isAggregated) => {
+    const { name, package: packageAttribute, testcase } = testSuite;
     if (!isStringAnyRecordArray(testcase)) {
         return;
     }
     for (const testcaseElement of testcase) {
-        await parseTestCase(visitor, { name: ensureString(name) }, testcaseElement);
+        await parseTestCase(visitor, { name: ensureString(name), suitePackage: ensureString(packageAttribute) }, testcaseElement, isAggregated);
     }
 };
-const parseTestCase = async (visitor, suite, testCase) => {
-    const { name, failure, skipped } = testCase;
-    const { status, message, trace } = getStatus(failure, skipped);
+const parseTestCase = async (visitor, { name: suiteName, suitePackage }, testCase, isAggregated) => {
+    const { "name": nameAttribute, failure, error, skipped, "classname": classNameAttribute, time, "system-out": systemOutAttribute, "system-err": systemErrAttribute, } = testCase;
+    const name = ensureString(nameAttribute);
+    const className = ensureString(classNameAttribute);
+    const systemOut = ensureString(systemOutAttribute);
+    const systemErr = ensureString(systemErrAttribute);
+    const { status, message, trace } = getStatus(failure, error, skipped);
     await visitor.visitTestResult({
-        name: ensureString(name),
+        name: name ?? DEFAULT_TEST_NAME,
+        fullName: convertFullName(className, name),
+        duration: convertDuration(time),
         status,
         message,
         trace,
+        steps: await parseAttachments(visitor, systemOut, systemErr),
+        labels: convertLabels({ suitePackage, suiteName, className, isAggregated }),
     }, { readerId });
 };
-const getStatus = (failure, skipped) => {
-    if (isEmptyElement(failure)) {
-        return { status: "failed" };
+const convertFullName = (className, name) => (className && name ? `${className}.${name}` : undefined);
+const parseAttachments = async (visitor, systemOut, systemErr) => {
+    const attachments = [];
+    if (systemOut) {
+        attachments.push(await visitPlainTextAttachment(visitor, STDOUT_ATTACHMENT_NAME, systemOut));
     }
-    if (isStringAnyRecord(failure)) {
-        const { message, "#text": trace } = failure;
-        return { status: "failed", message: ensureString(message), trace: ensureString(trace) };
+    if (systemErr) {
+        attachments.push(await visitPlainTextAttachment(visitor, STDERR_ATTACHMENT_NAME, systemErr));
     }
-    if (isEmptyElement(skipped)) {
-        return { status: "skipped" };
+    return attachments;
+};
+const visitPlainTextAttachment = async (visitor, name, content) => {
+    const fileName = randomUUID();
+    await visitor.visitAttachmentFile(new BufferResultFile(Buffer.from(content), fileName), { readerId });
+    return {
+        type: "attachment",
+        contentType: "text/plain",
+        originalFileName: fileName,
+        name,
+    };
+};
+const convertLabels = ({ suitePackage, suiteName, className, isAggregated, }) => {
+    const labels = [];
+    if (suitePackage) {
+        labels.push({ name: SUITE_PACKAGE_NAME, value: suitePackage });
+        if (isAggregated) {
+            labels.push({ name: SUITE_PARENT_LABEL_NAME, value: suitePackage });
+        }
+    }
+    if (suiteName) {
+        labels.push({ name: SUITE_LABEL_NAME, value: suiteName });
+    }
+    if (className) {
+        labels.push({ name: TEST_CLASS_LABEL_NAME, value: className });
+    }
+    return labels;
+};
+const convertDuration = (timeAttribute) => {
+    const time = ensureString(timeAttribute);
+    return time ? Math.round(parseFloat(time) * MS_IN_S) : undefined;
+};
+const getStatus = (failure, error, skipped) => maybeParseStatus("failed", failure) ??
+    maybeParseStatus("broken", error) ??
+    maybeParseStatus("skipped", skipped) ?? { status: "passed" };
+const maybeParseStatus = (status, element) => {
+    if (isEmptyElement(element)) {
+        return { status };
     }
-    if (isStringAnyRecord(skipped)) {
-        const { message, "#text": trace } = skipped;
-        return { status: "skipped", message: ensureString(message), trace: ensureString(trace) };
+    if (isStringAnyRecord(element)) {
+        const { message, "#text": trace } = element;
+        return { status, message: ensureString(message), trace: ensureString(trace) };
     }
-    return { status: "passed" };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/reader",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.9",
   "description": "Collection of utilities which helps to process different kind of test results as Allure Results",
   "keywords": [
     "allure",
@@ -26,9 +26,9 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.7",
-    "@allurereport/plugin-api": "3.0.0-beta.7",
-    "@allurereport/reader-api": "3.0.0-beta.7",
+    "@allurereport/core-api": "3.0.0-beta.9",
+    "@allurereport/plugin-api": "3.0.0-beta.9",
+    "@allurereport/reader-api": "3.0.0-beta.9",
     "fast-xml-parser": "^4.5.0"
   },
   "devDependencies": {
@@ -38,8 +38,8 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/runner": "^2.1.8",
-    "allure-js-commons": "^3.0.7",
-    "allure-vitest": "^3.0.7",
+    "allure-js-commons": "^3.0.9",
+    "allure-vitest": "^3.0.9",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",