Dev/waan/fix test run (#3581)

sean-mcmanus · web-flow · commit 0cffa4e27ac0 · 2019-05-06T16:51:51.000-07:00
* Fix integration tests and fail if tests fail
diff --git a/Extension/.vscode/launch.json b/Extension/.vscode/launch.json
@@ -47,13 +47,14 @@
 			"args": [
 				"${workspaceFolder}/test/integrationTests/testAssets/SimpleCppProject",
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests"
+				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/languageServer"
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"
-			]
+			],
+			"preLaunchTask": "Pretest"
 		},
 	]
 }
diff --git a/Extension/.vscode/tasks.json b/Extension/.vscode/tasks.json
@@ -68,6 +68,21 @@
                 "TypeScript Compile"
             ],
             "problemMatcher": "$tsc-watch"
+        },
+        {
+            "label": "Pretest",
+            "group": "build",
+            "isBackground": false,
+            "type": "shell",
+            "command": "npm",
+            "args": [
+                "run",
+                "pretest"
+            ],
+            "dependsOn": [
+                "TypeScript Compile"
+            ],
+            "problemMatcher": "$tsc-watch"
         }
     ]
 }
diff --git a/Extension/gulpfile.js b/Extension/gulpfile.js
@@ -29,24 +29,6 @@ gulp.task('unitTests', (done) => {
         });
 });
 
-gulp.task('integrationTests', (done) => {
-    env.set({
-            CODE_TESTS_PATH: "./out/test/integrationTests",
-            CODE_TESTS_WORKSPACE: "./test/integrationTests/testAssets/SimpleCppProject"
-        });
-
-    return gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
-        .pipe(mocha({ ui: "tdd" }))
-        .once('error', err => {
-            done();
-            process.exit(1);
-        })
-        .once('end', () => {
-            done();
-            process.exit();
-        });
-});
-
 /// Misc Tasks
 const allTypeScript = [
     'src/**/*.ts',
diff --git a/Extension/jobs/build.windows.yml b/Extension/jobs/build.windows.yml
@@ -16,7 +16,7 @@ jobs:
   - script: npm install
     displayName: "Install Dependencies"
     workingDirectory: '$(Build.SourcesDirectory)\Extension'
-      
+
   - script: npm run compile
     displayName: "Compile Sources"
     workingDirectory: '$(Build.SourcesDirectory)\Extension'
@@ -34,10 +34,13 @@ jobs:
     workingDirectory: '$(Build.SourcesDirectory)\Extension'
     continueOnError: true
 
+  - script: npm run pretest
+    displayName: "Compile Test Sources"
+    workingDirectory: '$(Build.SourcesDirectory)\Extension'
+
   - script: 'node node_modules/vscode/bin/test'
     displayName: 'Run languageServer integration tests'
     workingDirectory: '$(Build.SourcesDirectory)\Extension'
-    continueOnError: true
     env:
       CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\languageServer'
       CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension'
diff --git a/Extension/jobs/build.yml b/Extension/jobs/build.yml
@@ -15,7 +15,7 @@ jobs:
   - script: npm install
     displayName: "Install Dependencies"
     workingDirectory: '$(Build.SourcesDirectory)/Extension'
-      
+
   - script: npm run compile
     displayName: "Compile Sources"
     workingDirectory: '$(Build.SourcesDirectory)/Extension'
@@ -39,10 +39,13 @@ jobs:
       disown -ar
     displayName: 'Start xvfb'
 
+  - script: npm run pretest
+    displayName: "Compile Test Sources"
+    workingDirectory: '$(Build.SourcesDirectory)/Extension'
+
   - script: 'node node_modules/vscode/bin/test'
     displayName: 'Run languageServer integration tests'
     workingDirectory: '$(Build.SourcesDirectory)/Extension'
-    continueOnError: true
     env:
       DISPLAY: :10
       CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/languageServer'
diff --git a/Extension/package.json b/Extension/package.json
@@ -1440,11 +1440,9 @@
     "compile": "npm run vscode:prepublish",
     "compileDev": "webpack --mode development",
     "generateOptionsSchema": "gulp generateOptionsSchema",
-    "integrationTests": "gulp integrationTests",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "pretest": "tsc -p ./",
+    "pretest": "tsc -p test.tsconfig.json",
     "pr-check": "gulp pr-check",
-    "test": "gulp allTests",
     "tslint": "gulp tslint",
     "unitTests": "gulp unitTests",
     "vscode:prepublish": "node ./tools/prepublish.js && webpack --mode production",
@@ -1653,4 +1651,4 @@
       "binaries": []
     }
   ]
