updating code

agracio · Dec 30, 2024 · 6bf2582 · 6bf2582
1 parent 9c34013
commit 6bf2582
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/junit.js b/src/junit.js
@@ -308,7 +308,7 @@ function parseTestSuites(options, testSuites, totalSuitTime, avgSuitTime){
 
         suites.push({
             "uuid": parentUUID,
-            "title": suite.name,
+            "title": suite.name.replaceAll('Root Suite.', ''),
             "fullFile": suite.file,
             "file": suiteFile ?? '',
             "beforeHooks": [],
@@ -352,7 +352,12 @@ async function convert(options, suitesRoot){
     let duration =
         suitesRoot.time
             ? Number(suitesRoot.time)
-            : _.sumBy(testSuites, suite => _.sumBy(suite.testcase, function(testCase) { return Number(testCase.time); }));
+            : _.sumBy(testSuites,function(suite) { return Number(suite.time); });
+
+    if(duration === 0){
+        duration = _.sumBy(testSuites, suite => _.sumBy(suite.testcase, function(testCase) { return Number(testCase.time); }));
+
+    }
 
     let tests = suitesRoot.tests
         ? Number(suitesRoot.tests)
@@ -368,10 +373,6 @@ async function convert(options, suitesRoot){
 
     let name = suitesRoot.name;
 
-    // if(!name && suitesRoot.testsuite.length === 1){
-    //     name = suitesRoot.testsuite[0].name;
-    // }
-
     results.push(
         {
             "uuid": crypto.randomUUID(),

diff --git a/tests/common.js b/tests/common.js
@@ -26,29 +26,21 @@ function createOptions(file, type){
     }
 }
 
-
 /**
  * @param {TestReportConverterOptions} options
  * @param {string?} reportFilename
  * @param {Boolean?} compareJunit
  */
 function compare(options, reportFilename, compareJunit){
 
-    //createCompareFiles(options, reportFilename, compareJunit);
-
-    let createdReport = fs.readFileSync(path.join(outDir, reportFilename ?? options.reportFilename), 'utf8');
-    createdReport = JSON.parse( JSON.stringify( createdReport ) )
-
-    let report = fs.readFileSync(path.join(reportDir, reportFilename ?? options.reportFilename), 'utf8');
-    report = JSON.parse( JSON.stringify( report ) )
+    let createdReport = fs.readFileSync(path.join(outDir, reportFilename ?? options.reportFilename), 'utf8').replaceAll('\r', '');
+    let report = fs.readFileSync(path.join(reportDir, reportFilename ?? options.reportFilename), 'utf8').replaceAll('\r', '') ;
 
     expect(createdReport.replaceAll(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/g,'')).toBe(report.replaceAll(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/g,''));
 
     if(compareJunit){
-        let junitCreatedReport = fs.readFileSync(path.join(outDir, options.junitReportFilename), 'utf8');
-        junitCreatedReport = JSON.parse( JSON.stringify( junitCreatedReport ) )
-        let junitReport = fs.readFileSync(path.join(reportDir, options.junitReportFilename), 'utf8');
-        junitReport = JSON.parse( JSON.stringify( junitReport ) )
+        let junitCreatedReport = fs.readFileSync(path.join(outDir, options.junitReportFilename), 'utf8').replaceAll('\r', '');
+        let junitReport = fs.readFileSync(path.join(reportDir, options.junitReportFilename), 'utf8').replaceAll('\r', '');
 
         expect(junitCreatedReport).toBe(junitReport);
     }