msglist test [nfc]: Move notifyListeners tests to match implementation

Signed-off-by: Zixuan James Li <[email protected]>

Author: PIG208

test/model/message_list_test.dart

@@ -508,68 +508,6 @@ void main() {
     });
   });
 
-  group('notifyListenersIfMessagePresent', () {
-    test('message present', () async {
-      await prepare(narrow: const CombinedFeedNarrow());
-      await prepareMessages(foundOldest: false,
-        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i)));
-      model.notifyListenersIfMessagePresent(150);
-      checkNotifiedOnce();
-    });
-
-    test('message absent', () async {
-      await prepare(narrow: const CombinedFeedNarrow());
-      await prepareMessages(foundOldest: false,
-        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i))
-          .where((m) => m.id != 150).toList());
-      model.notifyListenersIfMessagePresent(150);
-      checkNotNotified();
-    });
-
-    test('message absent (older than window)', () async {
-      await prepare(narrow: const CombinedFeedNarrow());
-      await prepareMessages(foundOldest: false,
-        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i)));
-      model.notifyListenersIfMessagePresent(50);
-      checkNotNotified();
-    });
-
-    test('message absent (newer than window)', () async {
-      await prepare(narrow: const CombinedFeedNarrow());
-      await prepareMessages(foundOldest: false,
-        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i)));
-      model.notifyListenersIfMessagePresent(250);
-      checkNotNotified();
-    });
-  });
-
-  group('notifyListenersIfAnyMessagePresent', () {
-    final messages = List.generate(100, (i) => eg.streamMessage(id: 100 + i));
-
-    test('all messages present', () async {
-      await prepare(narrow: const CombinedFeedNarrow());
-      await prepareMessages(foundOldest: false, messages: messages);
-      model.notifyListenersIfAnyMessagePresent([150, 151, 152]);
-      checkNotifiedOnce();
-    });
-
-    test('some messages present', () async {
-      await prepare(narrow: const CombinedFeedNarrow());
-      await prepareMessages(foundOldest: false,
-        messages: messages.where((m) => m.id != 151).toList());
-      model.notifyListenersIfAnyMessagePresent([150, 151, 152]);
-      checkNotifiedOnce();
-    });
-
-    test('no messages present', () async {
-      await prepare(narrow: const CombinedFeedNarrow());
-      await prepareMessages(foundOldest: false, messages:
-        messages.where((m) => ![150, 151, 152].contains(m.id)).toList());
-      model.notifyListenersIfAnyMessagePresent([150, 151, 152]);
-      checkNotNotified();
-    });
-  });
-
   group('handleMessageEvent', () {
     test('in narrow', () async {
       final stream = eg.stream();
@@ -1140,6 +1078,68 @@ void main() {
     });
   });
 
+  group('notifyListenersIfMessagePresent', () {
+    test('message present', () async {
+      await prepare(narrow: const CombinedFeedNarrow());
+      await prepareMessages(foundOldest: false,
+        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i)));
+      model.notifyListenersIfMessagePresent(150);
+      checkNotifiedOnce();
+    });
+
+    test('message absent', () async {
+      await prepare(narrow: const CombinedFeedNarrow());
+      await prepareMessages(foundOldest: false,
+        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i))
+          .where((m) => m.id != 150).toList());
+      model.notifyListenersIfMessagePresent(150);
+      checkNotNotified();
+    });
+
+    test('message absent (older than window)', () async {
+      await prepare(narrow: const CombinedFeedNarrow());
+      await prepareMessages(foundOldest: false,
+        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i)));
+      model.notifyListenersIfMessagePresent(50);
+      checkNotNotified();
+    });
+
+    test('message absent (newer than window)', () async {
+      await prepare(narrow: const CombinedFeedNarrow());
+      await prepareMessages(foundOldest: false,
+        messages: List.generate(100, (i) => eg.streamMessage(id: 100 + i)));
+      model.notifyListenersIfMessagePresent(250);
+      checkNotNotified();
+    });
+  });
+
+  group('notifyListenersIfAnyMessagePresent', () {
+    final messages = List.generate(100, (i) => eg.streamMessage(id: 100 + i));
+
+    test('all messages present', () async {
+      await prepare(narrow: const CombinedFeedNarrow());
+      await prepareMessages(foundOldest: false, messages: messages);
+      model.notifyListenersIfAnyMessagePresent([150, 151, 152]);
+      checkNotifiedOnce();
+    });
+
+    test('some messages present', () async {
+      await prepare(narrow: const CombinedFeedNarrow());
+      await prepareMessages(foundOldest: false,
+        messages: messages.where((m) => m.id != 151).toList());
+      model.notifyListenersIfAnyMessagePresent([150, 151, 152]);
+      checkNotifiedOnce();
+    });
+
+    test('no messages present', () async {
+      await prepare(narrow: const CombinedFeedNarrow());
+      await prepareMessages(foundOldest: false, messages:
+      messages.where((m) => ![150, 151, 152].contains(m.id)).toList());
+      model.notifyListenersIfAnyMessagePresent([150, 151, 152]);
+      checkNotNotified();
+    });
+  });
+
   group('regression tests for #455', () {
     test('reaction events handled once, even when message is in two message lists', () async {
       final stream = eg.stream();