Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 07:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes from merge with master

Browse Source
This commit is contained in:
dignifiedquire
2020-03-22 22:05:37 +01:00
parent 3a9c2a0356
commit d50c1e3658
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/dc_receive_imf.rs
View File

@@ -1780,37 +1780,35 @@ mod tests {
); );
} }
#[test] #[async_std::test]
fn test_is_known_rfc724_mid() { async fn test_is_known_rfc724_mid() {
let t = dummy_context(); let t = dummy_context().await;
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
msg.text = Some("first message".to_string()); msg.text = Some("first message".to_string());
let msg_id = chat::add_device_msg(&t.ctx, None, Some(&mut msg)).unwrap(); let msg_id = chat::add_device_msg(&t.ctx, None, Some(&mut msg))
let msg = Message::load_from_db(&t.ctx, msg_id).unwrap(); .await
.unwrap();
let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
// Message-IDs may or may not be surrounded by angle brackets // Message-IDs may or may not be surrounded by angle brackets
assert!(is_known_rfc724_mid( assert!(is_known_rfc724_mid(&t.ctx, format!("<{}>", msg.rfc724_mid).as_str()).await);
&t.ctx, assert!(is_known_rfc724_mid(&t.ctx, &msg.rfc724_mid).await);
format!("<{}>", msg.rfc724_mid).as_str() assert!(!is_known_rfc724_mid(&t.ctx, "nonexistant@message.id").await);
));
assert!(is_known_rfc724_mid(&t.ctx, &msg.rfc724_mid));
assert!(!is_known_rfc724_mid(&t.ctx, "nonexistant@message.id"));
} }
#[test] #[async_std::test]
fn test_is_msgrmsg_rfc724_mid() { async fn test_is_msgrmsg_rfc724_mid() {
let t = dummy_context(); let t = dummy_context().await;
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
msg.text = Some("first message".to_string()); msg.text = Some("first message".to_string());
let msg_id = chat::add_device_msg(&t.ctx, None, Some(&mut msg)).unwrap(); let msg_id = chat::add_device_msg(&t.ctx, None, Some(&mut msg))
let msg = Message::load_from_db(&t.ctx, msg_id).unwrap(); .await
.unwrap();
let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
// Message-IDs may or may not be surrounded by angle brackets // Message-IDs may or may not be surrounded by angle brackets
assert!(is_msgrmsg_rfc724_mid( assert!(is_msgrmsg_rfc724_mid(&t.ctx, format!("<{}>", msg.rfc724_mid).as_str()).await);
&t.ctx, assert!(is_msgrmsg_rfc724_mid(&t.ctx, &msg.rfc724_mid).await);
format!("<{}>", msg.rfc724_mid).as_str() assert!(!is_msgrmsg_rfc724_mid(&t.ctx, "nonexistant@message.id").await);
));
assert!(is_msgrmsg_rfc724_mid(&t.ctx, &msg.rfc724_mid));
assert!(!is_msgrmsg_rfc724_mid(&t.ctx, "nonexistant@message.id"));
} }
} }