Perform all validation checks in the background - Added tests

microsoft · Jan 21, 2019 · c3933f6 · c3933f6
1 parent d663af2
commit c3933f6
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 4 deletions.
diff --git a/src/client/application/diagnostics/applicationDiagnostics.ts b/src/client/application/diagnostics/applicationDiagnostics.ts
@@ -43,7 +43,7 @@ export class ApplicationDiagnostics implements IApplicationDiagnostics {
                 .then(diagnostics => {
                     if (diagnostics.length > 0 && diagnostics[0].runInBackground) {
                         this.log(diagnostics);
-                        diagnosticsService.handle(diagnostics);
+                        diagnosticsService.handle(diagnostics).ignoreErrors();
                     } else {
                         return;
                     }

diff --git a/src/test/application/diagnostics/applicationDiagnostics.unit.test.ts b/src/test/application/diagnostics/applicationDiagnostics.unit.test.ts
@@ -16,7 +16,7 @@ import { ILogger, IOutputChannel } from '../../../client/common/types';
 import { IServiceContainer } from '../../../client/ioc/types';
 
 // tslint:disable-next-line:max-func-body-length
-suite('xApplication Diagnostics - ApplicationDiagnostics', () => {
+suite('Application Diagnostics - ApplicationDiagnostics', () => {
     let serviceContainer: typemoq.IMock<IServiceContainer>;
     let envHealthCheck: typemoq.IMock<IDiagnosticsService>;
     let debuggerTypeCheck: typemoq.IMock<IDiagnosticsService>;
@@ -62,7 +62,7 @@ suite('xApplication Diagnostics - ApplicationDiagnostics', () => {
         sourceMapService.verifyAll();
     });
 
-    test('Performing Pre Startup Health Check must check Path environment variable and Debugger Type along with Mac Interpreter', async () => {
+    test('Performing Pre Startup Health Check must diagnose all validation checks', async () => {
         envHealthCheck.setup(e => e.diagnose(typemoq.It.isAny()))
             .returns(() => Promise.resolve([]))
             .verifiable(typemoq.Times.exactly(2));
@@ -84,9 +84,66 @@ suite('xApplication Diagnostics - ApplicationDiagnostics', () => {
         envHealthCheck.verifyAll();
         debuggerTypeCheck.verifyAll();
         macInterpreterCheck.verifyAll();
+        lsNotSupportedCheck.verifyAll();
+        pythonInterpreterCheck.verifyAll();
     });
 
-    test('Diagnostics Returned by Per Startup Health Checks must be logged', async () => {
+    test('Performing Pre Startup Health Check must handles all validation checks only once either in background or foreground', async () => {
+        const diagnosticRunInBackground: IDiagnostic = {
+            code: 'Error' as any,
+            message: 'Error',
+            scope: undefined,
+            severity: undefined,
+            resource: undefined,
+            runInBackground: true
+        };
+        const diagnosticDoNotRunInBackground: IDiagnostic = {
+            code: 'Error' as any,
+            message: 'Error',
+            scope: undefined,
+            severity: undefined,
+            resource: undefined,
+            runInBackground: false
+        };
+        envHealthCheck.setup(e => e.diagnose(typemoq.It.isAny()))
+            .returns(() => Promise.resolve([diagnosticRunInBackground]))
+            .verifiable(typemoq.Times.exactly(2));
+        envHealthCheck.setup(p => p.handle(typemoq.It.isValue([diagnosticRunInBackground])))
+            .returns(() => Promise.resolve())
+            .verifiable(typemoq.Times.once());
+        debuggerTypeCheck.setup(e => e.diagnose(typemoq.It.isAny()))
+            .returns(() => Promise.resolve([diagnosticRunInBackground]))
+            .verifiable(typemoq.Times.exactly(2));
+        debuggerTypeCheck.setup(p => p.handle(typemoq.It.isValue([diagnosticRunInBackground])))
+            .returns(() => Promise.resolve())
+            .verifiable(typemoq.Times.once());
+        macInterpreterCheck.setup(p => p.diagnose(typemoq.It.isAny()))
+            .returns(() => Promise.resolve([diagnosticRunInBackground]))
+            .verifiable(typemoq.Times.exactly(2));
+        macInterpreterCheck.setup(p => p.handle(typemoq.It.isValue([diagnosticRunInBackground])))
+            .returns(() => Promise.resolve())
+            .verifiable(typemoq.Times.once());
+        lsNotSupportedCheck.setup(p => p.diagnose(typemoq.It.isAny()))
+            .returns(() => Promise.resolve([diagnosticDoNotRunInBackground]))
+            .verifiable(typemoq.Times.exactly(2));
+        lsNotSupportedCheck.setup(p => p.handle(typemoq.It.isValue([diagnosticDoNotRunInBackground])))
+            .returns(() => Promise.resolve())
+            .verifiable(typemoq.Times.once());
+        pythonInterpreterCheck.setup(p => p.diagnose(typemoq.It.isAny()))
+            .returns(() => Promise.resolve([diagnosticDoNotRunInBackground]))
+            .verifiable(typemoq.Times.exactly(2));
+        pythonInterpreterCheck.setup(p => p.handle(typemoq.It.isValue([diagnosticDoNotRunInBackground])))
+            .returns(() => Promise.resolve())
+            .verifiable(typemoq.Times.once());
+
+        await appDiagnostics.performPreStartupHealthCheck(undefined);
+
+        envHealthCheck.verifyAll();
+        debuggerTypeCheck.verifyAll();
+        macInterpreterCheck.verifyAll();
+    });
+
+    test('Diagnostics Returned by Pre Startup Health Checks must be logged', async () => {
         const diagnostics: IDiagnostic[] = [];
         for (let i = 0; i <= (Math.random() * 10); i += 1) {
             const diagnostic: IDiagnostic = {
@@ -167,6 +224,9 @@ suite('xApplication Diagnostics - ApplicationDiagnostics', () => {
 
         envHealthCheck.verifyAll();
         debuggerTypeCheck.verifyAll();
+        macInterpreterCheck.verifyAll();
+        lsNotSupportedCheck.verifyAll();
+        pythonInterpreterCheck.verifyAll();
         outputChannel.verifyAll();
         logger.verifyAll();
     });