Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-27 18:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add a test, small refactorings

Browse Source
This commit is contained in:
Hocuri
2026-03-16 19:23:46 +01:00
parent 5d3061f71d
commit b9886d1593
3 changed files with 194 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/configure.rs
View File

@@ -661,7 +661,7 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Option<&'
let provider = configured_param.provider;
configured_param
.clone()
.save_to_transports_table(ctx, param, time(), true)
.save_to_transports_table(ctx, param, time())
.await?;
send_sync_transports(ctx).await?;

4
src/transport.rs
View File

@@ -561,8 +561,8 @@ impl ConfiguredLoginParam {
context: &Context,
entered_param: &EnteredLoginParam,
timestamp: i64,
is_published: bool,
) -> Result<()> {
let is_published = true;
save_transport(
context,
entered_param,
@@ -650,7 +650,7 @@ pub(crate) async fn save_transport(
DO UPDATE SET entered_param=excluded.entered_param,
configured_param=excluded.configured_param,
add_timestamp=excluded.add_timestamp,
is_published=excluded.is_published,
is_published=excluded.is_published
WHERE entered_param != excluded.entered_param
OR configured_param != excluded.configured_param
OR add_timestamp < excluded.add_timestamp

220
src/transport/transport_tests.rs
View File

@@ -2,6 +2,7 @@ use super::*;
use crate::log::LogExt as _;
use crate::provider::get_provider_by_id;
use crate::test_utils::TestContext;
use crate::test_utils::TestContextManager;
use crate::tools::time;
#[test]
@@ -47,7 +48,7 @@ async fn test_save_load_login_param() -> Result<()> {
param
.clone()
.save_to_transports_table(&t, &EnteredLoginParam::default(), time(), true)
.save_to_transports_table(&t, &EnteredLoginParam::default(), time())
.await?;
let expected_param = r#"{"addr":"alice@example.org","imap":[{"connection":{"host":"imap.example.com","port":123,"security":"Starttls"},"user":"alice"}],"imap_user":"","imap_password":"foo","smtp":[{"connection":{"host":"smtp.example.com","port":456,"security":"Tls"},"user":"alice@example.org"}],"smtp_user":"","smtp_password":"bar","provider_id":null,"certificate_checks":"Strict","oauth2":false}"#;
assert_eq!(
@@ -239,34 +240,9 @@ async fn test_empty_server_list() -> Result<()> {
let addr = format!("alice@{domain}");
ConfiguredLoginParam {
addr: addr.clone(),
imap: vec![ConfiguredServerLoginParam {
connection: ConnectionCandidate {
host: "example.org".to_string(),
port: 100,
security: ConnectionSecurity::Tls,
},
user: addr.clone(),
}],
imap_user: addr.clone(),
imap_password: "foobarbaz".to_string(),
smtp: vec![ConfiguredServerLoginParam {
connection: ConnectionCandidate {
host: "example.org".to_string(),
port: 100,
security: ConnectionSecurity::Tls,
},
user: addr.clone(),
}],
smtp_user: addr.clone(),
smtp_password: "foobarbaz".to_string(),
provider: Some(provider),
certificate_checks: ConfiguredCertificateChecks::Automatic,
oauth2: false,
}
.save_to_transports_table(&t, &EnteredLoginParam::default(), time(), true)
.await?;
dummy_configured_login_param(&addr, Some(provider))
.save_to_transports_table(&t, &EnteredLoginParam::default(), time())
.await?;
let (_transport_id, loaded) = ConfiguredLoginParam::load(&t).await?.unwrap();
assert_eq!(loaded.provider, Some(*provider));
@@ -276,3 +252,189 @@ async fn test_empty_server_list() -> Result<()> {
Ok(())
}
fn dummy_configured_login_param(
addr: &str,
provider: Option<&'static Provider>,
) -> ConfiguredLoginParam {
ConfiguredLoginParam {
addr: addr.to_string(),
imap: vec![ConfiguredServerLoginParam {
connection: ConnectionCandidate {
host: "example.org".to_string(),
port: 100,
security: ConnectionSecurity::Tls,
},
user: addr.to_string(),
}],
imap_user: addr.to_string(),
imap_password: "foobarbaz".to_string(),
smtp: vec![ConfiguredServerLoginParam {
connection: ConnectionCandidate {
host: "example.org".to_string(),
port: 100,
security: ConnectionSecurity::Tls,
},
user: addr.to_string(),
}],
smtp_user: addr.to_string(),
smtp_password: "foobarbaz".to_string(),
provider,
certificate_checks: ConfiguredCertificateChecks::Automatic,
oauth2: false,
}
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_is_published_flag() -> Result<()> {
let mut tcm = TestContextManager::new();
let alice = &tcm.alice().await;
let alice2 = &tcm.alice().await;
for a in [alice, alice2] {
a.set_config_bool(Config::SyncMsgs, true).await?;
a.set_config_bool(Config::BccSelf, true).await?;
}
let bob = &tcm.bob().await;
assert_eq!(
alice.get_all_self_addrs().await?,
vec!["alice@example.org".to_string()]
);
assert_eq!(
alice.get_published_self_addrs().await?,
vec!["alice@example.org".to_string()]
);
assert_eq!(
alice.get_secondary_self_addrs().await?,
Vec::<String>::new()
);
assert_eq!(
alice.get_published_secondary_self_addrs().await?,
Vec::<String>::new()
);
assert_eq!(
alice.is_transport_unpublished("alice@example.org").await?,
false
);
send_recv_check_recipients(alice, bob, "alice@example.org").await;
dummy_configured_login_param("alice@otherprovider.com", None)
.save_to_transports_table(alice, &EnteredLoginParam::default(), time())
.await?;
send_sync_transports(alice).await?;
sync_and_check_recipients(alice, alice2, "alice@otherprovider.com alice@example.org").await;
for a in [alice, alice2] {
assert_eq!(
a.get_all_self_addrs().await?,
vec![
"alice@otherprovider.com".to_string(),
"alice@example.org".to_string(),
]
);
assert_eq!(
a.get_published_self_addrs().await?,
vec![
"alice@otherprovider.com".to_string(),
"alice@example.org".to_string(),
]
);
assert_eq!(
a.get_secondary_self_addrs().await?,
vec!["alice@otherprovider.com".to_string()]
);
assert_eq!(
a.get_published_secondary_self_addrs().await?,
vec!["alice@otherprovider.com".to_string()]
);
assert_eq!(
alice.is_transport_unpublished("alice@example.org").await?,
false
);
assert_eq!(
alice
.is_transport_unpublished("alice@otherprovider.com")
.await?,
false
);
send_recv_check_recipients(a, bob, "alice@example.org alice@otherprovider.com").await;
}
// TODO this should fail:
// alice
// .set_transport_unpublished("alice@example.org", true)
// .await
// .unwrap_err();
alice
.set_transport_unpublished("alice@otherprovider.com", true)
.await?;
sync_and_check_recipients(alice, alice2, "alice@example.org").await;
for a in [alice, alice2] {
assert_eq!(
a.get_all_self_addrs().await?,
vec![
"alice@example.org".to_string(),
"alice@otherprovider.com".to_string()
]
);
assert_eq!(
a.get_published_self_addrs().await?,
vec!["alice@example.org".to_string()]
);
assert_eq!(
a.get_secondary_self_addrs().await?,
vec!["alice@otherprovider.com".to_string()]
);
assert_eq!(
a.get_published_secondary_self_addrs().await?,
Vec::<String>::new()
);
assert_eq!(
alice.is_transport_unpublished("alice@example.org").await?,
false
);
assert_eq!(
alice
.is_transport_unpublished("alice@otherprovider.com")
.await?,
true
);
send_recv_check_recipients(a, bob, "alice@example.org").await;
}
// TODO test that changing primary transport makes it published again
Ok(())
}
async fn send_recv_check_recipients(alice: &TestContext, bob: &TestContext, published_addrs: &str) {
let alice_bob_chat_id = alice.create_chat_id(bob).await;
let sent = alice.send_text(alice_bob_chat_id, "hi").await;
assert_eq!(
sent.recipients,
format!("bob@example.net {published_addrs}"),
"{} is sending to the wrong set of recipients",
alice.name()
);
let bob_alice_chat_id = bob.recv_msg(&sent).await.chat_id;
bob_alice_chat_id.accept(bob).await.unwrap();
let answer = bob.send_text(bob_alice_chat_id, "hi back").await;
assert_eq!(
answer.recipients,
format!("{published_addrs} bob@example.net")
);
}
pub(crate) async fn sync_and_check_recipients(
from: &TestContext,
to: &TestContext,
recipients: &str,
) {
from.send_sync_msg().await.unwrap();
let sync_msg = from.pop_sent_msg().await;
assert_eq!(sync_msg.recipients, recipients);
to.recv_msg_trash(&sync_msg).await;
}