Skip to content

Commit 7771884

Browse files
authored
Handle breaking changes in leak_tracker. (#135185)
1 parent 5708b76 commit 7771884

File tree

8 files changed

+48
-22
lines changed

8 files changed

+48
-22
lines changed

packages/flutter/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ dev_dependencies:
2222
flutter_goldens:
2323
sdk: flutter
2424
fake_async: 1.3.1
25-
leak_tracker: 9.0.6
26-
leak_tracker_flutter_testing: 1.0.3
25+
leak_tracker: 9.0.7
26+
leak_tracker_flutter_testing: 1.0.5
2727

2828
_fe_analyzer_shared: 64.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2929
analyzer: 6.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -42,7 +42,7 @@ dev_dependencies:
4242
intl: 0.18.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4343
io: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4444
js: 0.6.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
45-
leak_tracker_testing: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
45+
leak_tracker_testing: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4646
logging: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4747
matcher: 0.12.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4848
mime: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,4 +74,4 @@ dev_dependencies:
7474
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7575
yaml: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7676

77-
# PUBSPEC CHECKSUM: 5f92
77+
# PUBSPEC CHECKSUM: a796

packages/flutter/test/material/material_states_controller_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ void main() {
1313
expect(MaterialStatesController(<MaterialState>{MaterialState.selected}).value, <MaterialState>{MaterialState.selected});
1414
});
1515

16-
test('MaterialStatesController dispatches memory events', () {
17-
expect(()=> MaterialStatesController().dispose(), dispatchesMemoryEvents(MaterialStatesController));
16+
test('MaterialStatesController dispatches memory events', () async {
17+
await expectLater(
18+
await memoryEvents(() => MaterialStatesController().dispose(), MaterialStatesController),
19+
areCreateAndDispose,
20+
);
1821
});
1922

2023
test('MaterialStatesController update, listener', () {

packages/flutter/test/services/restoration_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ import 'restoration.dart';
1414

1515
void main() {
1616
testWidgetsWithLeakTracking('$RestorationManager dispatches memory events', (WidgetTester tester) async {
17-
expect(() => RestorationManager().dispose(), dispatchesMemoryEvents(RestorationManager));
17+
await expectLater(
18+
await memoryEvents(() => RestorationManager().dispose(), RestorationManager),
19+
areCreateAndDispose,
20+
);
1821
});
1922

2023
group('RestorationManager', () {

packages/flutter/test/widgets/focus_manager_test.dart

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,12 +1770,18 @@ void main() {
17701770
tester.binding.focusManager.removeListener(handleFocusChange);
17711771
});
17721772

1773-
test('$FocusManager dispatches object creation in constructor', () {
1774-
expect(()=> FocusManager().dispose(), dispatchesMemoryEvents(FocusManager));
1773+
test('$FocusManager dispatches object creation in constructor', () async {
1774+
await expectLater(
1775+
await memoryEvents(() => FocusManager().dispose(), FocusManager),
1776+
areCreateAndDispose,
1777+
);
17751778
});
17761779

1777-
test('$FocusNode dispatches object creation in constructor', () {
1778-
expect(()=> FocusNode().dispose(), dispatchesMemoryEvents(FocusNode));
1780+
test('$FocusNode dispatches object creation in constructor', () async {
1781+
await expectLater(
1782+
await memoryEvents(() => FocusNode().dispose(), FocusNode),
1783+
areCreateAndDispose,
1784+
);
17791785
});
17801786

17811787
testWidgetsWithLeakTracking('FocusManager notifies listeners when a widget loses focus because it was removed.', (WidgetTester tester) async {

packages/flutter/test/widgets/restorable_property_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ void main() {
5959
});
6060

6161
testWidgetsWithLeakTracking('$RestorableProperty dispatches creation in constructor', (WidgetTester widgetTester) async {
62-
expect(() => RestorableDateTimeN(null).dispose(), dispatchesMemoryEvents(RestorableDateTimeN));
62+
await expectLater(
63+
await memoryEvents(() => RestorableDateTimeN(null).dispose(), RestorableDateTimeN),
64+
areCreateAndDispose,
65+
);
6366
});
6467

6568
testWidgetsWithLeakTracking('work when not in restoration scope', (WidgetTester tester) async {

packages/flutter/test/widgets/router_test.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,14 +1584,16 @@ testWidgets('ChildBackButtonDispatcher take priority recursively', (WidgetTester
15841584
});
15851585
});
15861586

1587-
test('$PlatformRouteInformationProvider dispatches object creation in constructor', () {
1588-
void createAndDispose() {
1587+
test('$PlatformRouteInformationProvider dispatches object creation in constructor', () async {
1588+
Future<void> createAndDispose() async {
15891589
PlatformRouteInformationProvider(
15901590
initialRouteInformation: RouteInformation(uri: Uri.parse('http://google.com')),
15911591
).dispose();
15921592
}
1593-
1594-
expect(createAndDispose, dispatchesMemoryEvents(PlatformRouteInformationProvider));
1593+
await expectLater(
1594+
await memoryEvents(createAndDispose, PlatformRouteInformationProvider),
1595+
areCreateAndDispose,
1596+
);
15951597
});
15961598
}
15971599

packages/flutter/test/widgets/scroll_controller_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,10 @@ void main() {
409409
expect(isScrolling, isTrue);
410410
});
411411

412-
test('$ScrollController dispatches object creation in constructor', () {
413-
expect(() => ScrollController().dispose(), dispatchesMemoryEvents(ScrollController));
412+
test('$ScrollController dispatches object creation in constructor', () async {
413+
await expectLater(
414+
await memoryEvents(() => ScrollController().dispose(), ScrollController),
415+
areCreateAndDispose,
416+
);
414417
});
415418
}

packages/flutter/test/widgets/shortcuts_test.dart

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,11 @@ void main() {
672672
expect(pressedKeys, isEmpty);
673673
});
674674

675-
test('$ShortcutManager dispatches object creation in constructor', () {
676-
expect(()=> ShortcutManager().dispose(), dispatchesMemoryEvents(ShortcutManager));
675+
test('$ShortcutManager dispatches object creation in constructor', () async {
676+
await expectLater(
677+
await memoryEvents(() => ShortcutManager().dispose(), ShortcutManager),
678+
areCreateAndDispose,
679+
);
677680
});
678681

679682
testWidgetsWithLeakTracking("Shortcuts passes to the next Shortcuts widget if it doesn't map the key", (WidgetTester tester) async {
@@ -1872,8 +1875,11 @@ void main() {
18721875
token.dispose();
18731876
});
18741877

1875-
test('dispatches object creation in constructor', () {
1876-
expect(()=> ShortcutRegistry().dispose(), dispatchesMemoryEvents(ShortcutRegistry));
1878+
test('dispatches object creation in constructor', () async {
1879+
await expectLater(
1880+
await memoryEvents(() => ShortcutRegistry().dispose(), ShortcutRegistry),
1881+
areCreateAndDispose,
1882+
);
18771883
});
18781884
});
18791885
}

0 commit comments

Comments
 (0)