Merge pull request #260 from Microsoft/users/nigurr/FixTestPublishWithInvalidXML

Fixed issue while publishing test reports if one of the file is invalid xml file

Author: Nitin Gurram

src/agent/testrunpublisher.ts

@@ -273,32 +273,33 @@ export class TestRunPublisher {
         var totalTestResults: testifm.TestResultCreateModel[] = [];
         var j = 0;
 
-        if (resultFiles.length == 0) {
+        if (!resultFiles || resultFiles.length == 0) {
             defer.resolve(null);
         }
 
-        for (var i = 0; i < resultFiles.length; i++) {
-            var report = _this.readResults(resultFiles[i]).then(function(res) {
-                res.testResults.forEach(tr => {
-                    totalTestCaseDuration += +tr.durationInMs;
+        var promises = resultFiles.map(function(file) {
+            return _this.readResults(file)
+                .then(function(res) {
+                    res.testResults.forEach(tr => {
+                        totalTestCaseDuration += +tr.durationInMs;
+                    });
+                    totalTestResults = totalTestResults.concat(res.testResults);
                 });
-                totalTestResults = totalTestResults.concat(res.testResults);
-
-                //This little hack make sures that we are returning once reading of all files is completed in async.
-                j++;
-                if (j == resultFiles.length) {
-                    var testRunDetails = <testifm.TestRunDetails>{
-                        totalTestResults: totalTestResults,
-                        totalTestCaseDuration: totalTestCaseDuration
-                    };
-                    defer.resolve(testRunDetails);
-                    return defer.promise;
-                }
-            });
-        }
+        });
 
+        Q.all(promises).finally(function() {
+            var testRunDetails = _this.createTestRunDetails(totalTestResults, totalTestCaseDuration);
+            defer.resolve(testRunDetails);
+        });
         return defer.promise;
     }
+
+    private createTestRunDetails(totalTestResults: testifm.TestResultCreateModel[], totalTestCaseDuration: number) {
+        return <testifm.TestRunDetails>{
+            totalTestResults: totalTestResults,
+            totalTestCaseDuration: totalTestCaseDuration
+        };
+    }
 }
 
 //-----------------------------------------------------

src/test/publishertests.ts

@@ -33,6 +33,7 @@ describe('PublisherTests', function () {
     const readerJUnit = new trr.JUnitResultReader(command);
     const readerNUnit = new trr.NUnitResultReader(command);
     const readerXUnit = new trr.XUnitResultReader(command);
+    const emptyFile = resultFile('empty.xml');
     const resultsFileJUnit = resultFile('junitresults1.xml');
     const resultsFileJUnit2 = resultFile('junitresults2.xml');
     const resultstFileJUnitMultiNode = resultFile('Junit_test2.xml');
@@ -317,4 +318,13 @@ describe('PublisherTests', function () {
             assert(feedbackChannel.jobsCompletedSuccessfully(), 'ResultPublish Task Failed! Details : ' + feedbackChannel.getRecordsString());
         });
     })
+    
+    it('results.publish : JUnit results file with merge support with one invalid xml file', () => {
+        const feedbackChannel = new fm.TestFeedbackChannel();
+        const testRunPublisher = new trp.TestRunPublisher(feedbackChannel, null, "teamProject", runContext, readerXUnit);
+
+        return testRunPublisher.publishMergedTestRun([resultsFileJUnit, resultsFileJUnit2, emptyFile]).then(createdTestRun => {
+            assert(feedbackChannel.jobsCompletedSuccessfully(), 'ResultPublish Task Failed! Details : ' + feedbackChannel.getRecordsString());
+        });
+    })
 });	

src/test/testresults/empty.xml

@@ -0,0 +1 @@
+