Update tests with API changes

Author: znorman-harris

apps/client-e2e/src/tests/debugging/breakpoint-step-in-step-out.ts

@@ -62,27 +62,27 @@ export const BreakpointStepInStepOut: RunnerFunction = async (init) => {
   /** Run our file */
   await vscode.commands.executeCommand(IDL_COMMANDS.DEBUG.RUN);
   await Sleep(DEBUG_PAUSE);
-  expect(init.debug.adapter.stopped?.stack?.line).toEqual(19);
+  expect(init.debug.adapter._eventHelper.stopped?.stack?.line).toEqual(19);
 
   // step in
   await vscode.commands.executeCommand(VSCODE_COMMANDS.DEBUG_STEP_INTO);
   await Sleep(DEBUG_PAUSE);
-  expect(init.debug.adapter.stopped?.stack?.line).toEqual(9);
+  expect(init.debug.adapter._eventHelper.stopped?.stack?.line).toEqual(9);
 
   // step over
   await vscode.commands.executeCommand(VSCODE_COMMANDS.DEBUG_STEP_OVER);
   await Sleep(DEBUG_PAUSE);
-  expect(init.debug.adapter.stopped?.stack?.line).toEqual(11);
+  expect(init.debug.adapter._eventHelper.stopped?.stack?.line).toEqual(11);
 
   // step in
   await vscode.commands.executeCommand(VSCODE_COMMANDS.DEBUG_STEP_OVER);
   await Sleep(DEBUG_PAUSE);
-  expect(init.debug.adapter.stopped?.stack?.line).toEqual(12);
+  expect(init.debug.adapter._eventHelper.stopped?.stack?.line).toEqual(12);
 
   // step in
   await vscode.commands.executeCommand(VSCODE_COMMANDS.DEBUG_STEP_OUT);
   await Sleep(DEBUG_PAUSE);
-  expect(init.debug.adapter.stopped?.stack?.line).toEqual(21);
+  expect(init.debug.adapter._eventHelper.stopped?.stack?.line).toEqual(21);
 
   // remove all breakpoints
   await init.debug.adapter._breakpoints.resetBreakpoints();

apps/client-e2e/src/tests/debugging/continue.ts

@@ -65,7 +65,9 @@ export const Continue: RunnerFunction = async (init) => {
   // verify all of our lines
   for (let i = 0; i < EXPECTED_LINES.length; i++) {
     // verify we are on the right line
-    expect(init.debug.adapter.stopped?.stack?.line).toEqual(EXPECTED_LINES[i]);
+    expect(init.debug.adapter._eventHelper.stopped?.stack?.line).toEqual(
+      EXPECTED_LINES[i]
+    );
 
     // continue running
     await vscode.commands.executeCommand(VSCODE_COMMANDS.DEBUG_CONTINUE);

libs/vscode/debug/src/lib/idl-debug-adapter-event-helper.class.ts

@@ -12,6 +12,9 @@ import {
 } from './idl-debug-adapter.interface';
 
 export class IDLDebugAdapterEventHelper {
+  /** Track information about latest stop */
+  stopped?: { reason: StopReason; stack: IDLCallStackItem };
+
   /** Reference to the debug adapter */
   private adapter: IDLDebugAdapter;
 
@@ -20,9 +23,6 @@ export class IDLDebugAdapterEventHelper {
     stopBlockers: 0,
   };
 
-  /** Track information about latest stop */
-  private stopped?: { reason: StopReason; stack: IDLCallStackItem };
-
   constructor(adapter: IDLDebugAdapter) {
     this.adapter = adapter;
   }

libs/vscode/debug/src/lib/idl-debug-adapter.class.ts

@@ -7,7 +7,6 @@ import { Sleep } from '@idl/shared/extension';
 import { IDL_TRANSLATION } from '@idl/translation';
 import {
   IDL_EVENT_LOOKUP,
-  IDLCallStackItem,
   REGEX_COMPILE_COMMAND,
   REGEX_COMPILE_EDIT_COMMAND,
   REGEX_COMPILED_MAIN,
@@ -16,7 +15,6 @@ import {
   REGEX_IDL_LINE_CONTINUATION,
   REGEX_IDL_RESTART,
   REGEX_IDL_RETALL,
-  StopReason,
 } from '@idl/types/idl/idl-process';
 import { LINE_SEPARATOR } from '@idl/types/tokenizer';
 import { VSCODE_COMMANDS } from '@idl/types/vscode';
@@ -97,13 +95,6 @@ export class IDLDebugAdapter extends LoggingDebugSession {
   /** Are we listening to events from IDL or not? */
   listening = false;
 
-  /**
-   * Current location we are stopped at, only set/updated when we stop
-   *
-   * Exposed as a helper for testing to make sure we are in the right place
-   */
-  stopped?: { reason: StopReason; stack: IDLCallStackItem };
-
   /** Event to fire when our configuration has been completed, from VSCode example */
   private readonly _configurationDone = new Subject();