@reporters/junit 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.0.4](https://github.com/MoLow/reporters/compare/junit-v1.0.3...junit-v1.0.4) (2023-04-03)
+
+
+### Bug Fixes
+
+* allow multiple roots ([590df94](https://github.com/MoLow/reporters/commit/590df948f8a4626fc29e8ce185e08d2226a307ba))
+
+## [1.0.3](https://github.com/MoLow/reporters/compare/junit-v1.0.2...junit-v1.0.3) (2023-03-12)
+
+
+### Bug Fixes
+
+* **junit:** support more usecases ([72359c3](https://github.com/MoLow/reporters/commit/72359c3983334d7712c4d404a0ae297b9ef9e859))
+
 ## [1.0.2](https://github.com/MoLow/reporters/compare/junit-v1.0.1...junit-v1.0.2) (2022-12-25)
 
 

package/README.md

@@ -1,4 +1,5 @@
-[![npm version](https://img.shields.io/npm/v/@reporters/github)](https://www.npmjs.com/package/@reporters/github) ![tests](https://github.com/MoLow/reporters/actions/workflows/test.yaml/badge.svg?branch=main)
+[![npm version](https://img.shields.io/npm/v/@reporters/junit)](https://www.npmjs.com/package/@reporters/junit) ![tests](https://github.com/MoLow/reporters/actions/workflows/test.yaml/badge.svg?branch=main) [![codecov](https://codecov.io/gh/MoLow/reporters/branch/main/graph/badge.svg?token=0LFVC8SCQV)](https://codecov.io/gh/MoLow/reporters)
+
 # Junit Reporter
 A Junit reporter for `node:test`.
 intendend for use with major CI tools like Jenkins, CircleCI, etc that consume Junit reports.

package/index.js

@@ -1,4 +1,3 @@
-const assert = require('node:assert');
 const util = require('node:util');
 const { hostname } = require('node:os');
 
@@ -14,7 +13,7 @@ function escapeContent(s = '') {
 
 function treeToXML(tree) {
   if (typeof tree === 'string') {
-    return escapeContent(tree);
+    return `${escapeContent(tree)}\n`;
   }
   const {
     tag, props, nesting, children,
@@ -22,12 +21,12 @@ function treeToXML(tree) {
   const propsString = Object.entries(props)
     .map(([key, value]) => `${key}="${escapeProperty(String(value))}"`)
     .join(' ');
-  const indent = '  '.repeat(nesting + 1);
-  const newLine = children?.length ? '\n' : '';
-  const postIndent = newLine ? indent : '';
-  const postNewLine = newLine ? '' : '\n';
-  const childrenString = `${newLine}${(children ?? []).map(treeToXML).join('')}${newLine}${postIndent}`;
-  return `${indent}<${tag} ${propsString}>${childrenString}</${tag}>${postNewLine}`;
+  const indent = '\t'.repeat(nesting + 1);
+  if (!children?.length) {
+    return `${indent}<${tag} ${propsString}/>\n`;
+  }
+  const childrenString = `${(children ?? []).map(treeToXML).join('')}`;
+  return `${indent}<${tag} ${propsString}>\n${childrenString}${indent}</${tag}>\n`;
 }
 
 function isFailure(node) {
@@ -42,27 +41,42 @@ module.exports = async function* junitReporter(source) {
   yield '<?xml version="1.0" encoding="utf-8"?>\n';
   yield '<testsuites>\n';
   let currentSuite = null;
+  const roots = [];
+
+  function startTest(event) {
+    const originalSuite = currentSuite;
+    currentSuite = {
+      props: { name: event.data.name },
+      nesting: event.data.nesting,
+      parent: currentSuite,
+      children: [],
+    };
+    originalSuite?.children.push(currentSuite);
+    if (!currentSuite.parent) {
+      roots.push(currentSuite);
+    }
+  }
+
   for await (const event of source) {
     switch (event.type) {
       case 'test:start': {
-        const originalSuite = currentSuite;
-        currentSuite = {
-          props: { name: event.data.name },
-          nesting: event.data.nesting,
-          parent: currentSuite,
-          children: [],
-        };
-        originalSuite?.children.push(currentSuite);
+        startTest(event);
         break;
       }
       case 'test:pass':
       case 'test:fail': {
+        if (!currentSuite) {
+          startTest({ data: { name: 'root', nesting: 0 } });
+        }
+        if (currentSuite.props.name !== event.data.name
+          || currentSuite.nesting !== event.data.nesting) {
+          startTest(event);
+        }
         const currentTest = currentSuite;
-        if (currentSuite?.nesting === event.data.nesting && currentSuite?.parent) {
+        if (currentSuite?.nesting === event.data.nesting) {
           currentSuite = currentSuite.parent;
         }
-        assert.strictEqual(currentTest.props.name, event.data.name);
-        currentTest.props.time = (event.data.details.duration_ms / 1000).toFixed(5);
+        currentTest.props.time = (event.data.details.duration_ms / 1000).toFixed(6);
         if (currentTest.children.length > 0) {
           currentTest.tag = 'testsuite';
           currentTest.props.disabled = 0;
@@ -73,19 +87,19 @@ module.exports = async function* junitReporter(source) {
           currentTest.props.hostname = HOSTNAME;
         } else {
           currentTest.tag = 'testcase';
-          currentTest.props.classname = 'test';
+          currentTest.props.classname = event.data.classname ?? 'test';
           if (event.data.skip) {
-            currentTest.children.push({ nesting: event.data.nesting + 1, tag: 'skipped', props: { message: event.data.skip } });
+            currentTest.children.push({ nesting: event.data.nesting + 1, tag: 'skipped', props: { type: 'skipped', message: event.data.skip } });
           }
           if (event.data.todo) {
-            currentTest.children.push({ nesting: event.data.nesting + 1, tag: 'skipped', props: { message: event.data.todo } });
+            currentTest.children.push({ nesting: event.data.nesting + 1, tag: 'skipped', props: { type: 'todo', message: event.data.todo } });
           }
           if (event.type === 'test:fail') {
             const error = event.data.details?.error;
             currentTest.children.push({
               nesting: event.data.nesting + 1,
               tag: 'failure',
-              props: { message: error?.message ?? '', type: error.failureType || error.code },
+              props: { type: error?.failureType || error?.code, message: error?.message ?? '' },
               children: [util.inspect(
                 event.data.details?.error,
                 { colors: false, breakLength: Infinity },
@@ -103,6 +117,8 @@ module.exports = async function* junitReporter(source) {
         break;
     }
   }
-  yield treeToXML(currentSuite);
-  yield '\n</testsuites>\n';
+  for (const suite of roots) {
+    yield treeToXML(suite);
+  }
+  yield '</testsuites>\n';
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reporters/junit",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A jUnit reporter for `node:test`",
   "keywords": [
     "junit",
@@ -10,7 +10,7 @@
     "reporters"
   ],
   "scripts": {
-    "test": "../../prebuilt --test"
+    "test": "node --test-reporter=spec --test-reporter-destination=stdout --test-reporter=../github/index.js --test-reporter-destination=stdout --test"
   },
   "bugs": {
     "url": "https://github.com/MoLow/reporters/issues"

package/tests/index.test.js

@@ -1,7 +1,8 @@
 const { spawnSync } = require('child_process');
 const assert = require('assert');
 const { compareLines } = require('../../../tests/utils');
-const output = require('./output');
+// eslint-disable-next-line import/no-dynamic-require
+const output = require(`./output.${process.version.split('.')[0]}`);
 
 const child = spawnSync(process.execPath, ['--test-reporter', './index.js', '../../tests/example']);
 

package/tests/output.v18.js

@@ -0,0 +1,29 @@
+module.exports = {
+  stdout: `<\\?xml version="1.0" encoding="utf-8"\\?>
+<testsuites>
+\t<testsuite name="tests" time=".*" disabled="0" errors="0" tests="3" failures="1" skipped="0" hostname=".*">
+\t\t<testcase name="is ok" time=".*" classname="test"/>
+\t\t<testcase name="fails" time=".*" classname="test" failure="this is an error">
+\t\t\t<failure type="testCodeFailure" message="this is an error">
+\\[Error \\[ERR_TEST_FAILURE\\]: this is an error\\] {
+  failureType: 'testCodeFailure',
+  cause: Error: this is an error
+      at Object.&lt;anonymous&gt; (.*)
+      .*
+      .*
+      .*
+      .*
+      .*
+      .*
+  code: 'ERR_TEST_FAILURE'
+}
+\t\t\t</failure>
+\t\t</testcase>
+\t\t<testcase name="is a diagnostic" time=".*" classname="test"/>
+\t</testsuite>
+\t<testsuite name="more tests" time=".*" disabled="0" errors="0" tests="1" failures="0" skipped="0" hostname=".*">
+\t\t<testcase name="is ok" time=".*" classname="test"/>
+\t</testsuite>
+</testsuites>
+`,
+};

package/tests/output.v19.js

@@ -0,0 +1,31 @@
+module.exports = {
+  stdout: `<\\?xml version="1.0" encoding="utf-8"\\?>
+<testsuites>
+\t<testsuite name="tests" time=".*" disabled="0" errors="0" tests="3" failures="1" skipped="0" hostname=".*">
+\t\t<testcase name="is ok" time=".*" classname="test"/>
+\t\t<testcase name="fails" time=".*" classname="test" failure="this is an error">
+\t\t\t<failure type="testCodeFailure" message="this is an error">
+\\[Error \\[ERR_TEST_FAILURE\\]: this is an error\\] {
+  failureType: 'testCodeFailure',
+  cause: Error: this is an error
+      .*
+      .*
+      .*
+      .*
+      .*
+      .*
+      .*
+      .*
+      .*
+  code: 'ERR_TEST_FAILURE'
+}
+\t\t\t</failure>
+\t\t</testcase>
+\t\t<testcase name="is a diagnostic" time=".*" classname="test"/>
+\t</testsuite>
+\t<testsuite name="more tests" time=".*" disabled="0" errors="0" tests="1" failures="0" skipped="0" hostname=".*">
+\t\t<testcase name="is ok" time=".*" classname="test"/>
+\t</testsuite>
+</testsuites>
+`,
+};

package/tests/output.js

@@ -1,26 +0,0 @@
-module.exports = {
-  stdout: `<\\?xml version="1.0" encoding="utf-8"\\?>
-<testsuites>
-  <testsuite name="tests" time=".*" disabled="0" errors="0" tests="2" failures="1" skipped="0" hostname=".*">
-    <testcase name="is ok" time=".*" classname="test"></testcase>
-    <testcase name="fails" time=".*" classname="test" failure="this is an error">
-      <failure message="this is an error" type="testCodeFailure">
-\\[Error \\[ERR_TEST_FAILURE\\]: this is an error\\] {
-  failureType: 'testCodeFailure',
-  cause: Error: this is an error
-      at Object.&lt;anonymous&gt; (.*)
-      .*
-      .*
-      .*
-      .*
-      .*
-      .*
-      .*
-  code: 'ERR_TEST_FAILURE'
-}
-      </failure>
-    </testcase>
-  </testsuite>
-</testsuites>
-`,
-};