microsoft · WardenGnaw · Feb 28, 2019 · Feb 22, 2019 · Feb 23, 2019 · Feb 28, 2019
diff --git a/.travis.yml b/.travis.yml
diff --git a/Extension/src/Debugger/debugAdapterDescriptorFactory.ts b/Extension/src/Debugger/debugAdapterDescriptorFactory.ts
@@ -11,7 +11,7 @@ import * as os from 'os';
 // Registers DebugAdapterDescriptorFactory for `cppdbg` and `cppvsdbg`. If it is not ready, it will prompt a wait for the download dialog.
 // NOTE: This file is not automatically tested.
 
-abstract class DebugAdapterDescriptorFactoryWithContext implements vscode.DebugAdapterDescriptorFactory {
+abstract class AbstractDebugAdapterDescriptorFactory implements vscode.DebugAdapterDescriptorFactory {
     protected readonly context: vscode.ExtensionContext;
 
     // This is important for the Mock Debugger since it can not use src/common
@@ -22,7 +22,7 @@ abstract class DebugAdapterDescriptorFactoryWithContext implements vscode.DebugA
     abstract createDebugAdapterDescriptor(session: vscode.DebugSession, executable: vscode.DebugAdapterExecutable | undefined): vscode.ProviderResult<vscode.DebugAdapterDescriptor>;
 }
 
-export class CppdbgDebugAdapterDescriptorFactory extends DebugAdapterDescriptorFactoryWithContext {
+export class CppdbgDebugAdapterDescriptorFactory extends AbstractDebugAdapterDescriptorFactory {
     public static DEBUG_TYPE : string = "cppdbg";
 
     constructor(context: vscode.ExtensionContext) {
@@ -47,7 +47,7 @@ export class CppdbgDebugAdapterDescriptorFactory extends DebugAdapterDescriptorF
     }
 }
 
-export class CppvsdbgDebugAdapterDescriptorFactory extends DebugAdapterDescriptorFactoryWithContext {
+export class CppvsdbgDebugAdapterDescriptorFactory extends AbstractDebugAdapterDescriptorFactory {
     public static DEBUG_TYPE : string = "cppvsdbg";
 
     constructor(context: vscode.ExtensionContext) {

diff --git a/Extension/test/integrationTests/MockDebugger/debugAdapterDescriptorFactory.ts b/Extension/test/integrationTests/MockDebugger/debugAdapterDescriptorFactory.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 
 // import * as util from '../src/common' <- DO NOT USE. Also do not use anything with relative paths, it will break during replacing in test/integrationTests/debug/integration.test.ts
 
-abstract class DebugAdapterDescriptorFactoryWithContext implements vscode.DebugAdapterDescriptorFactory {
+abstract class AbstractDebugAdapterDescriptorFactory implements vscode.DebugAdapterDescriptorFactory {
     protected readonly context: vscode.ExtensionContext;
 
     constructor(context: vscode.ExtensionContext) {
@@ -18,7 +18,7 @@ abstract class DebugAdapterDescriptorFactoryWithContext implements vscode.DebugA
     abstract createDebugAdapterDescriptor(session: vscode.DebugSession, executable: vscode.DebugAdapterExecutable | undefined): vscode.ProviderResult<vscode.DebugAdapterDescriptor>;
 }
 
-export class CppdbgDebugAdapterDescriptorFactory extends DebugAdapterDescriptorFactoryWithContext {
+export class CppdbgDebugAdapterDescriptorFactory extends AbstractDebugAdapterDescriptorFactory {
     public static DEBUG_TYPE : string = "cppdbg";
 
     constructor(context: vscode.ExtensionContext) {
@@ -32,7 +32,7 @@ export class CppdbgDebugAdapterDescriptorFactory extends DebugAdapterDescriptorF
     }
 }
 
-export class CppvsdbgDebugAdapterDescriptorFactory extends DebugAdapterDescriptorFactoryWithContext {
+export class CppvsdbgDebugAdapterDescriptorFactory extends AbstractDebugAdapterDescriptorFactory {
     public static DEBUG_TYPE : string = "cppvsdbg";
 
     constructor(context: vscode.ExtensionContext) {

diff --git a/Extension/test/integrationTests/debug/integration.test.ts b/Extension/test/integrationTests/debug/integration.test.ts
@@ -0,0 +1,37 @@
+/*--------------------------------------------------------------------------------------------- 
+ *  Copyright (c) Microsoft Corporation. All rights reserved. 
+ *  Licensed under the MIT License. See License.txt in the project root for license information. 
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as assert from 'assert';
+
+suite(`Debug Integration Test: `, function(): void {
+    let origFactoryFile: string;
+    let tempFactoryFile: string;
+    let hijackedFactoryFile: string;
+
+    suiteSetup(async function(): Promise<void> {
+        let extension: vscode.Extension<any> = vscode.extensions.getExtension("ms-vscode.cpptools"); 
+        if (!extension.isActive) {
+            await extension.activate(); 
+        }
+    });
+
+    test("Starting (gdb) Launch from the workspace root should create an Active Debug Session", async function() { 
+        // 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");
+
+        let debugSessionTerminated: Promise<void> = new Promise(resolve => {
+            vscode.debug.onDidTerminateDebugSession((e) => resolve());
+        });
+
+        try {
+            assert.equal(vscode.debug.activeDebugSession.type, "cppdbg");
+        } catch (e) {
+            assert.fail("Debugger failed to launch. Did the extension activate correctly?");
+        }
+
+        await debugSessionTerminated;
+    });
+});