@@ -30,6 +30,7 @@ void main() {
30
30
});
31
31
32
32
final RestorationManager manager = RestorationManager ();
33
+ addTearDown (manager.dispose);
33
34
final Future <RestorationBucket ?> rootBucketFuture = manager.rootBucket;
34
35
RestorationBucket ? rootBucket;
35
36
rootBucketFuture.then ((RestorationBucket ? bucket) {
@@ -65,20 +66,17 @@ void main() {
65
66
});
66
67
expect (synchronousBucket, isNotNull);
67
68
expect (synchronousBucket, same (rootBucket));
68
- },
69
- // TODO(NobodyForNothing): Remove after fixing and cover remaining file
70
- // with leak tests https://github.com/flutter/flutter/issues/134831
71
- leakTrackingTestConfig: const LeakTrackingTestConfig (notDisposedAllowList:
72
- < String , int ? > {'RestorationManager' : 1 }));
69
+ });
73
70
74
- testWidgets ('root bucket received from engine before retrieval' , (WidgetTester tester) async {
71
+ testWidgetsWithLeakTracking ('root bucket received from engine before retrieval' , (WidgetTester tester) async {
75
72
SystemChannels .restoration.setMethodCallHandler (null );
76
73
final List <MethodCall > callsToEngine = < MethodCall > [];
77
74
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler (SystemChannels .restoration, (MethodCall call) async {
78
75
callsToEngine.add (call);
79
76
return null ;
80
77
});
81
78
final RestorationManager manager = RestorationManager ();
79
+ addTearDown (manager.dispose);
82
80
83
81
await _pushDataFromEngine (_createEncodedRestorationData1 ());
84
82
@@ -90,7 +88,7 @@ void main() {
90
88
expect (callsToEngine, isEmpty);
91
89
});
92
90
93
- testWidgets ('root bucket received while engine retrieval is pending' , (WidgetTester tester) async {
91
+ testWidgetsWithLeakTracking ('root bucket received while engine retrieval is pending' , (WidgetTester tester) async {
94
92
SystemChannels .restoration.setMethodCallHandler (null );
95
93
final List <MethodCall > callsToEngine = < MethodCall > [];
96
94
final Completer <Map <dynamic , dynamic >> result = Completer <Map <dynamic , dynamic >>();
@@ -99,6 +97,7 @@ void main() {
99
97
return result.future;
100
98
});
101
99
final RestorationManager manager = RestorationManager ();
100
+ addTearDown (manager.dispose);
102
101
103
102
RestorationBucket ? rootBucket;
104
103
manager.rootBucket.then ((RestorationBucket ? bucket) => rootBucket = bucket);
@@ -120,11 +119,12 @@ void main() {
120
119
expect (rootBucket2! .contains ('foo' ), isFalse);
121
120
});
122
121
123
- testWidgets ('root bucket is properly replaced when new data is available' , (WidgetTester tester) async {
122
+ testWidgetsWithLeakTracking ('root bucket is properly replaced when new data is available' , (WidgetTester tester) async {
124
123
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler (SystemChannels .restoration, (MethodCall call) async {
125
124
return _createEncodedRestorationData1 ();
126
125
});
127
126
final RestorationManager manager = RestorationManager ();
127
+ addTearDown (manager.dispose);
128
128
RestorationBucket ? rootBucket;
129
129
manager.rootBucket.then ((RestorationBucket ? bucket) {
130
130
rootBucket = bucket;
@@ -160,7 +160,7 @@ void main() {
160
160
expect (newChild.read <String >('bar' ), 'Hello' );
161
161
});
162
162
163
- testWidgets ('returns null as root bucket when restoration is disabled' , (WidgetTester tester) async {
163
+ testWidgetsWithLeakTracking ('returns null as root bucket when restoration is disabled' , (WidgetTester tester) async {
164
164
final List <MethodCall > callsToEngine = < MethodCall > [];
165
165
final Completer <Map <dynamic , dynamic >> result = Completer <Map <dynamic , dynamic >>();
166
166
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler (SystemChannels .restoration, (MethodCall call) {
@@ -171,6 +171,7 @@ void main() {
171
171
final RestorationManager manager = RestorationManager ()..addListener (() {
172
172
listenerCount++ ;
173
173
});
174
+ addTearDown (manager.dispose);
174
175
RestorationBucket ? rootBucket;
175
176
bool rootBucketResolved = false ;
176
177
manager.rootBucket.then ((RestorationBucket ? bucket) {
@@ -203,7 +204,7 @@ void main() {
203
204
expect (rootBucket, isNull);
204
205
});
205
206
206
- testWidgets ('flushData' , (WidgetTester tester) async {
207
+ testWidgetsWithLeakTracking ('flushData' , (WidgetTester tester) async {
207
208
final List <MethodCall > callsToEngine = < MethodCall > [];
208
209
final Completer <Map <dynamic , dynamic >> result = Completer <Map <dynamic , dynamic >>();
209
210
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler (SystemChannels .restoration, (MethodCall call) {
@@ -212,6 +213,7 @@ void main() {
212
213
});
213
214
214
215
final RestorationManager manager = RestorationManager ();
216
+ addTearDown (manager.dispose);
215
217
final Future <RestorationBucket ?> rootBucketFuture = manager.rootBucket;
216
218
RestorationBucket ? rootBucket;
217
219
rootBucketFuture.then ((RestorationBucket ? bucket) {
@@ -239,13 +241,14 @@ void main() {
239
241
expect (callsToEngine, hasLength (1 ));
240
242
});
241
243
242
- testWidgets ('isReplacing' , (WidgetTester tester) async {
244
+ testWidgetsWithLeakTracking ('isReplacing' , (WidgetTester tester) async {
243
245
final Completer <Map <dynamic , dynamic >> result = Completer <Map <dynamic , dynamic >>();
244
246
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler (SystemChannels .restoration, (MethodCall call) {
245
247
return result.future;
246
248
});
247
249
248
250
final TestRestorationManager manager = TestRestorationManager ();
251
+ addTearDown (manager.dispose);
249
252
expect (manager.isReplacing, isFalse);
250
253
251
254
RestorationBucket ? rootBucket;
0 commit comments