f8086c81ae
Collects files from `package:async_helper` and `tests/language` that are generally useful, so that all test-related helpers are in `package:expect`. Moves the two libraries from `package:async_helper` into `package:expect`, and the `tests/language/static_type_helper.dart` file too. Deprecates `async_minitest.dart`, to follow `minitest.dart`, expecting the Flutter use of it to have been fixed to not break on deprecation (I believe Flutter no longer breaks builds on deprecations at all). Patch 1 is the actual change. Patch 2+4+8 is changing all existing references to the files. Patch 6 ignores deprecation in files still using `async_minitest.dart`. 3+5+7+9 are updating this text to make the numbers match. Then it's just test-expectations and small tweaks from there. Change-Id: I1b665135b5fef9b9a0c3b340ffe9daf874d0174c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/373120 Reviewed-by: Nate Bosch <nbosch@google.com> Reviewed-by: Devon Carew <devoncarew@google.com> Commit-Queue: Lasse Nielsen <lrn@google.com>
177 lines
3.8 KiB
Dart
177 lines
3.8 KiB
Dart
// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
import "dart:async";
|
|
|
|
import "package:expect/async_helper.dart";
|
|
import "package:expect/expect.dart";
|
|
|
|
class Tracer {
|
|
final String expected;
|
|
final String? name;
|
|
String _trace = "";
|
|
|
|
Tracer(this.expected, [this.name]);
|
|
|
|
void trace(msg) {
|
|
if (name != null) {
|
|
print("Tracing $name: $msg");
|
|
}
|
|
_trace += msg;
|
|
}
|
|
|
|
void done() {
|
|
Expect.equals(expected, _trace);
|
|
}
|
|
}
|
|
|
|
Future<void> test1(Tracer tracer) {
|
|
Future<void> foo() async {
|
|
var savedStackTrace;
|
|
try {
|
|
try {
|
|
tracer.trace("a");
|
|
throw "Error";
|
|
} catch (e, st) {
|
|
tracer.trace("b");
|
|
savedStackTrace = st;
|
|
}
|
|
tracer.trace("c");
|
|
await new Future.error("Error 2", savedStackTrace);
|
|
tracer.trace("d");
|
|
} catch (e, st) {
|
|
tracer.trace("e");
|
|
Expect.equals(savedStackTrace.toString(), st.toString());
|
|
}
|
|
tracer.trace("f");
|
|
}
|
|
|
|
return foo();
|
|
}
|
|
|
|
Future<List<void>> test1star(Tracer tracer) {
|
|
Stream<void> foo() async* {
|
|
var savedStackTrace;
|
|
try {
|
|
try {
|
|
tracer.trace("a");
|
|
throw "Error";
|
|
} catch (e, st) {
|
|
tracer.trace("b");
|
|
savedStackTrace = st;
|
|
}
|
|
tracer.trace("c");
|
|
await new Future.error("Error 2", savedStackTrace);
|
|
tracer.trace("d");
|
|
} catch (e, st) {
|
|
tracer.trace("e");
|
|
Expect.equals(savedStackTrace.toString(), st.toString());
|
|
}
|
|
tracer.trace("f");
|
|
}
|
|
|
|
return foo().toList();
|
|
}
|
|
|
|
Future<void> test2(Tracer tracer) {
|
|
var savedStackTrace;
|
|
Future<void> foo() async {
|
|
try {
|
|
tracer.trace("a");
|
|
throw "Error";
|
|
} catch (e, st) {
|
|
tracer.trace("b");
|
|
savedStackTrace = st;
|
|
}
|
|
tracer.trace("c");
|
|
await new Future.error("Error 2", savedStackTrace);
|
|
tracer.trace("d");
|
|
}
|
|
|
|
return foo().catchError((e, st) {
|
|
tracer.trace("e");
|
|
Expect.equals(savedStackTrace.toString(), st.toString());
|
|
});
|
|
}
|
|
|
|
Future<List<void>> test2star(Tracer tracer) {
|
|
var savedStackTrace;
|
|
Stream<void> foo() async* {
|
|
try {
|
|
tracer.trace("a");
|
|
throw "Error";
|
|
} catch (e, st) {
|
|
tracer.trace("b");
|
|
savedStackTrace = st;
|
|
}
|
|
tracer.trace("c");
|
|
await new Future.error("Error 2", savedStackTrace);
|
|
tracer.trace("d");
|
|
}
|
|
|
|
return foo().toList().catchError((e, st) {
|
|
tracer.trace("e");
|
|
Expect.equals(savedStackTrace.toString(), st.toString());
|
|
return [];
|
|
});
|
|
}
|
|
|
|
Future<void> test3(Tracer tracer) {
|
|
var savedStackTrace;
|
|
Future<void> foo() async {
|
|
try {
|
|
tracer.trace("a");
|
|
throw "Error";
|
|
} catch (e, st) {
|
|
tracer.trace("b");
|
|
savedStackTrace = st;
|
|
rethrow;
|
|
}
|
|
}
|
|
|
|
return foo().catchError((e, st) {
|
|
tracer.trace("c");
|
|
Expect.equals(savedStackTrace.toString(), st.toString());
|
|
});
|
|
}
|
|
|
|
Future<List<void>> test3star(Tracer tracer) {
|
|
var savedStackTrace;
|
|
Stream<void> foo() async* {
|
|
try {
|
|
tracer.trace("a");
|
|
throw "Error";
|
|
} catch (e, st) {
|
|
tracer.trace("b");
|
|
savedStackTrace = st;
|
|
rethrow;
|
|
}
|
|
}
|
|
|
|
return foo().toList().catchError((e, st) {
|
|
tracer.trace("c");
|
|
Expect.equals(savedStackTrace.toString(), st.toString());
|
|
return [];
|
|
});
|
|
}
|
|
|
|
runTest(String expectedTrace, Future test(Tracer tracer)) async {
|
|
Tracer tracer = new Tracer(expectedTrace);
|
|
await test(tracer);
|
|
tracer.done();
|
|
}
|
|
|
|
Future runTests() async {
|
|
await runTest("abcef", test1);
|
|
await runTest("abcef", test1star);
|
|
await runTest("abce", test2);
|
|
await runTest("abce", test2star);
|
|
await runTest("abc", test3);
|
|
await runTest("abc", test3star);
|
|
}
|
|
|
|
main() {
|
|
asyncTest(runTests);
|
|
}
|