[test] Update async stepping tests to reflect the status quo.
Note that stepping behavior has degraded since support for Dart was removed, and now includes spurious steps through the async implementation.
Bug: https://github.com/dart-lang/sdk/issues/34746
Change-Id: I573e1a945d96a9ddda839f22e66e1f68202005c5
Reviewed-on: https://dart-review.googlesource.com/c/86828
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
diff --git a/runtime/observatory/tests/service/async_generator_breakpoint_test.dart b/runtime/observatory/tests/service/async_generator_breakpoint_test.dart
index e127cdf..af14028 100644
--- a/runtime/observatory/tests/service/async_generator_breakpoint_test.dart
+++ b/runtime/observatory/tests/service/async_generator_breakpoint_test.dart
@@ -10,19 +10,21 @@
import 'test_helper.dart';
printSync() {
- print('sync'); // Line 12
+ print('sync'); // Line 13
}
printAsync() async {
- print('async'); // Line 16
+ await null;
+ print('async'); // Line 18
}
printAsyncStar() async* {
- print('async*'); // Line 20
+ await null;
+ print('async*'); // Line 23
}
printSyncStar() sync* {
- print('sync*'); // Line 24
+ print('sync*'); // Line 27
}
var testerReady = false;
@@ -39,7 +41,7 @@
var stream = printAsyncStar();
var iterator = printSyncStar();
- print('middle'); // Line 42
+ print('middle'); // Line 44
future.then((v) => print(v));
stream.toList();
@@ -50,19 +52,19 @@
await isolate.rootLibrary.load();
var script = isolate.rootLibrary.scripts[0];
- var bp1 = await isolate.addBreakpoint(script, 12);
+ var bp1 = await isolate.addBreakpoint(script, 13);
expect(bp1, isNotNull);
expect(bp1 is Breakpoint, isTrue);
- var bp2 = await isolate.addBreakpoint(script, 16);
+ var bp2 = await isolate.addBreakpoint(script, 18);
expect(bp2, isNotNull);
expect(bp2 is Breakpoint, isTrue);
- var bp3 = await isolate.addBreakpoint(script, 20);
+ var bp3 = await isolate.addBreakpoint(script, 23);
expect(bp3, isNotNull);
expect(bp3 is Breakpoint, isTrue);
- var bp4 = await isolate.addBreakpoint(script, 24);
+ var bp4 = await isolate.addBreakpoint(script, 27);
expect(bp4, isNotNull);
expect(bp4 is Breakpoint, isTrue);
- var bp5 = await isolate.addBreakpoint(script, 42);
+ var bp5 = await isolate.addBreakpoint(script, 44);
print("BP5 - $bp5");
expect(bp5, isNotNull);
expect(bp5 is Breakpoint, isTrue);
diff --git a/runtime/observatory/tests/service/async_single_step_exception_test.dart b/runtime/observatory/tests/service/async_single_step_exception_test.dart
index a6b484e..d269a72 100644
--- a/runtime/observatory/tests/service/async_single_step_exception_test.dart
+++ b/runtime/observatory/tests/service/async_single_step_exception_test.dart
@@ -38,27 +38,41 @@
var tests = <IsolateTest>[
hasStoppedAtBreakpoint,
- stoppedAtLine(LINE_C),
- stepOver, // print.
+ stoppedAtLine(LINE_C), // print mmmm
+ smartNext,
+
hasStoppedAtBreakpoint,
- stoppedAtLine(LINE_D),
+ stoppedAtLine(LINE_D), // await helper
stepInto,
+
hasStoppedAtBreakpoint,
- stoppedAtLine(LINE_A),
- stepOver, // print.
+ stoppedAtLine(LINE_A), // print helper
+ smartNext,
+
hasStoppedAtBreakpoint,
- stoppedAtLine(LINE_B), // throw 'a'.
- stepInto, // exit helper via a throw.
+ stoppedAtLine(LINE_B), // throw a
+ smartNext,
+
hasStoppedAtBreakpoint,
- stepInto, // exit helper via a throw.
+ stoppedAtLine(22), // } (weird dispatching)
+ smartNext,
+
hasStoppedAtBreakpoint,
- stepInto, // step once from entry to main.
+ stoppedAtLine(LINE_D), // await helper (weird dispatching)
+ smartNext,
+
hasStoppedAtBreakpoint,
stoppedAtLine(LINE_E), // print(error)
- stepOver,
+ smartNext,
+
+ hasStoppedAtBreakpoint,
+ stoppedAtLine(LINE_E), // print(error) (weird finally dispatching)
+ smartNext,
+
hasStoppedAtBreakpoint,
stoppedAtLine(LINE_F), // print(foo)
- stepOver,
+ smartNext,
+
hasStoppedAtBreakpoint,
stoppedAtLine(LINE_G), // print(z)
resumeIsolate
diff --git a/runtime/observatory/tests/service/async_single_step_out_test.dart b/runtime/observatory/tests/service/async_single_step_out_test.dart
index bd9258b..fc38d2f 100644
--- a/runtime/observatory/tests/service/async_single_step_out_test.dart
+++ b/runtime/observatory/tests/service/async_single_step_out_test.dart
@@ -27,18 +27,30 @@
var tests = <IsolateTest>[
hasStoppedAtBreakpoint,
- stoppedAtLine(LINE_C),
- stepOver, // print.
+ stoppedAtLine(LINE_C), // print mmmm
+ stepOver,
+
hasStoppedAtBreakpoint,
- stoppedAtLine(LINE_D),
+ stoppedAtLine(LINE_D), // await helper
stepInto,
+
hasStoppedAtBreakpoint,
- stoppedAtLine(LINE_A),
- stepOver, // print.
+ stoppedAtLine(LINE_A), // print.
+ stepOver,
+
hasStoppedAtBreakpoint,
stoppedAtLine(LINE_B), // return null.
stepInto, // exit helper via a single step.
+
hasStoppedAtBreakpoint,
+ stoppedAtLine(19), // return null (weird dispatching)
+ stepInto, // exit helper via a single step.
+
+ hasStoppedAtBreakpoint,
+ stoppedAtLine(24), // await helper (weird dispatching)
+ smartNext,
+
+ hasStoppedAtBreakpoint, //19
stoppedAtLine(LINE_E), // arrive after the await.
resumeIsolate
];
diff --git a/runtime/observatory/tests/service/positive_token_pos_test.dart b/runtime/observatory/tests/service/positive_token_pos_test.dart
index b3c8914..5bf9cb2 100644
--- a/runtime/observatory/tests/service/positive_token_pos_test.dart
+++ b/runtime/observatory/tests/service/positive_token_pos_test.dart
@@ -28,7 +28,7 @@
expect(stack['frames'].length, greaterThan(3));
var frame = stack['frames'][0];
- expect(frame.function.name, equals('Completer.sync'));
+ expect(frame.function.name, equals('_AsyncAwaitCompleter'));
expect(await frame.location.getLine(), greaterThan(0));
expect(await frame.location.getColumn(), greaterThan(0));
diff --git a/runtime/observatory/tests/service/service_kernel.status b/runtime/observatory/tests/service/service_kernel.status
index 96b5aa8..35ac7f7 100644
--- a/runtime/observatory/tests/service/service_kernel.status
+++ b/runtime/observatory/tests/service/service_kernel.status
@@ -5,8 +5,6 @@
[ $compiler == app_jitk ]
add_breakpoint_rpc_test: RuntimeError
async_generator_breakpoint_test: Skip # No incremental compiler available.
-async_single_step_exception_test: RuntimeError
-async_single_step_out_test: RuntimeError
bad_reload_test: RuntimeError
break_on_activation_test: Skip # No incremental compiler available.
complex_reload_test: RuntimeError
@@ -37,7 +35,6 @@
instance_field_order_rpc_test: Skip # No incremental compiler available.
local_variable_declaration_test: RuntimeError
pause_on_exceptions_test: Skip # No incremental compiler available.
-positive_token_pos_test: RuntimeError
rewind_optimized_out_test: RuntimeError
rewind_test: RuntimeError
set_name_rpc_test: RuntimeError
@@ -50,16 +47,12 @@
# These are the non-kernel specific versions so skip tests and allow errors.
[ $compiler == dartk ]
add_breakpoint_rpc_test: SkipByDesign # non-kernel specific version of add_breakpoint_rpc_kernel_test.
-async_generator_breakpoint_test: RuntimeError # http://dartbug.com/34746 - Test tests old --no-sync-async behavior
-async_single_step_exception_test: RuntimeError # http://dartbug.com/34746 - Test tests old --no-sync-async behavior
-async_single_step_out_test: RuntimeError # http://dartbug.com/34746 - Test tests old --no-sync-async behavior
bad_reload_test: RuntimeError # Issue 34025
coverage_optimized_function_test: Pass, Slow
evaluate_activation_in_method_class_test: RuntimeError
evaluate_activation_test/instance: RuntimeError # http://dartbug.com/20047
evaluate_activation_test/scope: RuntimeError # http://dartbug.com/20047
pause_on_unhandled_async_exceptions2_test: Pass, Slow
-positive_token_pos_test: RuntimeError # http://dartbug.com/34746 - Test tests old --no-sync-async behavior
unused_changes_in_last_reload_test: RuntimeError
[ $compiler == dartkp ]
