test: Include self-user in users lists

This completes the sweep through the tests to ensure the self-user
is always found in the list of users in the initial snapshot,
like it would be in a real-life initial snapshot from a Zulip server.

Upcoming commits will start checking that expectation in the
model code.

Author: gnprice

test/model/store_test.dart

@@ -47,7 +47,7 @@ void main() {
     final store1 = PerAccountStore.fromInitialSnapshot(
       globalStore: globalStore,
       accountId: 1,
-      initialSnapshot: eg.initialSnapshot(),
+      initialSnapshot: eg.initialSnapshot(realmUsers: [eg.selfUser]),
     );
     completers(1).single.complete(store1);
     check(await future1).identicalTo(store1);
@@ -58,7 +58,7 @@ void main() {
     final store2 = PerAccountStore.fromInitialSnapshot(
       globalStore: globalStore,
       accountId: 2,
-      initialSnapshot: eg.initialSnapshot(),
+      initialSnapshot: eg.initialSnapshot(realmUsers: [eg.otherUser]),
     );
     completers(2).single.complete(store2);
     check(await future2).identicalTo(store2);
@@ -85,12 +85,12 @@ void main() {
     final store1 = PerAccountStore.fromInitialSnapshot(
       globalStore: globalStore,
       accountId: 1,
-      initialSnapshot: eg.initialSnapshot(),
+      initialSnapshot: eg.initialSnapshot(realmUsers: [eg.selfUser]),
     );
     final store2 = PerAccountStore.fromInitialSnapshot(
       globalStore: globalStore,
       accountId: 2,
-      initialSnapshot: eg.initialSnapshot(),
+      initialSnapshot: eg.initialSnapshot(realmUsers: [eg.otherUser]),
     );
     completers(1).single.complete(store1);
     completers(2).single.complete(store2);

test/model/user_test.dart

@@ -201,7 +201,7 @@ void main() {
       final user3 = eg.user(userId: 3);
 
       store = eg.store(initialSnapshot: eg.initialSnapshot(
-        realmUsers: [user1, user2, user3],
+        realmUsers: [user1, user2, user3, eg.selfUser],
         mutedUsers: [MutedUserItem(id: 2), MutedUserItem(id: 1)]));
       check(store.isUserMuted(1)).isTrue();
       check(store.isUserMuted(2)).isTrue();

test/notifications/open_test.dart

@@ -251,9 +251,14 @@ void main() {
         eg.account(id: 1003, realmUrl: realmUrlB, user: user1),
         eg.account(id: 1004, realmUrl: realmUrlB, user: user2),
       ];
-      for (final account in accounts) {
-        await testBinding.globalStore.add(account, eg.initialSnapshot());
-      }
+      await testBinding.globalStore.add(
+        accounts[0], eg.initialSnapshot(realmUsers: [user1]));
+      await testBinding.globalStore.add(
+        accounts[1], eg.initialSnapshot(realmUsers: [user2]));
+      await testBinding.globalStore.add(
+        accounts[2], eg.initialSnapshot(realmUsers: [user1]));
+      await testBinding.globalStore.add(
+        accounts[3], eg.initialSnapshot(realmUsers: [user2]));
       await prepare(tester);
 
       await checkOpenNotification(tester, accounts[0], eg.streamMessage());
@@ -306,7 +311,8 @@ void main() {
       final accountB = eg.otherAccount;
       final message = eg.streamMessage();
       await testBinding.globalStore.add(accountA, eg.initialSnapshot());
-      await testBinding.globalStore.add(accountB, eg.initialSnapshot());
+      await testBinding.globalStore.add(accountB, eg.initialSnapshot(
+        realmUsers: [eg.otherUser]));
       setupNotificationDataForLaunch(tester, accountB, message);
 
       await prepare(tester, early: true);

test/widgets/action_sheet_test.dart

@@ -77,6 +77,7 @@ Future<void> setupToMessageActionSheet(WidgetTester tester, {
   await testBinding.globalStore.add(
     selfAccount,
     eg.initialSnapshot(
+      realmUsers: [selfUser],
       realmAllowMessageEditing: realmAllowMessageEditing,
       realmMessageContentEditLimitSeconds: realmMessageContentEditLimitSeconds,
       realmEnableReadReceipts: realmEnableReadReceipts,

test/widgets/app_test.dart

@@ -281,7 +281,8 @@ void main() {
     testWidgets('choosing an account clears the navigator stack', (tester) async {
       addTearDown(testBinding.reset);
       await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());
-      await testBinding.globalStore.add(eg.otherAccount, eg.initialSnapshot());
+      await testBinding.globalStore.add(eg.otherAccount, eg.initialSnapshot(
+        realmUsers: [eg.otherUser]));
 
       final pushedRoutes = <Route<void>>[];
       final poppedRoutes = <Route<void>>[];

test/widgets/home_test.dart

@@ -333,7 +333,8 @@ void main () {
       pushedRoutes = [];
       lastPoppedRoute = null;
       await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());
-      await testBinding.globalStore.add(eg.otherAccount, eg.initialSnapshot());
+      await testBinding.globalStore.add(eg.otherAccount, eg.initialSnapshot(
+        realmUsers: [eg.otherUser]));
       await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));
       await tester.pump(Duration.zero); // wait for the loading page
       checkOnLoadingPage();
@@ -445,7 +446,8 @@ void main () {
     testWidgets('while loading, go to nested levels of ChooseAccountPage', (tester) async {
       testBinding.globalStore.loadPerAccountDuration = loadPerAccountDuration;
       final thirdAccount = eg.account(user: eg.thirdUser);
-      await testBinding.globalStore.add(thirdAccount, eg.initialSnapshot());
+      await testBinding.globalStore.add(thirdAccount, eg.initialSnapshot(
+        realmUsers: [eg.thirdUser]));
       await prepare(tester);
 
       await tester.pump(kTryAnotherAccountWaitPeriod);

test/widgets/recent_dm_conversations_test.dart

@@ -38,13 +38,10 @@ Future<void> setupPage(WidgetTester tester, {
 
   selfUser ??= eg.selfUser;
   final selfAccount = eg.account(user: selfUser);
-  await testBinding.globalStore.add(selfAccount, eg.initialSnapshot());
+  await testBinding.globalStore.add(selfAccount, eg.initialSnapshot(
+    realmUsers: [selfUser, ...users]));
   store = await testBinding.globalStore.perAccount(selfAccount.id);
 
-  await store.addUser(selfUser);
-  for (final user in users) {
-    await store.addUser(user);
-  }
   if (mutedUserIds != null) {
     await store.setMutedUsers(mutedUserIds);
   }

test/widgets/store_test.dart

@@ -281,10 +281,14 @@ void main() {
 
     addTearDown(testBinding.reset);
 
-    final account1 = eg.account(id: 1, user: eg.user());
-    final account2 = eg.account(id: 2, user: eg.user());
-    await testBinding.globalStore.add(account1, eg.initialSnapshot());
-    await testBinding.globalStore.add(account2, eg.initialSnapshot());
+    final user1 = eg.user();
+    final user2 = eg.user();
+    final account1 = eg.account(id: 1, user: user1);
+    final account2 = eg.account(id: 2, user: user2);
+    await testBinding.globalStore.add(account1, eg.initialSnapshot(
+      realmUsers: [user1]));
+    await testBinding.globalStore.add(account2, eg.initialSnapshot(
+      realmUsers: [user2]));
 
     final testNavObserver = TestNavigatorObserver();
     await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));
@@ -374,7 +378,8 @@ void main() {
     //   production code, where we could reasonably add an assert against it.
     //   If forced, we could let this test code proceed despite such an assert…)
     // hack; the snapshot probably corresponds to selfAccount, not otherAccount.
-    await testBinding.globalStore.add(eg.otherAccount, eg.initialSnapshot());
+    await testBinding.globalStore.add(eg.otherAccount, eg.initialSnapshot(
+      realmUsers: [eg.otherUser]));
     await pumpWithParams(light: false, accountId: eg.otherAccount.id);
     // Nudge PerAccountStoreWidget to send its updated store to MyWidgetWithMixin.
     //