Ensure test debug client routes service extension events

kausikMR · Apr 8, 2019 · e1d5245 · e1d5245
1 parent aadc4ca
commit e1d5245
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/src/commands/debug.ts b/src/commands/debug.ts
@@ -35,7 +35,7 @@ export class DebugCommands {
 	public readonly onReceiveCoverage: vs.Event<CoverageData[]> = this.onReceiveCoverageEmitter.event;
 	private onFirstFrameEmitter: vs.EventEmitter<CoverageData[]> = new vs.EventEmitter<CoverageData[]>();
 	public readonly onFirstFrame: vs.Event<CoverageData[]> = this.onFirstFrameEmitter.event;
-	private readonly flutterExtensions: FlutterVmServiceExtensions;
+	public readonly flutterExtensions: FlutterVmServiceExtensions;
 	private readonly devTools: DevTools;
 
 	constructor(private readonly context: Context, private readonly workspaceContext: WorkspaceContext, private readonly analytics: Analytics, pubGlobal: PubGlobal) {

diff --git a/src/extension.ts b/src/extension.ts
@@ -339,7 +339,7 @@ export function activate(context: vs.ExtensionContext, isRestart: boolean = fals
 	const analyzerCommands = new AnalyzerCommands(context, analyzer);
 	const pubGlobal = new PubGlobal(extContext, sdks);
 	const sdkCommands = new SdkCommands(context, workspaceContext, pubGlobal, flutterCapabilities, flutterDaemon && flutterDaemon.deviceManager);
-	const debug = new DebugCommands(extContext, workspaceContext, analytics, pubGlobal);
+	const debugCommands = new DebugCommands(extContext, workspaceContext, analytics, pubGlobal);
 
 	// Register URI handler.
 	context.subscriptions.push(vs.window.registerUriHandler(new DartUriHandler(flutterCapabilities)));
@@ -382,7 +382,7 @@ export function activate(context: vs.ExtensionContext, isRestart: boolean = fals
 	);
 
 	if (workspaceContext.hasAnyFlutterProjects && config.previewHotReloadCoverageMarkers) {
-		context.subscriptions.push(new HotReloadCoverageDecorations(debug));
+		context.subscriptions.push(new HotReloadCoverageDecorations(debugCommands));
 	}
 
 	context.subscriptions.push(vs.commands.registerCommand("dart.package.openFile", (filePath) => {
@@ -457,6 +457,7 @@ export function activate(context: vs.ExtensionContext, isRestart: boolean = fals
 			currentAnalysis: () => analyzer.currentAnalysis,
 			daemonCapabilities: flutterDaemon ? flutterDaemon.capabilities : DaemonCapabilities.empty,
 			dartCapabilities,
+			debugCommands,
 			debugProvider,
 			flutterCapabilities,
 			initialAnalysis,
@@ -612,6 +613,7 @@ export interface InternalExtensionApi {
 	currentAnalysis: () => Promise<void>;
 	daemonCapabilities: DaemonCapabilities;
 	dartCapabilities: DartCapabilities;
+	debugCommands: DebugCommands;
 	debugProvider: DebugConfigProvider;
 	flutterCapabilities: FlutterCapabilities;
 	initialAnalysis: Promise<void>;

diff --git a/test/dart_debug_client.ts b/test/dart_debug_client.ts
@@ -2,7 +2,7 @@ import * as assert from "assert";
 import { SpawnOptions } from "child_process";
 import { DebugSessionCustomEvent } from "vscode";
 import { DebugProtocol } from "vscode-debugprotocol";
-import { debugSessions } from "../src/commands/debug";
+import { DebugCommands, debugSessions } from "../src/commands/debug";
 import { not } from "../src/utils/array";
 import { isKnownInfrastructureThread } from "../src/utils/debugger";
 import { handleDebugLogEvent, log } from "../src/utils/log";
@@ -14,10 +14,18 @@ import { delay, watchPromise, withTimeout } from "./helpers";
 
 export class DartDebugClient extends DebugClient {
 	private readonly id: string;
-	constructor(runtime: string, executable: string, debugType: string, spawnOptions?: SpawnOptions, testProvider?: TestResultsProvider) {
+	constructor(runtime: string, executable: string, debugType: string, spawnOptions: SpawnOptions, debugCommands: DebugCommands, testProvider: TestResultsProvider) {
 		super(runtime, executable, debugType, spawnOptions);
 		this.on("dart.log", (e: DebugSessionCustomEvent) => handleDebugLogEvent(e.event, e.body));
 		// TODO: Make it so we don't have to keep copying logic from debug.ts into here...
+		this.on("dart.serviceExtensionAdded", (e: DebugSessionCustomEvent) => {
+			const fakeEvent: DebugSessionCustomEvent = {
+				body: e.body,
+				event: e.event,
+				session: debugSessions[0].session,
+			};
+			debugCommands.flutterExtensions.handleDebugEvent(fakeEvent);
+		});
 		this.on("dart.debuggerUris", (e: DebugSessionCustomEvent) => {
 			debugSessions[0].observatoryUri = e.body.observatoryUri;
 			debugSessions[0].vmServiceUri = e.body.vmServiceUri;
@@ -56,7 +64,7 @@ export class DartDebugClient extends DebugClient {
 				request: "launch",
 				type: "dart",
 			},
-			customRequest: this.customRequest,
+			customRequest: (e) => this.customRequest(e),
 			id: "INTEGRATION-TEST",
 			name: "Dart & Flutter",
 			type: "dart",

diff --git a/test/dart_only/debug/dart_cli.test.ts b/test/dart_only/debug/dart_cli.test.ts
@@ -19,7 +19,7 @@ describe("dart cli debugger", () => {
 
 	let dc: DartDebugClient;
 	beforeEach("create debug client", () => {
-		dc = new DartDebugClient(process.execPath, path.join(ext.extensionPath, "out/src/debug/dart_debug_entry.js"), "dart");
+		dc = new DartDebugClient(process.execPath, path.join(ext.extensionPath, "out/src/debug/dart_debug_entry.js"), "dart", undefined, extApi.debugCommands, undefined);
 		dc.defaultTimeout = 60000;
 		const thisDc = dc;
 		defer(() => thisDc.stop());

diff --git a/test/dart_only/debug/dart_test.test.ts b/test/dart_only/debug/dart_test.test.ts
@@ -23,6 +23,7 @@ describe("dart test debugger", () => {
 			path.join(ext.extensionPath, "out/src/debug/dart_test_debug_entry.js"),
 			"dart",
 			undefined,
+			extApi.debugCommands,
 			extApi.testTreeProvider,
 		);
 		dc.defaultTimeout = 60000;

diff --git a/test/flutter_only/debug/flutter_run.test.ts b/test/flutter_only/debug/flutter_run.test.ts
@@ -25,7 +25,7 @@ describe("flutter run debugger (launch)", () => {
 
 	let dc: DartDebugClient;
 	beforeEach("create debug client", () => {
-		dc = new DartDebugClient(process.execPath, path.join(ext.extensionPath, "out/src/debug/flutter_debug_entry.js"), "dart");
+		dc = new DartDebugClient(process.execPath, path.join(ext.extensionPath, "out/src/debug/flutter_debug_entry.js"), "dart", undefined, extApi.debugCommands, undefined);
 		dc.defaultTimeout = 60000;
 		const thisDc = dc;
 		defer(() => thisDc.stop());

diff --git a/test/flutter_only/debug/flutter_run_attach.test.ts b/test/flutter_only/debug/flutter_run_attach.test.ts
@@ -26,7 +26,7 @@ describe("flutter run debugger (attach)", () => {
 
 	let dc: DartDebugClient;
 	beforeEach("create debug client", () => {
-		dc = new DartDebugClient(process.execPath, path.join(ext.extensionPath, "out/src/debug/flutter_debug_entry.js"), "dart");
+		dc = new DartDebugClient(process.execPath, path.join(ext.extensionPath, "out/src/debug/flutter_debug_entry.js"), "dart", undefined, extApi.debugCommands, undefined);
 		dc.defaultTimeout = 60000;
 		defer(() => dc.stop());
 	});

diff --git a/test/flutter_only/debug/flutter_test.test.ts b/test/flutter_only/debug/flutter_test.test.ts
@@ -34,6 +34,7 @@ describe("flutter test debugger", () => {
 			path.join(ext.extensionPath, "out/src/debug/flutter_test_debug_entry.js"),
 			"dart",
 			undefined,
+			extApi.debugCommands,
 			extApi.testTreeProvider,
 		);
 		dc.defaultTimeout = 60000;