ARCH-0000 - Update xmlparser calls to match new version

im-open · Jul 11, 2023 · 0fce1c0 · 0fce1c0
1 parent a52a5f2
commit 0fce1c0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/dist/cleanup.js b/dist/cleanup.js
@@ -10338,9 +10338,10 @@ var require_utils2 = __commonJS({
     var core2 = require_core();
     var fs = require('fs');
     var glob = require_glob();
-    var xmlParser = require_fxp();
+    var { XMLParser, XMLValidator } = require_fxp();
     var he = require_he();
     var path = require('path');
+    var xmlParser = new XMLParser();
     function findTrxFiles(baseDir) {
       core2.info(`Looking for trx files in '${baseDir}'...`);
       const files = glob.sync(baseDir + '/**/*.trx', {});
@@ -10382,7 +10383,7 @@ var require_utils2 = __commonJS({
         tagValueProcessor: (val2, _tagName) => he.decode(val2),
         stopNodes: ['parse-me-as-string']
       };
-      if (xmlParser.validate(xmlData.toString()) === true) {
+      if (XMLValidator.validate(xmlData.toString()) === true) {
         const parsedTrx = xmlParser.parse(xmlData, options, true);
         const runInfos = parsedTrx.TestRun.ResultSummary.RunInfos;
         if (runInfos && runInfos.RunInfo._outcome === 'Failed') {
@@ -10450,7 +10451,15 @@ var require_utils2 = __commonJS({
           reportTitle = unitTestNames.length > 0 ? unitTestNames[unitTestNames.indexOf(reportTitleFilter) + 1] : null;
         }
         if (!reportTitle) {
-          const storage = unitTests.length > 0 ? unitTests[0]._storage : 'NOT FOUND';
+          const storage = unitTests.length > 0 && unitTests[0]._storage ? unitTests[0]._storage : 'NOT FOUND';
+          console.log('');
+          console.log('');
+          console.log('Storage:');
+          console.log(storage);
+          console.log('');
+          console.log('');
+          console.log('Storage:');
+          console.log(JSON.stringify(unitTests[0]));
           const dllName = storage.replace(/\\/g, '/').replace('.dll', '').toUpperCase().split('/').pop();
           if (dllName) {
             reportTitle = dllName;

diff --git a/dist/index.js b/dist/index.js
@@ -10338,9 +10338,10 @@ var require_utils2 = __commonJS({
     var core2 = require_core();
     var fs = require('fs');
     var glob = require_glob();
-    var xmlParser = require_fxp();
+    var { XMLParser, XMLValidator } = require_fxp();
     var he = require_he();
     var path = require('path');
+    var xmlParser = new XMLParser();
     function findTrxFiles2(baseDir2) {
       core2.info(`Looking for trx files in '${baseDir2}'...`);
       const files = glob.sync(baseDir2 + '/**/*.trx', {});
@@ -10382,7 +10383,7 @@ var require_utils2 = __commonJS({
         tagValueProcessor: (val2, _tagName) => he.decode(val2),
         stopNodes: ['parse-me-as-string']
       };
-      if (xmlParser.validate(xmlData.toString()) === true) {
+      if (XMLValidator.validate(xmlData.toString()) === true) {
         const parsedTrx = xmlParser.parse(xmlData, options, true);
         const runInfos = parsedTrx.TestRun.ResultSummary.RunInfos;
         if (runInfos && runInfos.RunInfo._outcome === 'Failed') {
@@ -10450,7 +10451,15 @@ var require_utils2 = __commonJS({
           reportTitle = unitTestNames.length > 0 ? unitTestNames[unitTestNames.indexOf(reportTitleFilter) + 1] : null;
         }
         if (!reportTitle) {
-          const storage = unitTests.length > 0 ? unitTests[0]._storage : 'NOT FOUND';
+          const storage = unitTests.length > 0 && unitTests[0]._storage ? unitTests[0]._storage : 'NOT FOUND';
+          console.log('');
+          console.log('');
+          console.log('Storage:');
+          console.log(storage);
+          console.log('');
+          console.log('');
+          console.log('Storage:');
+          console.log(JSON.stringify(unitTests[0]));
           const dllName = storage.replace(/\\/g, '/').replace('.dll', '').toUpperCase().split('/').pop();
           if (dllName) {
             reportTitle = dllName;

diff --git a/src/utils.js b/src/utils.js
@@ -1,10 +1,12 @@
 const core = require('@actions/core');
 const fs = require('fs');
 const glob = require('glob');
-const xmlParser = require('fast-xml-parser');
+const { XMLParser, XMLValidator } = require('fast-xml-parser');
 const he = require('he');
 const path = require('path');
 
+const xmlParser = new XMLParser();
+
 function findTrxFiles(baseDir) {
   core.info(`Looking for trx files in '${baseDir}'...`);
 
@@ -55,7 +57,7 @@ async function transformTrxToJson(filePath) {
     stopNodes: ['parse-me-as-string']
   };
 
-  if (xmlParser.validate(xmlData.toString()) === true) {
+  if (XMLValidator.validate(xmlData.toString()) === true) {
     const parsedTrx = xmlParser.parse(xmlData, options, true);
     const runInfos = parsedTrx.TestRun.ResultSummary.RunInfos;
     if (runInfos && runInfos.RunInfo._outcome === 'Failed') {
@@ -132,7 +134,17 @@ function getReportTitle(data, isEmpty) {
     }
 
     if (!reportTitle) {
-      const storage = unitTests.length > 0 ? unitTests[0]._storage : 'NOT FOUND';
+      const storage = unitTests.length > 0 && unitTests[0]._storage ? unitTests[0]._storage : 'NOT FOUND';
+      console.log('');
+      console.log('');
+      console.log('Storage:');
+      console.log(storage);
+
+      console.log('');
+      console.log('');
+      console.log('Storage:');
+      console.log(JSON.stringify(unitTests[0]));
+
       const dllName = storage.replace(/\\/g, '/').replace('.dll', '').toUpperCase().split('/').pop();
       if (dllName) {
         reportTitle = dllName;