loop

Author: link2xt

src/receive_imf/receive_imf_tests.rs

@@ -2734,33 +2734,31 @@ async fn test_incoming_contact_request() -> Result<()> {
     }
 
     // Bob ignores contact request.
-    // The second message does not result in notification.
-    let msg2 = tcm.send_recv(alice, bob, "Hello!!??").await;
-    let event = bob
-        .evtracker
-        .get_matching(|evt| matches!(evt, EventType::MsgsChanged { .. }))
-        .await;
-    match event {
-        EventType::MsgsChanged { chat_id, msg_id } => {
-            assert_eq!(msg2.chat_id, chat_id);
-            assert_eq!(msg2.id, msg_id);
-        }
-        _ => unreachable!(),
-    }
-
-    // Third message also does not result in the notification
-    // and there is no IncomingMsg event in between.
-    let msg3 = tcm.send_recv(alice, bob, "Hello!!!!????").await;
-    let event = bob
-        .evtracker
-        .get_matching(|evt| matches!(evt, EventType::MsgsChanged { .. }))
-        .await;
-    match event {
-        EventType::MsgsChanged { chat_id, msg_id } => {
-            assert_eq!(msg3.chat_id, chat_id);
-            assert_eq!(msg3.id, msg_id);
+    // The second and third message does not result in notification.
+    for text in ["Hello!!??", "Hello!!!!????"] {
+        let msg = tcm.send_recv(alice, bob, "Hello!!??").await;
+
+        // There are only `MsgsChanged` events for each message,
+        // but no `IncomingMsg` before or after.
+        let event = bob
+            .evtracker
+            .get_matching(|evt| {
+                matches!(
+                    evt,
+                    EventType::MsgsChanged { .. } | EventType::IncomingMsg { .. }
+                )
+            })
+            .await;
+        match event {
+            EventType::MsgsChanged { chat_id, msg_id } => {
+                assert_eq!(msg.chat_id, chat_id);
+                assert_eq!(msg.id, msg_id);
+
+                let msg = Message::load_from_db(bob, msg_id).await?;
+                assert_eq!(msg.text, text);
+            }
+            _ => unreachable!(),
         }
-        _ => unreachable!(),
     }
 
     Ok(())