commit 1c8a22605d0e96a19d0d86e9454b550faae8bd74
author Derek Xu <derekx@google.com> Mon Dec 16 08:14:21 2024 -0800
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Dec 16 08:14:21 2024 -0800
tree 0b882c42982d8d37529b39404ce8d540583aa6ee
parent 397a397f7bf5695ee92fecdb94e18ee629fac96e

[VM/Service] Add `stoppedAtLineColumn` helper to `service_test_common.dart`

Change-Id: Iba6d24eaaa521b428f2df72c887de11302b2f037
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398980
Reviewed-by: Ben Konyi <bkonyi@google.com>

pkg/vm_service/test/common/service_test_common.dart

diff --git a/pkg/vm_service/test/common/service_test_common.dart b/pkg/vm_service/test/common/service_test_common.dart
index 8ec0caa..cf9d9c8 100644
--- a/pkg/vm_service/test/common/service_test_common.dart
+++ b/pkg/vm_service/test/common/service_test_common.dart
@@ -212,12 +212,12 @@
 }
 
 extension FrameLocation on Frame {
-  Future<(String, int)> getLocation(
+  Future<(String uri, (int line, int column))> getLocation(
     VmService service,
     IsolateRef isolateRef,
   ) async {
     if (location?.tokenPos == null) {
-      return ('<unknown>', -1);
+      return ('<unknown>', (-1, -1));
     }
 
     final script = (await service.getObject(
@@ -226,7 +226,10 @@
     )) as Script;
     return (
       script.uri!,
-      script.getLineNumberFromTokenPos(location!.tokenPos!) ?? -1
+      (
+        script.getLineNumberFromTokenPos(location!.tokenPos!) ?? -1,
+        script.getColumnNumberFromTokenPos(location!.tokenPos!) ?? -1
+      )
     );
   }
 }
@@ -244,7 +247,7 @@
       sb.write(await qualifiedFunctionName(service, isolateRef, funcRef));
     }
     if (f.location != null) {
-      final (uri, lineNo) = await f.getLocation(service, isolateRef);
+      final (uri, (lineNo)) = await f.getLocation(service, isolateRef);
       sb.write(' $uri:$lineNo');
     }
     sb.writeln();
@@ -267,9 +270,17 @@
   return sb.toString();
 }
 
-IsolateTest stoppedAtLine(int line) {
+/// If column is [null], this function checks that the isolate under test is
+/// currently paused at line [line]. Otherwise, this function checks that the
+/// isolate under test is currently paused at the location specified by [line]
+/// and [column].
+IsolateTest stoppedAtLineColumn({required int line, int? column}) {
   return (VmService service, IsolateRef isolateRef) async {
-    print('Checking we are at line $line');
+    if (column == null) {
+      print('Checking we are at line $line');
+    } else {
+      print('Checking we are at $line:$column');
+    }
 
     // Make sure that the isolate has stopped.
     final id = isolateRef.id!;
@@ -283,19 +294,32 @@
     expect(frames.length, greaterThanOrEqualTo(1));
 
     final top = frames[0];
-    final (_, actualLine) = await top.getLocation(service, isolateRef);
+    final (_, (actualLine, actualColumn)) =
+        await top.getLocation(service, isolateRef);
     if (actualLine != line) {
-      print('Actual: $actualLine Line: $line');
       final sb = StringBuffer();
-      sb.write('Expected to be at line $line but actually at line $actualLine');
+      sb.writeln(
+        'Expected to be at line $line but actually at line $actualLine',
+      );
+      sb.writeln(await formatStack(service, isolateRef, stack));
+      throw sb.toString();
+    } else if (column != null && actualColumn != column) {
+      final sb = StringBuffer();
+      sb.writeln(
+        'Expected to be at $line:$column but actually at $line:$actualColumn',
+      );
       sb.writeln(await formatStack(service, isolateRef, stack));
       throw sb.toString();
     } else {
-      print('Program is stopped at line: $line');
+      print('Program is stopped at $actualLine:$actualColumn');
     }
   };
 }
 
+IsolateTest stoppedAtLine(int line) {
+  return stoppedAtLineColumn(line: line);
+}
+
 Future<void> resumeIsolate(VmService service, IsolateRef isolate) async {
   final Completer completer = Completer();
   late StreamSubscription<Event> subscription;