Address comments

Author: derekxu16

dwds/test/instances/common/dot_shorthands_common.dart

@@ -28,7 +28,10 @@ void runTests({
   late String isolateId;
   late ScriptRef mainScript;
 
-  Future<void> onBreakPoint(breakPointId, body) => testInspector.onBreakPoint(
+  Future<void> onBreakpoint(
+    String breakPointId,
+    Future<void> Function(Event) body,
+  ) => testInspector.onBreakPoint(
     stream,
     isolateId,
     mainScript,
@@ -39,8 +42,8 @@ void runTests({
   Future<InstanceRef> getInstanceRef(frame, expression) =>
       testInspector.getInstanceRef(isolateId, frame, expression);
 
-  group('$compilationMode |', () {
-    setUpAll(() async {
+  group('$compilationMode | dot shorthands:', () {
+    setUp(() async {
       setCurrentLogWriter(debug: debug);
       await context.setUp(
         testSettings: TestSettings(
@@ -58,23 +61,20 @@ void runTests({
       isolateId = vm.isolates!.first.id!;
       final scripts = await service.getScripts(isolateId);
 
-      await service.streamListen('Debug');
-      stream = service.onEvent('Debug');
+      await service.streamListen(EventStreams.kDebug);
+      stream = service.onDebugEvent;
 
       mainScript = scripts.scripts!.firstWhere(
         (each) => each.uri!.contains('main.dart'),
       );
     });
 
-    tearDownAll(() async {
+    tearDown(() async {
       await context.tearDown();
     });
 
-    setUp(() => setCurrentLogWriter(debug: debug));
-    tearDown(() => service.resume(isolateId));
-
-    test('dot shorthands: expression evaluation', () async {
-      await onBreakPoint('testDotShorthands', (event) async {
+    test('expression evaluation and single-stepping', () async {
+      await onBreakpoint('testDotShorthands', (event) async {
         final frame = event.topFrame!.index!;
 
         var instanceRef = await getInstanceRef(frame, '(c = .two).value');
@@ -85,11 +85,7 @@ void runTests({
 
         instanceRef = await getInstanceRef(frame, '(c = .four()).value');
         expect(instanceRef.valueAsString, '4');
-      });
-    });
 
-    test('dot shorthands: single-stepping', () async {
-      await onBreakPoint('testDotShorthands', (event) async {
         final scriptBasename = basename(mainScript.uri!);
 
         const lineA = 116;
@@ -121,7 +117,6 @@ void runTests({
 
         final stops = <String>[];
         await testInspector.runStepIntoThroughProgramRecordingStops(
-          stream,
           isolateId,
           stops,
           provider.ddcModuleFormat == ModuleFormat.ddc ? 13 : 12,

dwds/test/instances/common/test_inspector.dart

@@ -233,7 +233,6 @@ class TestInspector {
   }
 
   Future<void> runStepIntoThroughProgramRecordingStops(
-    Stream<Event> debugStream,
     String isolateId,
 
     /// A list to which the pause location is added after each single-step.
@@ -248,7 +247,7 @@ class TestInspector {
     final completer = Completer<void>();
 
     late StreamSubscription subscription;
-    subscription = debugStream.listen((event) async {
+    subscription = service.onDebugEvent.listen((event) async {
       if (event.kind == EventKind.kPauseInterrupted) {
         final isolate = await service.getIsolate(isolateId);
         final frame = isolate.pauseEvent!.topFrame!;

dwds/test/instances/dot_shorthands_amd_canary_test.dart

@@ -16,8 +16,8 @@ import 'common/dot_shorthands_common.dart';
 
 void main() {
   // Enable verbose logging for debugging.
-  final debug = false;
-  final canaryFeatures = true;
+  const debug = false;
+  const canaryFeatures = true;
 
   group('canary: $canaryFeatures |', () {
     final provider = TestSdkConfigurationProvider(

dwds/test/instances/dot_shorthands_amd_test.dart

@@ -16,8 +16,8 @@ import 'common/dot_shorthands_common.dart';
 
 void main() {
   // Enable verbose logging for debugging.
-  final debug = false;
-  final canaryFeatures = false;
+  const debug = false;
+  const canaryFeatures = false;
 
   group('canary: $canaryFeatures |', () {
     final provider = TestSdkConfigurationProvider(

dwds/test/instances/dot_shorthands_ddc_library_bundle_test.dart

@@ -16,9 +16,9 @@ import 'common/dot_shorthands_common.dart';
 
 void main() {
   // Enable verbose logging for debugging.
-  final debug = false;
-  final canaryFeatures = true;
-  final compilationMode = CompilationMode.frontendServer;
+  const debug = false;
+  const canaryFeatures = true;
+  const compilationMode = CompilationMode.frontendServer;
 
   group('canary: $canaryFeatures |', () {
     final provider = TestSdkConfigurationProvider(