fix regression microsoft#127 (microsoft#128)

ansyral · web-flow · commit f161ba2b05ce · 2018-02-12T17:02:00.000+08:00
Signed-off-by: xuzho &lt;xuzho@microsoft.com&gt;
diff --git a/extension/src/Runner/JUnitTestRunner/junitRunnerResultAnalyzer.ts b/extension/src/Runner/JUnitTestRunner/junitRunnerResultAnalyzer.ts
@@ -37,14 +37,11 @@ export class JUnitRunnerResultAnalyzer extends JarFileRunnerResultAnalyzer {
         const result: ITestResult[] = [];
         this._tests.forEach((t) => {
             if (t.level === TestLevel.Class) {
-                toAggregate.add(t);
                 t.children.forEach((c) => this.processMethod(c, result));
             } else {
-                toAggregate.add(t.parent);
                 this.processMethod(t, result);
             }
         });
-        toAggregate.forEach((t) => this.processClass(t, result));
         return result;
     }
 
@@ -85,44 +82,6 @@ export class JUnitRunnerResultAnalyzer extends JarFileRunnerResultAnalyzer {
         }
     }
 
-    private processClass(t: ITestInfo, result: ITestResult[]): void {
-        let passNum: number = 0;
-        let failNum: number = 0;
-        let skipNum: number = 0;
-        let duration: number = 0;
-        let notRun: boolean = false;
-        for (const child of t.children) {
-            if (!this._testResults.has(child.test)) {
-                notRun = true;
-                continue;
-            }
-            const childResult: TestResult = this._testResults.get(child.test);
-            duration += Number(childResult.duration);
-            switch (childResult.status) {
-                case TestStatus.Pass:
-                    passNum++;
-                    break;
-                case TestStatus.Fail:
-                    failNum++;
-                    break;
-                case TestStatus.Skipped:
-                    skipNum++;
-                    break;
-            }
-        }
-
-        const classResult: TestResult = {
-            status: notRun ? undefined : (skipNum === t.children.length ? TestStatus.Skipped : (failNum > 0 ? TestStatus.Fail : TestStatus.Pass)),
-            summary: `Tests run: ${passNum + failNum}, Failures: ${failNum}, Skipped: ${skipNum}.`,
-            duration: notRun ? undefined : duration.toString(),
-        };
-        result.push({
-            test: t.test,
-            uri: t.uri,
-            result: classResult,
-        });
-    }
-
     private processMethod(t: ITestInfo, result: ITestResult[]): void {
         if (!this._testResults.has(t.test)) {
             this._testResults.set(t.test, {
diff --git a/extension/src/Runner/testRunnerWrapper.ts b/extension/src/Runner/testRunnerWrapper.ts
@@ -3,7 +3,7 @@
 
 import { ClassPathManager } from "../classPathManager";
 import { TestStatusBarProvider } from "../testStatusBarProvider";
-import { TestKind, TestResult, TestSuite } from "../Models/protocols";
+import { TestKind, TestLevel, TestResult, TestStatus, TestSuite } from "../Models/protocols";
 import * as Logger from "../Utils/Logger/logger";
 import { ITestRunner } from "./testRunner";
 import { ITestRunnerParameters } from "./testRunnerParameters";
@@ -59,13 +59,49 @@ export class TestRunnerWrapper {
             total.set(cur.test, cur.result);
             return total;
         }, new Map<string, TestResult>());
+        const classesInflucenced = [];
         const flattenedTests = new Set(tests.map((t) => [t, t.parent, ...(t.children || [])])
                                     .reduce((total, cur) => total.concat(cur), [])
                                     .filter((t) => t));
         flattenedTests.forEach((t) => {
             if (mapper.has(t.test)) {
                 t.result = mapper.get(t.test);
+            } else if (t.level === TestLevel.Class) {
+                classesInflucenced.push(t);
             }
         });
+        classesInflucenced.forEach((c) => this.processClass(c));
+    }
+
+    private static processClass(t: TestSuite): void {
+        let passNum: number = 0;
+        let failNum: number = 0;
+        let skipNum: number = 0;
+        let duration: number = 0;
+        let notRun: boolean = false;
+        for (const child of t.children) {
+            if (!child.result) {
+                notRun = true;
+                continue;
+            }
+            duration += Number(child.result.duration);
+            switch (child.result.status) {
+                case TestStatus.Pass:
+                    passNum++;
+                    break;
+                case TestStatus.Fail:
+                    failNum++;
+                    break;
+                case TestStatus.Skipped:
+                    skipNum++;
+                    break;
+            }
+        }
+
+        t.result = {
+            status: notRun ? undefined : (skipNum === t.children.length ? TestStatus.Skipped : (failNum > 0 ? TestStatus.Fail : TestStatus.Pass)),
+            summary: `Tests run: ${passNum + failNum}, Failures: ${failNum}, Skipped: ${skipNum}.`,
+            duration: notRun ? undefined : duration.toString(),
+        };
     }
 }
