WIP: refactor: add failing test: arhive updated event

This makes the test fail (and rightly so). This is the cause of https://github.com/deltachat/deltachat-desktop/issues/4016
WofWca · Jul 10, 2024 · 206d146 · 206d146
1 parent 2c14bd3
commit 206d146
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/src/chat.rs b/src/chat.rs
@@ -4676,6 +4676,56 @@ mod tests {
     use crate::test_utils::{sync, TestContext, TestContextManager};
     use strum::IntoEnumIterator;
     use tokio::fs;
+    use std::{
+        sync::atomic::{AtomicBool, Ordering},
+        time::Duration,
+    };
+
+    // TODO DRY: these functions are copy-paster from `chatlist_event.rs`.
+    async fn wait_for_chatlist_and_specific_item(context: &TestContext, chat_id: ChatId) {
+        let first_event_is_item = AtomicBool::new(false);
+        context
+            .evtracker
+            .get_matching(|evt| match evt {
+                EventType::ChatlistItemChanged {
+                    chat_id: Some(ev_chat_id),
+                } => {
+                    if ev_chat_id == &chat_id {
+                        first_event_is_item.store(true, Ordering::Relaxed);
+                        true
+                    } else {
+                        false
+                    }
+                }
+                EventType::ChatlistChanged => true,
+                _ => false,
+            })
+            .await;
+        if first_event_is_item.load(Ordering::Relaxed) {
+            wait_for_chatlist(context).await;
+        } else {
+            wait_for_chatlist_specific_item(context, chat_id).await;
+        }
+    }
+
+    async fn wait_for_chatlist_specific_item(context: &TestContext, chat_id: ChatId) {
+        context
+            .evtracker
+            .get_matching(|evt| match evt {
+                EventType::ChatlistItemChanged {
+                    chat_id: Some(ev_chat_id),
+                } => ev_chat_id == &chat_id,
+                _ => false,
+            })
+            .await;
+    }
+
+    async fn wait_for_chatlist(context: &TestContext) {
+        context
+            .evtracker
+            .get_matching(|evt| matches!(evt, EventType::ChatlistChanged))
+            .await;
+    }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn test_chat_info() {
@@ -5815,6 +5865,7 @@ mod tests {
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 0);
 
         msg_from(&t, "bob", 2).await?;
+        wait_for_chatlist_and_specific_item(&t, DC_CHAT_ID_ARCHIVED_LINK).await;
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 1);
 
         msg_from(&t, "bob", 3).await?;
@@ -5832,18 +5883,21 @@ mod tests {
         msg_from(&t, "claire", 7).await?;
         assert_eq!(bob_chat_id.get_fresh_msg_cnt(&t).await?, 2);
         assert_eq!(claire_chat_id.get_fresh_msg_cnt(&t).await?, 3);
+        wait_for_chatlist_and_specific_item(&t, DC_CHAT_ID_ARCHIVED_LINK).await;
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 2);
 
         // mark one of the archived+muted chats as noticed: check that the archive-link counter is changed as well
         marknoticed_chat(&t, claire_chat_id).await?;
         assert_eq!(bob_chat_id.get_fresh_msg_cnt(&t).await?, 2);
         assert_eq!(claire_chat_id.get_fresh_msg_cnt(&t).await?, 0);
+        wait_for_chatlist_and_specific_item(&t, DC_CHAT_ID_ARCHIVED_LINK).await;
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 1);
 
         // receive some more messages
         msg_from(&t, "claire", 8).await?;
         assert_eq!(bob_chat_id.get_fresh_msg_cnt(&t).await?, 2);
         assert_eq!(claire_chat_id.get_fresh_msg_cnt(&t).await?, 1);
+        wait_for_chatlist_and_specific_item(&t, DC_CHAT_ID_ARCHIVED_LINK).await;
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 2);
         assert_eq!(t.get_fresh_msgs().await?.len(), 0);
 
@@ -5859,6 +5913,7 @@ mod tests {
         assert_eq!(bob_chat_id.get_fresh_msg_cnt(&t).await?, 0);
         assert_eq!(claire_chat_id.get_fresh_msg_cnt(&t).await?, 0);
         assert_eq!(dave_chat_id.get_fresh_msg_cnt(&t).await?, 1);
+        wait_for_chatlist_and_specific_item(&t, DC_CHAT_ID_ARCHIVED_LINK).await;
         assert_eq!(DC_CHAT_ID_ARCHIVED_LINK.get_fresh_msg_cnt(&t).await?, 0);
         assert_eq!(t.get_fresh_msgs().await?.len(), 1);
 

diff --git a/src/events/chatlist_events.rs b/src/events/chatlist_events.rs
@@ -198,9 +198,12 @@ mod test_chatlist_events {
         Ok(())
     }
 
+    /// Mark noticed on a chat in archive should update the unread counter on archive
+    // async fn test_archived_counter_update_on_mark_chat_in_archive_noticed() -> Result<()> {
+
     /// Mark noticed on archive-link chatlistitem should update the unread counter on it
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_archived_counter_update_on_mark_noticed() -> Result<()> {
+    async fn test_archived_counter_update_on_mark_whole_archive_noticed() -> Result<()> {
         let mut tcm = TestContextManager::new();
         let alice = tcm.alice().await;
         let bob = tcm.bob().await;