tests: model: Extend other tests to incorporate both mentioned flags.

This commit expands some of the fixtures of present tests with the
mentioned/wildcard_mentioned flags to make the tests more robust
and generalized.

Author: zee-bit

tests/model/test_model.py

@@ -885,6 +885,8 @@ def test_toggle_stream_muted_status(
             (["read"], "add"),
             (["read", "starred"], "remove"),
             (["starred", "read"], "remove"),
+            (["read", "mentioned", "wildcard_mentioned"], "add"),
+            (["mentioned", "wildcard_mentioned", "starred"], "remove"),
         ],
     )
     def test_toggle_message_star_status(
@@ -2075,11 +2077,18 @@ def test_update_star_status_invalid_operation(
             ("add", 1, ["read"], ["read", "starred"]),
             ("add", 1, ["starred"], ["starred"]),
             ("add", 1, ["read", "starred"], ["read", "starred"]),
+            ("add", 1, ["mentioned"], ["mentioned", "starred"]),
+            ("add", 1, ["mentioned", "starred"], ["mentioned", "starred"]),
+            ("add", 1, ["wildcard_mentioned"], ["wildcard_mentioned", "starred"]),
             ("remove", -1, [], []),
             ("remove", -1, ["read"], ["read"]),
             ("remove", -1, ["starred"], []),
             ("remove", -1, ["read", "starred"], ["read"]),
             ("remove", -1, ["starred", "read"], ["read"]),
+            ("remove", -1, ["mentioned"], ["mentioned"]),
+            ("remove", -1, ["wildcard_mentioned"], ["wildcard_mentioned"]),
+            ("remove", -1, ["mentioned", "starred"], ["mentioned"]),
+            ("remove", -1, ["wildcard_mentioned", "starred"], ["wildcard_mentioned"]),
         ],
     )
     def test_update_star_status(
@@ -2098,7 +2107,23 @@ def test_update_star_status(
 
         model.index = dict(
             messages={msg_id: {"flags": flags_before} for msg_id in indexed_ids},
-            unread_mentioned_msg_ids=set(),
+            mentioned_msg_ids=set(
+                [
+                    msg_id
+                    for msg_id in indexed_ids
+                    if {"mentioned", "wildcard_mentioned"} & set(flags_before)
+                ]
+            ),
+            unread_mentioned_msg_ids=set(
+                [
+                    msg_id
+                    for msg_id in indexed_ids
+                    if (
+                        {"mentioned", "wildcard_mentioned"} & set(flags_before)
+                        and "read" not in flags_before
+                    )
+                ]
+            ),
             starred_msg_ids=set(
                 [msg_id for msg_id in indexed_ids if "starred" in flags_before]
             ),
@@ -2159,11 +2184,19 @@ def test_update_star_status(
             ("add", ["read"], ["read"]),
             ("add", ["starred"], ["starred", "read"]),
             ("add", ["read", "starred"], ["read", "starred"]),
+            ("add", ["mentioned"], ["mentioned", "read"]),
+            ("add", ["read", "mentioned"], ["read", "mentioned"]),
+            ("add", ["mentioned", "starred"], ["mentioned", "starred", "read"]),
+            ("add", ["wildcard_mentioned"], ["wildcard_mentioned", "read"]),
             ("remove", [], []),
             ("remove", ["read"], ["read"]),  # msg cannot be marked 'unread'
             ("remove", ["starred"], ["starred"]),
+            ("remove", ["mentioned"], ["mentioned"]),
             ("remove", ["starred", "read"], ["starred", "read"]),
             ("remove", ["read", "starred"], ["read", "starred"]),
+            ("remove", ["read", "mentioned"], ["read", "mentioned"]),
+            ("remove", ["wildcard_mentioned"], ["wildcard_mentioned"]),
+            ("remove", ["read", "wildcard_mentioned"], ["read", "wildcard_mentioned"]),
         ],
     )
     def test_update_read_status(