tests [nfc]: Pull out helper eg.updateMessageFlagsRemoveEvent

Author: chrisbobbe

test/example_data.dart

@@ -1,5 +1,7 @@
+import 'package:zulip/api/model/events.dart';
 import 'package:zulip/api/model/initial_snapshot.dart';
 import 'package:zulip/api/model/model.dart';
+import 'package:zulip/model/narrow.dart';
 import 'package:zulip/model/store.dart';
 
 import 'api/fake_api.dart';
@@ -282,3 +284,39 @@ PerAccountStore store({Account? account, InitialSnapshot? initialSnapshot}) {
     initialSnapshot: initialSnapshot ?? _initialSnapshot(),
   );
 }
+
+UpdateMessageFlagsRemoveEvent updateMessageFlagsRemoveEvent(
+  MessageFlag flag,
+  Iterable<Message> messages, {
+  int? selfUserId,
+}) {
+  return UpdateMessageFlagsRemoveEvent(
+    id: 0,
+    flag: MessageFlag.read,
+    messages: messages.map((m) => m.id).toList(),
+    messageDetails: Map.fromEntries(messages.map((message) {
+      final mentioned = message.flags.contains(MessageFlag.mentioned)
+        || message.flags.contains(MessageFlag.wildcardMentioned);
+
+      return MapEntry(
+        message.id,
+        switch (message) {
+          StreamMessage() => UpdateMessageFlagsMessageDetail(
+            type: MessageType.stream,
+            mentioned: mentioned,
+            streamId: message.streamId,
+            topic: message.subject,
+            userIds: null,
+          ),
+          DmMessage() => UpdateMessageFlagsMessageDetail(
+            type: MessageType.private,
+            mentioned: mentioned,
+            streamId: null,
+            topic: null,
+            userIds: DmNarrow.ofMessage(message, selfUserId: selfUserId ?? selfUser.userId)
+              .otherRecipientIds,
+          ),
+        },
+      );
+    })));
+}

test/model/message_list_test.dart

@@ -453,37 +453,7 @@ void main() async {
       );
     }
 
-    UpdateMessageFlagsRemoveEvent mkRemoveEvent(MessageFlag flag, List<Message> messages) {
-      final messageDetails = Map.fromEntries(messages.map((message) {
-        final mentioned = message.flags.contains(MessageFlag.mentioned)
-          || message.flags.contains(MessageFlag.wildcardMentioned);
-        return MapEntry(
-          message.id,
-          switch (message) {
-            StreamMessage() => UpdateMessageFlagsMessageDetail(
-              type: MessageType.stream,
-              mentioned: mentioned,
-              streamId: message.streamId,
-              topic: message.subject,
-              userIds: null,
-            ),
-            DmMessage() => UpdateMessageFlagsMessageDetail(
-              type: MessageType.private,
-              mentioned: mentioned,
-              streamId: null,
-              topic: null,
-              userIds: DmNarrow.ofMessage(message, selfUserId: eg.selfUser.userId).otherRecipientIds,
-            ),
-          });
-      }));
-
-      return UpdateMessageFlagsRemoveEvent(
-        id: 1,
-        flag: flag,
-        messages: messages.map((m) => m.id).toList(),
-        messageDetails: messageDetails,
-      );
-    }
+    const mkRemoveEvent = eg.updateMessageFlagsRemoveEvent;
 
     group('add flag', () {
       test('not in list', () async {