-}
+}
diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -413,7 +413,8 @@ class DefaultClient implements Client {
         let settings: CppSettings = new CppSettings(workspaceFolder ? workspaceFolder.uri : null);
         let other: OtherSettings = new OtherSettings(workspaceFolder ? workspaceFolder.uri : null);
 
-        let storagePath: string = util.extensionContext.storagePath;
+        let storagePath: string = util.extensionContext ? util.extensionContext.storagePath :
+            path.join((workspaceFolder ? workspaceFolder.uri.fsPath : ""), "/.vscode");
         if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 1) {
             storagePath = path.join(storagePath, serverName);
         }
@@ -445,7 +446,7 @@ class DefaultClient implements Client {
                 clang_format_fallbackStyle: settings.clangFormatFallbackStyle,
                 clang_format_sortIncludes: settings.clangFormatSortIncludes,
                 formatting: settings.formatting,
-                extension_path: util.extensionContext.extensionPath,
+                extension_path: util.extensionPath,
                 exclude_files: other.filesExclude,
                 exclude_search: other.searchExclude,
                 storage_path: storagePath,
diff --git a/Extension/src/LanguageServer/persistentState.ts b/Extension/src/LanguageServer/persistentState.ts
@@ -12,19 +12,24 @@ class PersistentStateBase<T> {
     private key: string;
     private defaultvalue: T;
     private state: vscode.Memento;
+    private curvalue: T;
 
     constructor(key: string, defaultValue: T, state: vscode.Memento) {
         this.key = key;
         this.defaultvalue = defaultValue;
         this.state = state;
+        this.curvalue = defaultValue;
     }
 
     public get Value(): T {
-        return this.state.get<T>(this.key, this.defaultvalue);
+        return this.state ? this.state.get<T>(this.key, this.defaultvalue) : this.curvalue;
     }
 
     public set Value(newValue: T) {
-        this.state.update(this.key, newValue);
+        if (this.state) {
+            this.state.update(this.key, newValue);
+        }
+        this.curvalue = newValue;
     }
 
     public get DefaultValue(): T {
@@ -35,13 +40,13 @@ class PersistentStateBase<T> {
 // Abstraction for global state that persists across activations but is not present in a settings file
 export class PersistentState<T> extends PersistentStateBase<T> {
     constructor(key: string, defaultValue: T) {
-        super(key, defaultValue, util.extensionContext.globalState);
+        super(key, defaultValue, util.extensionContext ? util.extensionContext.globalState : null);
     }
 }
 
 export class PersistentWorkspaceState<T> extends PersistentStateBase<T> {
     constructor(key: string, defaultValue: T) {
-        super(key, defaultValue, util.extensionContext.workspaceState);
+        super(key, defaultValue, util.extensionContext ? util.extensionContext.workspaceState : null);
     }
 }
 
diff --git a/Extension/src/LanguageServer/settingsPanel.ts b/Extension/src/LanguageServer/settingsPanel.ts
@@ -62,9 +62,9 @@ export class SettingsPanel {
 
                 // Restrict the webview to only loading content from these directories
                 localResourceRoots: [
-                    vscode.Uri.file(util.extensionContext.extensionPath), 
-                    vscode.Uri.file(path.join(util.extensionContext.extensionPath, 'ui')), 
-                    vscode.Uri.file(path.join(util.extensionContext.extensionPath, 'out', 'ui'))]
+                    vscode.Uri.file(util.extensionPath), 
+                    vscode.Uri.file(path.join(util.extensionPath, 'ui')), 
+                    vscode.Uri.file(path.join(util.extensionPath, 'out', 'ui'))]
             }
         );
 
@@ -201,7 +201,7 @@ export class SettingsPanel {
 
         content = content.replace(
             /{{root}}/g, 
-            vscode.Uri.file(util.extensionContext.extensionPath)
+            vscode.Uri.file(util.extensionPath)
             .with({ scheme: 'vscode-resource' })
             .toString());
 
diff --git a/Extension/src/commands.ts b/Extension/src/commands.ts
@@ -6,6 +6,7 @@
 
 import * as vscode from 'vscode';
 import * as LanguageServer from './LanguageServer/extension';
+import * as util from './common';
 
 class TemporaryCommandRegistrar {
     // Used to save/re-execute commands used before the extension has activated (e.g. delayed by dependency downloading).
@@ -41,9 +42,11 @@ class TemporaryCommandRegistrar {
         this.delayedCommandsToExecute = new Set<string>();
 
         // Add temp commands that invoke the real commands after download/install is complete (preventing an error message)
-        this.commandsToRegister.forEach(command => {
-            this.registerTempCommand(command);
-        });
+        if (util.extensionContext) {
+            this.commandsToRegister.forEach(command => {
+                this.registerTempCommand(command);
+            });
+        }
     }
 
     public registerTempCommand(command: string): void {
diff --git a/Extension/src/common.ts b/Extension/src/common.ts
@@ -19,9 +19,14 @@ import { ClientRequest, OutgoingHttpHeaders } from 'http';
 import { getBuildTasks } from './LanguageServer/extension';
 import { OtherSettings } from './LanguageServer/settings';
 
+export let extensionPath: string;
 export let extensionContext: vscode.ExtensionContext;
 export function setExtensionContext(context: vscode.ExtensionContext): void {
     extensionContext = context;
+    extensionPath = extensionContext.extensionPath;
+}
+export function setExtensionPath(path: string): void {
+    extensionPath = path;
 }
 
 export const failedToParseTasksJson: string = "Failed to parse tasks.json, possibly due to comments or trailing commas.";
@@ -106,7 +111,7 @@ export function stringifyPackageJson(packageJson: string): string {
 }
 
 export function getExtensionFilePath(extensionfile: string): string {
-    return path.resolve(extensionContext.extensionPath, extensionfile);
+    return path.resolve(extensionPath, extensionfile);
 }
 
 export function getPackageJsonPath(): string {
@@ -195,15 +200,15 @@ let installProgressStr: string = "CPP." + packageJson.version + ".Progress";
 let intelliSenseProgressStr: string = "CPP." + packageJson.version + ".IntelliSenseProgress";
 
 export function getProgress(): number {
-    return extensionContext.globalState.get<number>(installProgressStr, -1);
+    return extensionContext ? extensionContext.globalState.get<number>(installProgressStr, -1) : -1;
 }
 
 export function getIntelliSenseProgress(): number {
-    return extensionContext.globalState.get<number>(intelliSenseProgressStr, -1);
+    return extensionContext ? extensionContext.globalState.get<number>(intelliSenseProgressStr, -1) : -1;
 }
 
 export function setProgress(progress: number): void {
-    if (getProgress() < progress) {
+    if (extensionContext && getProgress() < progress) {
         extensionContext.globalState.update(installProgressStr, progress);
         let telemetryProperties: { [key: string]: string } = {};
         let progressName: string;
@@ -220,7 +225,7 @@ export function setProgress(progress: number): void {
 }
 
 export function setIntelliSenseProgress(progress: number): void {
-    if (getIntelliSenseProgress() < progress) {
+    if (extensionContext && getIntelliSenseProgress() < progress) {
         extensionContext.globalState.update(intelliSenseProgressStr, progress);
         let telemetryProperties: { [key: string]: string } = {};
         let progressName: string;
@@ -421,7 +426,7 @@ export function touchInstallLockFile(): Promise<void> {
 
 export function touchExtensionFolder(): Promise<void> {
     return new Promise<void>((resolve, reject) => {
-        fs.utimes(path.resolve(extensionContext.extensionPath, ".."), new Date(Date.now()), new Date(Date.now()), (err) => {
+        fs.utimes(path.resolve(extensionPath, ".."), new Date(Date.now()), new Date(Date.now()), (err) => {
             if (err) {
                 reject(err);
             }
diff --git a/Extension/src/platform.ts b/Extension/src/platform.ts
@@ -39,7 +39,7 @@ export class PlatformInformation {
     public static GetUnknownArchitecture(): string { return "Unknown"; }
 
     private static GetWindowsArchitecture(): Promise<string> {
-        return util.execChildProcess('wmic os get osarchitecture', util.extensionContext.extensionPath)
+        return util.execChildProcess('wmic os get osarchitecture', util.extensionPath)
             .then((architecture) => {
                 if (architecture) {
                     let archArray: string[] = architecture.split(os.EOL);
diff --git a/Extension/src/telemetry.ts b/Extension/src/telemetry.ts
@@ -30,23 +30,25 @@ export function deactivate(): void {
 }
 
 export function logDebuggerEvent(eventName: string, properties?: { [key: string]: string }): void {
-    const eventNamePrefix: string = "cppdbg/VS/Diagnostics/Debugger/";
     if (telemetryReporter) {
+        const eventNamePrefix: string = "cppdbg/VS/Diagnostics/Debugger/";
         telemetryReporter.sendTelemetryEvent(eventNamePrefix + eventName, properties);
     }
 }
 
 export function logLanguageServerEvent(eventName: string, properties?: { [key: string]: string }, metrics?: { [key: string]: number }): void {
-    const eventNamePrefix: string = "C_Cpp/LanguageServer/";
     if (telemetryReporter) {
+        const eventNamePrefix: string = "C_Cpp/LanguageServer/";
         telemetryReporter.sendTelemetryEvent(eventNamePrefix + eventName, properties, metrics);
     }
 }
 
 function createReporter(): TelemetryReporter {
-    let packageInfo: IPackageInfo = getPackageInfo();
-    if (packageInfo && packageInfo.aiKey) {
-        return new TelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey);
+    if (util.extensionContext) {
+        let packageInfo: IPackageInfo = getPackageInfo();
+        if (packageInfo && packageInfo.aiKey) {
+            return new TelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey);
+        }
     }
     return null;
 }
diff --git a/Extension/test.tsconfig.json b/Extension/test.tsconfig.json
@@ -0,0 +1,17 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es6",
+		"outDir": "out",
+		"lib": [
+			"es6", "dom"
+		],
+		"sourceMap": true,
+		"rootDir": ".",
+		"removeComments": true,
+		"noImplicitUseStrict": true
+	},
+	"include": [
+		"test/**/*.ts"
+	]
+}
diff --git a/Extension/test/integrationTests/debug/integration.test.ts b/Extension/test/integrationTests/debug/integration.test.ts
@@ -18,7 +18,7 @@ suite(`Debug Integration Test: `, function(): void {
         }
     });
  
-    test("Starting (gdb) Launch from the workspace root should create an Active Debug Session", async function() { 
+    test("Starting (gdb) Launch from the workspace root should create an Active Debug Session", async () => { 
         // If it is failing on startDebugging. Investigate the SimpleCppProject's tasks.json or launch.json.
         await vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], "(gdb) Launch");
 
diff --git a/Extension/test/integrationTests/languageServer/index.ts b/Extension/test/integrationTests/languageServer/index.ts
diff --git a/Extension/test/integrationTests/languageServer/languageServer.integration.test.ts b/Extension/test/integrationTests/languageServer/languageServer.integration.test.ts

Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,24 @@ class PersistentStateBase<T> {`
`12`	`12`	`private key: string;`
`13`	`13`	`private defaultvalue: T;`
`14`	`14`	`private state: vscode.Memento;`
	`15`	`+ private curvalue: T;`
`15`	`16`
`16`	`17`	`constructor(key: string, defaultValue: T, state: vscode.Memento) {`
`17`	`18`	`this.key = key;`
`18`	`19`	`this.defaultvalue = defaultValue;`
`19`	`20`	`this.state = state;`
	`21`	`+ this.curvalue = defaultValue;`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`public get Value(): T {`
`23`		`- return this.state.get<T>(this.key, this.defaultvalue);`
	`25`	`+ return this.state ? this.state.get<T>(this.key, this.defaultvalue) : this.curvalue;`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`public set Value(newValue: T) {`
`27`		`- this.state.update(this.key, newValue);`
	`29`	`+ if (this.state) {`
	`30`	`+ this.state.update(this.key, newValue);`
	`31`	`+ }`
	`32`	`+ this.curvalue = newValue;`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`public get DefaultValue(): T {`
`@@ -35,13 +40,13 @@ class PersistentStateBase<T> {`
`35`	`40`	`// Abstraction for global state that persists across activations but is not present in a settings file`
`36`	`41`	`export class PersistentState<T> extends PersistentStateBase<T> {`
`37`	`42`	`constructor(key: string, defaultValue: T) {`
`38`		`- super(key, defaultValue, util.extensionContext.globalState);`
	`43`	`+ super(key, defaultValue, util.extensionContext ? util.extensionContext.globalState : null);`
`39`	`44`	`}`
`40`	`45`	`}`
`41`	`46`
`42`	`47`	`export class PersistentWorkspaceState<T> extends PersistentStateBase<T> {`
`43`	`48`	`constructor(key: string, defaultValue: T) {`
`44`		`- super(key, defaultValue, util.extensionContext.workspaceState);`
	`49`	`+ super(key, defaultValue, util.extensionContext ? util.extensionContext.workspaceState : null);`
`45`	`50`	`}`
`46`	`51`	`}`
`47`	`52`