firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use runZonedGuarded() instead of deprecated onError. (#69160)

Browse Source
This commit is contained in:
Konstantin Scheglov 2020-10-28 08:43:31 -07:00 committed by GitHub
parent 55289324c6
commit 7b86be228e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/test/cupertino/refresh_test.dart
View File

@ -305,7 +305,7 @@ void main() {
final FlutterError error = FlutterError('Oops'); final FlutterError error = FlutterError('Oops');
double errorCount = 0; double errorCount = 0;
runZoned( runZonedGuarded(
() async { () async {
mockHelper.refreshCompleter = Completer<void>.sync(); mockHelper.refreshCompleter = Completer<void>.sync();
await tester.pumpWidget( await tester.pumpWidget(
@ -371,7 +371,7 @@ void main() {
))); )));
expect(mockHelper.invocations, hasLength(5)); expect(mockHelper.invocations, hasLength(5));
}, },
onError: (dynamic e) { (Object e, StackTrace stack) {
expect(e, error); expect(e, error);
expect(errorCount, 0); expect(errorCount, 0);
errorCount++; errorCount++;

16
packages/flutter_tools/test/general.shard/base/async_guard_test.dart
View File

@ -152,7 +152,7 @@ void main() {
final Completer<void> completer = Completer<void>(); final Completer<void> completer = Completer<void>();
await FakeAsync().run((FakeAsync time) { await FakeAsync().run((FakeAsync time) {
unawaited(runZoned(() async { unawaited(runZonedGuarded(() async {
final Future<void> f = asyncGuard<void>(() => delayedThrow(time)) final Future<void> f = asyncGuard<void>(() => delayedThrow(time))
.catchError((Object e, StackTrace s) { .catchError((Object e, StackTrace s) {
caughtByCatchError = true; caughtByCatchError = true;
@ -165,7 +165,7 @@ void main() {
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);
} }
}, onError: (Object e, StackTrace s) { }, (Object e, StackTrace s) {
caughtByZone = true; caughtByZone = true;
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);
@ -188,7 +188,7 @@ void main() {
final Completer<void> completer = Completer<void>(); final Completer<void> completer = Completer<void>();
await FakeAsync().run((FakeAsync time) { await FakeAsync().run((FakeAsync time) {
unawaited(runZoned(() async { unawaited(runZonedGuarded(() async {
final Future<void> f = asyncGuard<void>( final Future<void> f = asyncGuard<void>(
() => delayedThrow(time), () => delayedThrow(time),
onError: (Object e, StackTrace s) { onError: (Object e, StackTrace s) {
@ -203,7 +203,7 @@ void main() {
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);
} }
}, onError: (Object e, StackTrace s) { }, (Object e, StackTrace s) {
caughtByZone = true; caughtByZone = true;
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);
@ -226,7 +226,7 @@ void main() {
final Completer<void> completer = Completer<void>(); final Completer<void> completer = Completer<void>();
await FakeAsync().run((FakeAsync time) { await FakeAsync().run((FakeAsync time) {
unawaited(runZoned(() async { unawaited(runZonedGuarded(() async {
final Future<void> f = asyncGuard<void>( final Future<void> f = asyncGuard<void>(
() => delayedThrow(time), () => delayedThrow(time),
onError: (Object e) { onError: (Object e) {
@ -241,7 +241,7 @@ void main() {
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);
} }
}, onError: (Object e, StackTrace s) { }, (Object e, StackTrace s) {
caughtByZone = true; caughtByZone = true;
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);
@ -265,7 +265,7 @@ void main() {
final Completer<void> completer = Completer<void>(); final Completer<void> completer = Completer<void>();
await FakeAsync().run((FakeAsync time) { await FakeAsync().run((FakeAsync time) {
unawaited(runZoned(() async { unawaited(runZonedGuarded(() async {
final Future<void> f = asyncGuard<void>( final Future<void> f = asyncGuard<void>(
() => delayedThrow(time), () => delayedThrow(time),
onError: (Object e, [StackTrace s]) { onError: (Object e, [StackTrace s]) {
@ -281,7 +281,7 @@ void main() {
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);
} }
}, onError: (Object e, StackTrace s) { }, (Object e, StackTrace s) {
caughtByZone = true; caughtByZone = true;
if (!completer.isCompleted) { if (!completer.isCompleted) {
completer.complete(null); completer.complete(null);