Skip to content

Commit 0a9cf7f

Browse files
PIG208PIG208
committed
test [nfc]: Remove WidgetTester from testWidgets tests.
This consists of handpicked output from running the dart lint fix for code `avoid_types_on_closure_parameters`. We probably don't need to enable this linter rule because in many cases the type annotation improves readability. For the `(WidgetTester tester)` case, though, it is common and intuitive enough that the annotation shouldn't be necessary. See also: zulip#762 (comment) Signed-off-by: Zixuan James Li <[email protected]>
1 parent cca6f24 commit 0a9cf7f

12 files changed

+93
-93
lines changed

‎test/widgets/action_sheet_test.dart

+17-17
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void main() {
102102
await tester.pump(); // [MenuItemButton.onPressed] called in a post-frame callback: flutter/flutter@e4a39fa2e
103103
}
104104

105-
testWidgets('success', (WidgetTester tester) async {
105+
testWidgets('success', (tester) async {
106106
final message = eg.streamMessage();
107107
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
108108
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -122,7 +122,7 @@ void main() {
122122
});
123123
});
124124

125-
testWidgets('request has an error', (WidgetTester tester) async {
125+
testWidgets('request has an error', (tester) async {
126126
final message = eg.streamMessage();
127127
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
128128
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -156,7 +156,7 @@ void main() {
156156
await tester.pump(); // [MenuItemButton.onPressed] called in a post-frame callback: flutter/flutter@e4a39fa2e
157157
}
158158

159-
testWidgets('star success', (WidgetTester tester) async {
159+
testWidgets('star success', (tester) async {
160160
final message = eg.streamMessage(flags: []);
161161
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
162162
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -176,7 +176,7 @@ void main() {
176176
});
177177
});
178178

179-
testWidgets('unstar success', (WidgetTester tester) async {
179+
testWidgets('unstar success', (tester) async {
180180
final message = eg.streamMessage(flags: [MessageFlag.starred]);
181181
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
182182
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -196,7 +196,7 @@ void main() {
196196
});
197197
});
198198

199-
testWidgets('star request has an error', (WidgetTester tester) async {
199+
testWidgets('star request has an error', (tester) async {
200200
final message = eg.streamMessage(flags: []);
201201
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
202202
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -217,7 +217,7 @@ void main() {
217217
expectedMessage: 'Invalid message(s)')));
218218
});
219219

220-
testWidgets('unstar request has an error', (WidgetTester tester) async {
220+
testWidgets('unstar request has an error', (tester) async {
221221
final message = eg.streamMessage(flags: [MessageFlag.starred]);
222222
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
223223
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -288,7 +288,7 @@ void main() {
288288
check(contentController).not((it) => it.validationErrors.contains(ContentValidationError.quoteAndReplyInProgress));
289289
}
290290

291-
testWidgets('in channel narrow', (WidgetTester tester) async {
291+
testWidgets('in channel narrow', (tester) async {
292292
final message = eg.streamMessage();
293293
await setupToMessageActionSheet(tester, message: message, narrow: ChannelNarrow(message.streamId));
294294
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -306,7 +306,7 @@ void main() {
306306
valueBefore: valueBefore, message: message, rawContent: 'Hello world');
307307
});
308308

309-
testWidgets('in topic narrow', (WidgetTester tester) async {
309+
testWidgets('in topic narrow', (tester) async {
310310
final message = eg.streamMessage();
311311
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
312312
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -324,7 +324,7 @@ void main() {
324324
valueBefore: valueBefore, message: message, rawContent: 'Hello world');
325325
});
326326

327-
testWidgets('in DM narrow', (WidgetTester tester) async {
327+
testWidgets('in DM narrow', (tester) async {
328328
final message = eg.dmMessage(from: eg.selfUser, to: [eg.otherUser]);
329329
await setupToMessageActionSheet(tester,
330330
message: message, narrow: DmNarrow.ofMessage(message, selfUserId: eg.selfUser.userId));
@@ -343,7 +343,7 @@ void main() {
343343
valueBefore: valueBefore, message: message, rawContent: 'Hello world');
344344
});
345345

346-
testWidgets('request has an error', (WidgetTester tester) async {
346+
testWidgets('request has an error', (tester) async {
347347
final message = eg.streamMessage();
348348
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
349349
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -372,13 +372,13 @@ void main() {
372372
));
373373
});
374374

375-
testWidgets('not offered in CombinedFeedNarrow (composing to reply is not yet supported)', (WidgetTester tester) async {
375+
testWidgets('not offered in CombinedFeedNarrow (composing to reply is not yet supported)', (tester) async {
376376
final message = eg.streamMessage();
377377
await setupToMessageActionSheet(tester, message: message, narrow: const CombinedFeedNarrow());
378378
check(findQuoteAndReplyButton(tester)).isNull();
379379
});
380380

381-
testWidgets('not offered in MentionsNarrow (composing to reply is not yet supported)', (WidgetTester tester) async {
381+
testWidgets('not offered in MentionsNarrow (composing to reply is not yet supported)', (tester) async {
382382
final message = eg.streamMessage();
383383
await setupToMessageActionSheet(tester, message: message, narrow: const MentionsNarrow());
384384
check(findQuoteAndReplyButton(tester)).isNull();
@@ -399,7 +399,7 @@ void main() {
399399
await tester.pump(); // [MenuItemButton.onPressed] called in a post-frame callback: flutter/flutter@e4a39fa2e
400400
}
401401

402-
testWidgets('success', (WidgetTester tester) async {
402+
testWidgets('success', (tester) async {
403403
final message = eg.streamMessage();
404404
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
405405
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -435,7 +435,7 @@ void main() {
435435
matching: find.text(zulipLocalizations.successMessageTextCopied)));
436436
});
437437

438-
testWidgets('request has an error', (WidgetTester tester) async {
438+
testWidgets('request has an error', (tester) async {
439439
final message = eg.streamMessage();
440440
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
441441
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
@@ -496,7 +496,7 @@ void main() {
496496
await tester.pump(); // [MenuItemButton.onPressed] called in a post-frame callback: flutter/flutter@e4a39fa2e
497497
}
498498

499-
testWidgets('request succeeds; sharing succeeds', (WidgetTester tester) async {
499+
testWidgets('request succeeds; sharing succeeds', (tester) async {
500500
final mockSharePlus = setupMockSharePlus();
501501
final message = eg.streamMessage();
502502
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
@@ -508,7 +508,7 @@ void main() {
508508
check(mockSharePlus.sharedString).equals('Hello world');
509509
});
510510

511-
testWidgets('request succeeds; sharing fails', (WidgetTester tester) async {
511+
testWidgets('request succeeds; sharing fails', (tester) async {
512512
final mockSharePlus = setupMockSharePlus();
513513
final message = eg.streamMessage();
514514
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));
@@ -524,7 +524,7 @@ void main() {
524524
expectedTitle: 'Sharing failed')));
525525
});
526526

527-
testWidgets('request has an error', (WidgetTester tester) async {
527+
testWidgets('request has an error', (tester) async {
528528
final mockSharePlus = setupMockSharePlus();
529529
final message = eg.streamMessage();
530530
await setupToMessageActionSheet(tester, message: message, narrow: TopicNarrow.ofMessage(message));

‎test/widgets/actions_test.dart

+9-9
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void main() {
7070
});
7171

7272

73-
testWidgets('use is:unread optimization', (WidgetTester tester) async {
73+
testWidgets('use is:unread optimization', (tester) async {
7474
const narrow = CombinedFeedNarrow();
7575
await prepare(tester);
7676
connection.prepare(json: UpdateMessageFlagsForNarrowResult(
@@ -93,7 +93,7 @@ void main() {
9393
});
9494
});
9595

96-
testWidgets('pagination', (WidgetTester tester) async {
96+
testWidgets('pagination', (tester) async {
9797
// Check that `lastProcessedId` returned from an initial
9898
// response is used as `anchorId` for the subsequent request.
9999
final narrow = TopicNarrow.ofMessage(eg.streamMessage());
@@ -154,7 +154,7 @@ void main() {
154154
}, skip: true, // TODO move this functionality inside markNarrowAsRead
155155
);
156156

157-
testWidgets('on invalid response', (WidgetTester tester) async {
157+
testWidgets('on invalid response', (tester) async {
158158
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
159159
final narrow = TopicNarrow.ofMessage(eg.streamMessage());
160160
await prepare(tester);
@@ -184,7 +184,7 @@ void main() {
184184
expectedMessage: zulipLocalizations.errorInvalidResponse);
185185
});
186186

187-
testWidgets('CombinedFeedNarrow on legacy server', (WidgetTester tester) async {
187+
testWidgets('CombinedFeedNarrow on legacy server', (tester) async {
188188
const narrow = CombinedFeedNarrow();
189189
await prepare(tester);
190190
// Might as well test with oldUnreadsMissing: true.
@@ -204,7 +204,7 @@ void main() {
204204
check(store.unreads).oldUnreadsMissing.isTrue();
205205
});
206206

207-
testWidgets('ChannelNarrow on legacy server', (WidgetTester tester) async {
207+
testWidgets('ChannelNarrow on legacy server', (tester) async {
208208
final stream = eg.stream();
209209
final narrow = ChannelNarrow(stream.streamId);
210210
await prepare(tester);
@@ -220,7 +220,7 @@ void main() {
220220
});
221221
});
222222

223-
testWidgets('TopicNarrow on legacy server', (WidgetTester tester) async {
223+
testWidgets('TopicNarrow on legacy server', (tester) async {
224224
final narrow = TopicNarrow.ofMessage(eg.streamMessage());
225225
await prepare(tester);
226226
connection.zulipFeatureLevel = 154;
@@ -236,7 +236,7 @@ void main() {
236236
});
237237
});
238238

239-
testWidgets('DmNarrow on legacy server', (WidgetTester tester) async {
239+
testWidgets('DmNarrow on legacy server', (tester) async {
240240
final message = eg.dmMessage(from: eg.otherUser, to: [eg.selfUser]);
241241
final narrow = DmNarrow.ofMessage(message, selfUserId: eg.selfUser.userId);
242242
final unreadMsgs = eg.unreadMsgs(dms: [
@@ -259,7 +259,7 @@ void main() {
259259
});
260260
});
261261

262-
testWidgets('MentionsNarrow on legacy server', (WidgetTester tester) async {
262+
testWidgets('MentionsNarrow on legacy server', (tester) async {
263263
const narrow = MentionsNarrow();
264264
final message = eg.streamMessage(flags: [MessageFlag.mentioned]);
265265
final unreadMsgs = eg.unreadMsgs(mentions: [message.id]);
@@ -279,7 +279,7 @@ void main() {
279279
});
280280
});
281281

282-
testWidgets('catch-all api errors', (WidgetTester tester) async {
282+
testWidgets('catch-all api errors', (tester) async {
283283
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
284284
const narrow = CombinedFeedNarrow();
285285
await prepare(tester);

‎test/widgets/autocomplete_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void main() {
8181
check(avatarFinder.evaluate().length).equals(expected ? 1 : 0);
8282
}
8383

84-
testWidgets('options appear, disappear, and change correctly', (WidgetTester tester) async {
84+
testWidgets('options appear, disappear, and change correctly', (tester) async {
8585
final user1 = eg.user(userId: 1, fullName: 'User One', avatarUrl: 'user1.png');
8686
final user2 = eg.user(userId: 2, fullName: 'User Two', avatarUrl: 'user2.png');
8787
final user3 = eg.user(userId: 3, fullName: 'User Three', avatarUrl: 'user3.png');

‎test/widgets/clipboard_test.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ void main() {
5757
check(await Clipboard.getData('text/plain')).isNotNull().text.equals(expected);
5858
}
5959

60-
testWidgets('iOS', (WidgetTester tester) async {
60+
testWidgets('iOS', (tester) async {
6161
testBinding.deviceInfoResult = const IosDeviceInfo(systemVersion: '16.0');
6262
await call(tester, text: 'asdf');
6363
await checkClipboardText('asdf');
6464
await checkSnackBar(tester, expected: true);
6565
});
6666

67-
testWidgets('Android', (WidgetTester tester) async {
67+
testWidgets('Android', (tester) async {
6868
testBinding.deviceInfoResult = const AndroidDeviceInfo(sdkInt: 33, release: '13');
6969
await call(tester, text: 'asdf');
7070
await checkClipboardText('asdf');
7171
await checkSnackBar(tester, expected: false);
7272
});
7373

74-
testWidgets('Android <13', (WidgetTester tester) async {
74+
testWidgets('Android <13', (tester) async {
7575
testBinding.deviceInfoResult = const AndroidDeviceInfo(sdkInt: 32, release: '12');
7676
await call(tester, text: 'asdf');
7777
await checkClipboardText('asdf');

‎test/widgets/content_test.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -483,15 +483,15 @@ void main() {
483483
testFontWeight('syntax highlighting: non-bold span',
484484
expectedWght: 400,
485485
content: plainContent(ContentExample.codeBlockHighlightedShort.html),
486-
styleFinder: (WidgetTester tester) {
486+
styleFinder: (tester) {
487487
final root = tester.renderObject<RenderParagraph>(find.textContaining('class')).text;
488488
return mergedStyleOfSubstring(root, 'class')!;
489489
});
490490

491491
testFontWeight('syntax highlighting: bold span',
492492
expectedWght: 700,
493493
content: plainContent(ContentExample.codeBlockHighlightedShort.html),
494-
styleFinder: (WidgetTester tester) {
494+
styleFinder: (tester) {
495495
final root = tester.renderObject<RenderParagraph>(find.textContaining('A')).text;
496496
return mergedStyleOfSubstring(root, 'A')!;
497497
});
@@ -986,7 +986,7 @@ void main() {
986986
debugNetworkImageHttpClientProvider = null;
987987
});
988988

989-
testWidgets('throws if no `PerAccountStoreWidget` ancestor', (WidgetTester tester) async {
989+
testWidgets('throws if no `PerAccountStoreWidget` ancestor', (tester) async {
990990
await tester.pumpWidget(
991991
RealmContentNetworkImage(Uri.parse('https://zulip.invalid/path/to/image.png'), filterQuality: FilterQuality.medium));
992992
check(tester.takeException()).isA<AssertionError>();

0 commit comments

Comments
 (0)