Skip to content

Commit eca33f9

Browse files
gnpricechrisbobbe
authored andcommitted
test [nfc]: Make addUsers async
This is the next step toward making handleEvent async.
1 parent e63ec7b commit eca33f9

9 files changed

+35
-37
lines changed

test/model/autocomplete_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ void main() {
167167

168168
test('MentionAutocompleteView misc', () async {
169169
const narrow = AllMessagesNarrow();
170-
final store = eg.store()
171-
..addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
170+
final store = eg.store();
171+
await store.addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
172172
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
173173

174174
bool done = false;
@@ -182,10 +182,10 @@ void main() {
182182
});
183183

184184
test('MentionAutocompleteView not starve timers', () {
185-
fakeAsync((binding) {
185+
fakeAsync((binding) async {
186186
const narrow = AllMessagesNarrow();
187-
final store = eg.store()
188-
..addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
187+
final store = eg.store();
188+
await store.addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
189189
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
190190

191191
bool searchDone = false;

test/model/compose_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,19 +311,19 @@ hello
311311
test('silent', () {
312312
check(mention(user, silent: true)).equals('@_**Full Name|123**');
313313
});
314-
test('`users` passed; has two users with same fullName', () {
314+
test('`users` passed; has two users with same fullName', () async {
315315
final store = eg.store();
316-
store.addUsers([user, eg.user(userId: 5), eg.user(userId: 234, fullName: user.fullName)]);
316+
await store.addUsers([user, eg.user(userId: 5), eg.user(userId: 234, fullName: user.fullName)]);
317317
check(mention(user, silent: true, users: store.users)).equals('@_**Full Name|123**');
318318
});
319-
test('`users` passed; has two same-name users but one of them is deactivated', () {
319+
test('`users` passed; has two same-name users but one of them is deactivated', () async {
320320
final store = eg.store();
321-
store.addUsers([user, eg.user(userId: 5), eg.user(userId: 234, fullName: user.fullName, isActive: false)]);
321+
await store.addUsers([user, eg.user(userId: 5), eg.user(userId: 234, fullName: user.fullName, isActive: false)]);
322322
check(mention(user, silent: true, users: store.users)).equals('@_**Full Name|123**');
323323
});
324-
test('`users` passed; user has unique fullName', () {
324+
test('`users` passed; user has unique fullName', () async {
325325
final store = eg.store();
326-
store.addUsers([user, eg.user(userId: 234, fullName: 'Another Name')]);
326+
await store.addUsers([user, eg.user(userId: 234, fullName: 'Another Name')]);
327327
check(mention(user, silent: true, users: store.users)).equals('@_**Full Name**');
328328
});
329329
});

test/model/internal_link_test.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ import 'package:zulip/model/store.dart';
99
import '../example_data.dart' as eg;
1010
import 'test_store.dart';
1111

12-
PerAccountStore setupStore({
12+
Future<PerAccountStore> setupStore({
1313
required Uri realmUrl,
1414
List<ZulipStream>? streams,
1515
List<User>? users,
16-
}) {
16+
}) async {
1717
final account = eg.selfAccount.copyWith(realmUrl: realmUrl);
1818
final store = eg.store(account: account);
1919
if (streams != null) {
2020
store.addStreams(streams);
2121
}
2222
store.addUser(eg.selfUser);
2323
if (users != null) {
24-
store.addUsers(users);
24+
await store.addUsers(users);
2525
}
2626
return store;
2727
}
@@ -37,8 +37,8 @@ void main() {
3737
for (final testCase in testCases) {
3838
final String urlString = testCase.$1;
3939
final Narrow? expected = testCase.$2;
40-
test(urlString, () {
41-
final store = setupStore(realmUrl: realmUrl, streams: streams, users: users);
40+
test(urlString, () async {
41+
final store = await setupStore(realmUrl: realmUrl, streams: streams, users: users);
4242
final url = store.tryResolveUrl(urlString)!;
4343
check(parseInternalLink(url, store)).equals(expected);
4444
});
@@ -131,8 +131,8 @@ void main() {
131131
final String description = testCase.$2;
132132
final String urlString = testCase.$3;
133133
final Uri realmUrl = testCase.$4;
134-
test('${expected ? 'accepts': 'rejects'} $description: $urlString', () {
135-
final store = setupStore(realmUrl: realmUrl, streams: streams);
134+
test('${expected ? 'accepts': 'rejects'} $description: $urlString', () async {
135+
final store = await setupStore(realmUrl: realmUrl, streams: streams);
136136
final url = store.tryResolveUrl(urlString)!;
137137
final result = parseInternalLink(url, store);
138138
check(result != null).equals(expected);

test/model/test_store.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ extension PerAccountStoreTestExtension on PerAccountStore {
118118
handleEvent(RealmUserAddEvent(id: 1, person: user));
119119
}
120120

121-
void addUsers(Iterable<User> users) {
121+
Future<void> addUsers(Iterable<User> users) async {
122122
for (final user in users) {
123123
addUser(user);
124124
}

test/widgets/autocomplete_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Future<Finder> setupToComposeInput(WidgetTester tester, {
3131
addTearDown(testBinding.reset);
3232
await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());
3333
final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
34-
store.addUsers([eg.selfUser, eg.otherUser]);
35-
store.addUsers(users);
34+
await store.addUsers([eg.selfUser, eg.otherUser]);
35+
await store.addUsers(users);
3636
final connection = store.connection as FakeApiConnection;
3737

3838
// prepare message list data

test/widgets/emoji_reaction_test.dart

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,15 @@ void main() {
101101

102102
await prepare();
103103

104-
store
105-
..addUsers(users)
106-
..handleEvent(RealmEmojiUpdateEvent(id: 1,
107-
realmEmoji: realmEmoji))
108-
..handleEvent(UserSettingsUpdateEvent(id: 1,
109-
property: UserSettingName.displayEmojiReactionUsers,
110-
value: displayEmojiReactionUsers))
111-
..handleEvent(UserSettingsUpdateEvent(id: 1,
112-
property: UserSettingName.emojiset,
113-
value: emojiset));
104+
await store.addUsers(users);
105+
store.handleEvent(RealmEmojiUpdateEvent(id: 1,
106+
realmEmoji: realmEmoji));
107+
store.handleEvent(UserSettingsUpdateEvent(id: 1,
108+
property: UserSettingName.displayEmojiReactionUsers,
109+
value: displayEmojiReactionUsers));
110+
store.handleEvent(UserSettingsUpdateEvent(id: 1,
111+
property: UserSettingName.emojiset,
112+
value: emojiset));
114113

115114
// This does mean that all image emoji will look the same…
116115
// shrug, at least for now.

test/widgets/inbox_test.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@ void main() {
6161
await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());
6262
store = await testBinding.globalStore.perAccount(eg.selfAccount.id);
6363

64-
store
65-
..addStreams(streams ?? [])
66-
..addSubscriptions(subscriptions ?? [])
67-
..addUsers(users ?? [eg.selfUser]);
64+
store.addStreams(streams ?? []);
65+
store.addSubscriptions(subscriptions ?? []);
66+
await store.addUsers(users ?? [eg.selfUser]);
6867

6968
for (final message in unreadMessages) {
7069
assert(!message.flags.contains(MessageFlag.read));

test/widgets/message_list_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void main() {
5858

5959
// prepare message list data
6060
store.addUser(eg.selfUser);
61-
store.addUsers(users ?? []);
61+
await store.addUsers(users ?? []);
6262
assert((messageCount == null) != (messages == null));
6363
messages ??= List.generate(messageCount!, (index) {
6464
return eg.streamMessage(sender: eg.selfUser);

test/widgets/profile_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Future<void> setupPage(WidgetTester tester, {
3737

3838
store.addUser(eg.selfUser);
3939
if (users != null) {
40-
store.addUsers(users);
40+
await store.addUsers(users);
4141
}
4242

4343
await tester.pumpWidget(

0 commit comments

Comments
 (0)