Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-25 01:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Add test_utils::sync()

Browse Source 
Add a function that pops a sync message from one Alice's device and receives it on another.
This commit is contained in:
iequidoo
2023-11-24 16:53:56 -03:00
committed by iequidoo
parent 1f336f89a6
commit 073c250fa4
3 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/chat.rs
View File

@@ -4326,7 +4326,7 @@ mod tests {
use crate::contact::{Contact, ContactAddress}; use crate::contact::{Contact, ContactAddress};
use crate::message::delete_msgs; use crate::message::delete_msgs;
use crate::receive_imf::receive_imf; use crate::receive_imf::receive_imf;
use crate::test_utils::{TestContext, TestContextManager}; use crate::test_utils::{sync, TestContext, TestContextManager};
use strum::IntoEnumIterator; use strum::IntoEnumIterator;
use tokio::fs; use tokio::fs;
@@ -6899,21 +6899,15 @@ mod tests {
alices[1].add_or_lookup_contact(&bob).await.id, alices[1].add_or_lookup_contact(&bob).await.id,
]; ];
async fn sync(alices: &[TestContext]) -> Result<()> {
let sync_msg = alices.get(0).unwrap().pop_sent_msg().await;
alices.get(1).unwrap().recv_msg(&sync_msg).await;
Ok(())
}
assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Request); assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Request);
a0b_chat_id.accept(&alices[0]).await?; a0b_chat_id.accept(&alices[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Not); assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Not);
a0b_chat_id.block(&alices[0]).await?; a0b_chat_id.block(&alices[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Yes); assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Yes);
a0b_chat_id.unblock(&alices[0]).await?; a0b_chat_id.unblock(&alices[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Not); assert_eq!(alices[1].get_chat(&bob).await.blocked, Blocked::Not);
// Unblocking a 1:1 chat doesn't unblock the contact currently. // Unblocking a 1:1 chat doesn't unblock the contact currently.
@@ -6921,10 +6915,10 @@ mod tests {
assert!(!alices[1].add_or_lookup_contact(&bob).await.is_blocked()); assert!(!alices[1].add_or_lookup_contact(&bob).await.is_blocked());
Contact::block(&alices[0], ab_contact_ids[0]).await?; Contact::block(&alices[0], ab_contact_ids[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert!(alices[1].add_or_lookup_contact(&bob).await.is_blocked()); assert!(alices[1].add_or_lookup_contact(&bob).await.is_blocked());
Contact::unblock(&alices[0], ab_contact_ids[0]).await?; Contact::unblock(&alices[0], ab_contact_ids[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert!(!alices[1].add_or_lookup_contact(&bob).await.is_blocked()); assert!(!alices[1].add_or_lookup_contact(&bob).await.is_blocked());
// Test accepting and blocking groups. This way we test: // Test accepting and blocking groups. This way we test:
@@ -6940,11 +6934,11 @@ mod tests {
let a1_grp_chat = Chat::load_from_db(&alices[1], a1_grp_chat_id).await?; let a1_grp_chat = Chat::load_from_db(&alices[1], a1_grp_chat_id).await?;
assert_eq!(a1_grp_chat.blocked, Blocked::Request); assert_eq!(a1_grp_chat.blocked, Blocked::Request);
a0_grp_chat_id.accept(&alices[0]).await?; a0_grp_chat_id.accept(&alices[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
let a1_grp_chat = Chat::load_from_db(&alices[1], a1_grp_chat_id).await?; let a1_grp_chat = Chat::load_from_db(&alices[1], a1_grp_chat_id).await?;
assert_eq!(a1_grp_chat.blocked, Blocked::Not); assert_eq!(a1_grp_chat.blocked, Blocked::Not);
a0_grp_chat_id.block(&alices[0]).await?; a0_grp_chat_id.block(&alices[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert!(Chat::load_from_db(&alices[1], a1_grp_chat_id) assert!(Chat::load_from_db(&alices[1], a1_grp_chat_id)
.await .await
.is_err()); .is_err());
@@ -6968,7 +6962,7 @@ mod tests {
visibilities.next(); visibilities.next();
for v in visibilities { for v in visibilities {
a0self_chat_id.set_visibility(&alices[0], v).await?; a0self_chat_id.set_visibility(&alices[0], v).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
for a in &alices { for a in &alices {
assert_eq!(a.get_self_chat().await.get_visibility(), v); assert_eq!(a.get_self_chat().await.get_visibility(), v);
} }
@@ -6985,7 +6979,7 @@ mod tests {
]; ];
for m in mute_durations { for m in mute_durations {
set_muted(&alices[0], a0b_chat_id, m).await?; set_muted(&alices[0], a0b_chat_id, m).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
let m = match m { let m = match m {
MuteDuration::Until(time) => MuteDuration::Until( MuteDuration::Until(time) => MuteDuration::Until(
SystemTime::UNIX_EPOCH SystemTime::UNIX_EPOCH
@@ -6999,10 +6993,10 @@ mod tests {
} }
let a0_broadcast_id = create_broadcast_list(&alices[0]).await?; let a0_broadcast_id = create_broadcast_list(&alices[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
let a0_broadcast_chat = Chat::load_from_db(&alices[0], a0_broadcast_id).await?; let a0_broadcast_chat = Chat::load_from_db(&alices[0], a0_broadcast_id).await?;
set_chat_name(&alices[0], a0_broadcast_id, "Broadcast list 42").await?; set_chat_name(&alices[0], a0_broadcast_id, "Broadcast list 42").await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
let a1_broadcast_id = get_chat_id_by_grpid(&alices[1], &a0_broadcast_chat.grpid) let a1_broadcast_id = get_chat_id_by_grpid(&alices[1], &a0_broadcast_chat.grpid)
.await? .await?
.unwrap() .unwrap()
@@ -7014,7 +7008,7 @@ mod tests {
.await? .await?
.is_empty()); .is_empty());
add_contact_to_chat(&alices[0], a0_broadcast_id, ab_contact_ids[0]).await?; add_contact_to_chat(&alices[0], a0_broadcast_id, ab_contact_ids[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert_eq!( assert_eq!(
get_chat_contacts(&alices[1], a1_broadcast_id).await?, get_chat_contacts(&alices[1], a1_broadcast_id).await?,
vec![ab_contact_ids[1]] vec![ab_contact_ids[1]]
@@ -7026,7 +7020,7 @@ mod tests {
let msg = alices[0].recv_msg(&sent_msg).await; let msg = alices[0].recv_msg(&sent_msg).await;
assert_eq!(msg.chat_id, a0_broadcast_id); assert_eq!(msg.chat_id, a0_broadcast_id);
remove_contact_from_chat(&alices[0], a0_broadcast_id, ab_contact_ids[0]).await?; remove_contact_from_chat(&alices[0], a0_broadcast_id, ab_contact_ids[0]).await?;
sync(&alices).await?; sync(&alices[0], &alices[1]).await;
assert!(get_chat_contacts(&alices[1], a1_broadcast_id) assert!(get_chat_contacts(&alices[1], a1_broadcast_id)
.await? .await?
.is_empty()); .is_empty());

18
src/config.rs
View File

@@ -704,7 +704,7 @@ mod tests {
use super::*; use super::*;
use crate::constants; use crate::constants;
use crate::test_utils::TestContext; use crate::test_utils::{sync, TestContext};
#[test] #[test]
fn test_to_string() { fn test_to_string() {
@@ -857,12 +857,6 @@ mod tests {
a.set_config_bool(Config::SyncMsgs, true).await?; a.set_config_bool(Config::SyncMsgs, true).await?;
} }
async fn sync(alice0: &TestContext, alice1: &TestContext) -> Result<()> {
let sync_msg = alice0.pop_sent_msg().await;
alice1.recv_msg(&sync_msg).await;
Ok(())
}
let mdns_enabled = alice0.get_config_bool(Config::MdnsEnabled).await?; let mdns_enabled = alice0.get_config_bool(Config::MdnsEnabled).await?;
// Alice1 has a different config value. // Alice1 has a different config value.
alice1 alice1
@@ -872,7 +866,7 @@ mod tests {
alice0 alice0
.set_config_bool(Config::MdnsEnabled, mdns_enabled) .set_config_bool(Config::MdnsEnabled, mdns_enabled)
.await?; .await?;
sync(&alice0, &alice1).await?; sync(&alice0, &alice1).await;
assert_eq!( assert_eq!(
alice1.get_config_bool(Config::MdnsEnabled).await?, alice1.get_config_bool(Config::MdnsEnabled).await?,
mdns_enabled mdns_enabled
@@ -883,14 +877,14 @@ mod tests {
alice0.set_config(Config::MdnsEnabled, None).await?; alice0.set_config(Config::MdnsEnabled, None).await?;
assert!(alice0.get_config_bool(Config::MdnsEnabled).await?); assert!(alice0.get_config_bool(Config::MdnsEnabled).await?);
alice0.set_config_bool(Config::MdnsEnabled, false).await?; alice0.set_config_bool(Config::MdnsEnabled, false).await?;
sync(&alice0, &alice1).await?; sync(&alice0, &alice1).await;
assert!(!alice1.get_config_bool(Config::MdnsEnabled).await?); assert!(!alice1.get_config_bool(Config::MdnsEnabled).await?);
let show_emails = alice0.get_config_bool(Config::ShowEmails).await?; let show_emails = alice0.get_config_bool(Config::ShowEmails).await?;
alice0 alice0
.set_config_bool(Config::ShowEmails, !show_emails) .set_config_bool(Config::ShowEmails, !show_emails)
.await?; .await?;
sync(&alice0, &alice1).await?; sync(&alice0, &alice1).await;
assert_eq!( assert_eq!(
alice1.get_config_bool(Config::ShowEmails).await?, alice1.get_config_bool(Config::ShowEmails).await?,
!show_emails !show_emails
@@ -900,14 +894,14 @@ mod tests {
alice0.set_config_bool(Config::SyncMsgs, false).await?; alice0.set_config_bool(Config::SyncMsgs, false).await?;
alice0.set_config_bool(Config::SyncMsgs, true).await?; alice0.set_config_bool(Config::SyncMsgs, true).await?;
alice0.set_config_bool(Config::MdnsEnabled, true).await?; alice0.set_config_bool(Config::MdnsEnabled, true).await?;
sync(&alice0, &alice1).await?; sync(&alice0, &alice1).await;
assert!(alice1.get_config_bool(Config::MdnsEnabled).await?); assert!(alice1.get_config_bool(Config::MdnsEnabled).await?);
// Usual sync scenario. // Usual sync scenario.
alice0 alice0
.set_config(Config::Displayname, Some("Alice Sync")) .set_config(Config::Displayname, Some("Alice Sync"))
.await?; .await?;
sync(&alice0, &alice1).await?; sync(&alice0, &alice1).await;
assert_eq!( assert_eq!(
alice1.get_config(Config::Displayname).await?, alice1.get_config(Config::Displayname).await?,
Some("Alice Sync".to_string()) Some("Alice Sync".to_string())

7
src/test_utils.rs
View File

@@ -1067,6 +1067,13 @@ pub(crate) async fn mark_as_verified(this: &TestContext, other: &TestContext) {
peerstate.save_to_db(&this.sql).await.unwrap(); peerstate.save_to_db(&this.sql).await.unwrap();
} }
/// Pops a sync message from alice0 and receives it on alice1. Should be used after an action on
/// alice0's side that implies sending a sync message.
pub(crate) async fn sync(alice0: &TestContext, alice1: &TestContext) {
let sync_msg = alice0.pop_sent_msg().await;
alice1.recv_msg(&sync_msg).await;
}
/// Pretty-print an event to stdout /// Pretty-print an event to stdout
/// ///
/// Done during tests this is captured by `cargo test` and associated with the test itself. /// Done during tests this is captured by `cargo test` and associated with the test itself.