From 01db8d01309307bcaaedcac2601262109d8a1706 Mon Sep 17 00:00:00 2001 From: link2xt Date: Sun, 5 Dec 2021 09:09:29 +0000 Subject: [PATCH] test_utils: fix Alice's address in alice_keypair() The key stored in test-data has @example.org identity. --- python/tests/test_account.py | 8 +-- src/chat.rs | 8 +-- src/chatlist.rs | 4 +- src/contact.rs | 12 ++-- src/context.rs | 2 +- src/dc_receive_imf.rs | 68 +++++++++---------- src/download.rs | 2 +- src/e2ee.rs | 8 +-- src/ephemeral.rs | 6 +- src/html.rs | 2 +- src/key.rs | 6 +- src/login_param.rs | 4 +- src/message.rs | 10 +-- src/mimefactory.rs | 24 +++---- src/mimeparser.rs | 12 ++-- src/qr.rs | 8 +-- src/securejoin.rs | 22 +++--- src/stock_str.rs | 16 ++--- src/test_utils.rs | 6 +- src/update_helper.rs | 10 +-- test-data/message/AutocryptSetupMessage.eml | 12 ++-- test-data/message/gmx-forward.eml | 8 +-- .../many_images_amazon_via_apple_mail.eml | 10 +-- test-data/message/protonmail-mixed-up.eml | 6 +- test-data/message/protonmail-repaired.eml | 6 +- .../message/subj_with_multimedia_msg.eml | 2 +- test-data/message/text_alt_plain_html.eml | 2 +- test-data/message/wrong-html.eml | 4 +- 28 files changed, 144 insertions(+), 144 deletions(-) diff --git a/python/tests/test_account.py b/python/tests/test_account.py index 100ba0fd3..00561452f 100644 --- a/python/tests/test_account.py +++ b/python/tests/test_account.py @@ -57,7 +57,7 @@ class TestOfflineAccountBasic: alice_public = data.read_path("key/alice-public.asc") alice_secret = data.read_path("key/alice-secret.asc") assert alice_public and alice_secret - ac._preconfigure_keypair("alice@example.com", alice_public, alice_secret) + ac._preconfigure_keypair("alice@example.org", alice_public, alice_secret) def test_getinfo(self, acfactory): ac1 = acfactory.get_unconfigured_account() @@ -1359,7 +1359,7 @@ class TestOnlineAccount: If the draft email is sent out later (i.e. moved to "Sent"), it must be shown.""" ac1 = acfactory.get_online_configuring_account() ac1.set_config("show_emails", "2") - ac1.create_contact("alice@example.com").create_chat() + ac1.create_contact("alice@example.org").create_chat() acfactory.wait_configure(ac1) ac1.direct_imap.create_folder("Drafts") @@ -1373,7 +1373,7 @@ class TestOnlineAccount: ac1.direct_imap.append("Drafts", """ From: ac1 <{}> Subject: subj - To: alice@example.com + To: alice@example.org Message-ID: Content-Type: text/plain; charset=utf-8 @@ -1382,7 +1382,7 @@ class TestOnlineAccount: ac1.direct_imap.append("Sent", """ From: ac1 <{}> Subject: subj - To: alice@example.com + To: alice@example.org Message-ID: Content-Type: text/plain; charset=utf-8 diff --git a/src/chat.rs b/src/chat.rs index fe8a18c5c..ecf76c862 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -4135,7 +4135,7 @@ mod tests { dc_receive_imf( &t, b"From: bob@example.org\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: <1@example.org>\n\ Chat-Version: 1.0\n\ Date: Fri, 23 Apr 2021 10:00:57 +0000\n\ @@ -4184,7 +4184,7 @@ mod tests { dc_receive_imf( &t, b"From: bob@example.org\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: <1@example.org>\n\ Chat-Version: 1.0\n\ Date: Sun, 22 Mar 2021 19:37:57 +0000\n\ @@ -4233,7 +4233,7 @@ mod tests { dc_receive_imf( &t, b"From: bob@example.org\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: <2@example.org>\n\ Chat-Version: 1.0\n\ Date: Sun, 22 Mar 2021 19:37:57 +0000\n\ @@ -4282,7 +4282,7 @@ mod tests { dc_receive_imf( &alice, b"From: bob@example.org\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: <1@example.org>\n\ Date: Sun, 22 Mar 2021 19:37:57 +0000\n\ \n\ diff --git a/src/chatlist.rs b/src/chatlist.rs index 2009bc5f7..29d6fb085 100644 --- a/src/chatlist.rs +++ b/src/chatlist.rs @@ -499,7 +499,7 @@ mod tests { dc_receive_imf( &t, b"From: Bob Authname \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: foo\n\ Message-ID: \n\ Chat-Version: 1.0\n\ @@ -561,7 +561,7 @@ mod tests { dc_receive_imf( &t, b"From: bob@example.org\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: foo\n\ Message-ID: \n\ Chat-Version: 1.0\n\ diff --git a/src/contact.rs b/src/contact.rs index 8d53c4214..07918b24d 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -1890,7 +1890,7 @@ mod tests { let alice = TestContext::new_alice().await; - let id = Contact::lookup_id_by_addr(&alice.ctx, "alice@example.com", Origin::Unknown) + let id = Contact::lookup_id_by_addr(&alice.ctx, "alice@example.org", Origin::Unknown) .await .unwrap(); assert_eq!(id, Some(DC_CONTACT_ID_SELF)); @@ -1915,7 +1915,7 @@ mod tests { let bob = TestContext::new_bob().await; let chat_alice = bob - .create_chat_with_contact("Alice", "alice@example.com") + .create_chat_with_contact("Alice", "alice@example.org") .await; send_text_msg(&bob, chat_alice.id, "Hello".to_string()).await?; let msg = bob.pop_sent_msg().await; @@ -1927,7 +1927,7 @@ mod tests { "End-to-end encryption preferred. Fingerprints: -alice@example.com: +alice@example.org: 2E6F A2CB 23B5 32D7 2863 4B58 64B0 8F61 A9ED 9443 @@ -1978,7 +1978,7 @@ CCCB 5AA9 F6E1 141C 9431 // Bob replies. let chat = bob - .create_chat_with_contact("Alice", "alice@example.com") + .create_chat_with_contact("Alice", "alice@example.org") .await; send_text_msg(&bob, chat.id, "Reply".to_string()).await?; @@ -2034,7 +2034,7 @@ CCCB 5AA9 F6E1 141C 9431 // Bob sends a message so that Alice can encrypt to him. let chat = bob - .create_chat_with_contact("Alice", "alice@example.com") + .create_chat_with_contact("Alice", "alice@example.org") .await; send_text_msg(&bob, chat.id, "Reply".to_string()).await?; @@ -2077,7 +2077,7 @@ CCCB 5AA9 F6E1 141C 9431 let mime = br#"Subject: Hello Message-ID: message@example.net -To: Alice +To: Alice From: Bob Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Chat-Version: 1.0 diff --git a/src/context.rs b/src/context.rs index c119035c1..4b674fcb1 100644 --- a/src/context.rs +++ b/src/context.rs @@ -668,7 +668,7 @@ mod tests { .unwrap(); let msg = format!( "From: {}\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: <{}>\n\ Chat-Version: 1.0\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 59c0f8d98..b05f712a0 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -2336,7 +2336,7 @@ mod tests { #[async_std::test] async fn test_dc_create_incoming_rfc724_mid() { let context = TestContext::new().await; - let raw = b"From: Alice \n\ + let raw = b"From: Alice \n\ To: Bob \n\ Subject: Some subject\n\ hello\n"; @@ -2346,14 +2346,14 @@ mod tests { assert_eq!( dc_create_incoming_rfc724_mid(&mimeparser), - "08d11318608d5191@stub" + "ca971a2eefd651f6@stub" ); } static MSGRMSG: &[u8] = b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Chat-Version: 1.0\n\ Subject: Chat: hello\n\ Message-ID: \n\ @@ -2364,7 +2364,7 @@ mod tests { static ONETOONE_NOREPLY_MAIL: &[u8] = b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: Chat: hello\n\ Message-ID: <2222@example.com>\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ @@ -2374,7 +2374,7 @@ mod tests { static GRP_MAIL: &[u8] = b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ - To: alice@example.com, claire@example.com\n\ + To: alice@example.org, claire@example.com\n\ Subject: group with Alice, Bob and Claire\n\ Message-ID: <3333@example.com>\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ @@ -2554,14 +2554,14 @@ mod tests { &t, format!( "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ - From: alice@example.com\n\ + From: alice@example.org\n\ To: bob@example.com\n\ Subject: foo\n\ Message-ID: \n\ Chat-Version: 1.0\n\ Chat-Group-ID: {}\n\ Chat-Group-Name: foo\n\ - Chat-Disposition-Notification-To: alice@example.com\n\ + Chat-Disposition-Notification-To: alice@example.org\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ \n\ hello\n", @@ -2586,7 +2586,7 @@ mod tests { format!( "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: message opened\n\ Date: Sun, 22 Mar 2020 23:37:57 +0000\n\ Chat-Version: 1.0\n\ @@ -2679,7 +2679,7 @@ mod tests { dc_receive_imf( &t, b"From: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: foo\n\ Message-ID: \n\ Chat-Version: 1.0\n\ @@ -2720,7 +2720,7 @@ mod tests { dc_receive_imf( &t, b"From: Foobar \n\ - To: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= alice@example.com\n\ + To: =?UTF-8?B?0JjQvNGPLCDQpNCw0LzQuNC70LjRjw==?= alice@example.org\n\ Cc: =?utf-8?q?=3Ch2=3E?= \n\ Subject: foo\n\ Message-ID: \n\ @@ -2765,7 +2765,7 @@ mod tests { &t, b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Foobar \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Cc: Carl \n\ Subject: foo\n\ Message-ID: \n\ @@ -2941,7 +2941,7 @@ mod tests { Chat-Version: 1.0\n\ Chat-Group-ID: abcde\n\ Chat-Group-Name: foo\n\ - Chat-Disposition-Notification-To: alice@example.com\n\ + Chat-Disposition-Notification-To: alice@example.org\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ \n\ hello\n", @@ -3559,7 +3559,7 @@ mod tests { To: {} References: -From: alice@example.com +From: alice@example.org Message-ID: Date: Tue, 16 Jun 2020 12:04:20 +0200 MIME-Version: 1.0 @@ -4077,7 +4077,7 @@ YEAAAAAA!. dc_receive_imf( &t, b"From: Nu Bar \n\ - To: alice@example.com, bob@example.org\n\ + To: alice@example.org, bob@example.org\n\ Subject: Hi\n\ Message-ID: <4444@example.org>\n\ \n\ @@ -4104,7 +4104,7 @@ YEAAAAAA!. dc_receive_imf( &t, b"From: Nu Bar \n\ - To: alice@example.com, bob@example.org\n\ + To: alice@example.org, bob@example.org\n\ Subject: Re: Hi\n\ Message-ID: <5555@example.org>\n\ In-Reply-To: <4444@example.org\n\ @@ -4212,13 +4212,13 @@ YEAAAAAA!. dc_receive_imf( &t, - b"Bcc: alice@example.com + b"Bcc: alice@example.org Received: from [127.0.0.1] Subject: s Chat-Version: 1.0 Message-ID: To: -From: +From: Message content", "Inbox", @@ -4249,7 +4249,7 @@ Message content", Subject: Subj Message-ID: To: -From: +From: Message content", "Sent", @@ -4281,7 +4281,7 @@ Message content", let first_message = b"Received: from [127.0.0.1] Subject: First message Message-ID: -To: Alice +To: Alice From: Bob1 Chat-Version: 1.0 @@ -4293,7 +4293,7 @@ First signature"; let second_message = b"Received: from [127.0.0.1] Subject: Second message Message-ID: -To: Alice +To: Alice From: Bob2 Chat-Version: 1.0 @@ -4337,7 +4337,7 @@ Subject: =?utf-8?q?single_reply-to?= {} Date: Fri, 28 May 2021 10:15:05 +0000 To: Bob , -From: Alice +From: Alice Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Transfer-Encoding: quoted-printable @@ -4377,7 +4377,7 @@ Message-ID: " &t, format!( r#"Subject: Re: single reply-to -To: "Alice" +To: "Alice" References: <{0}> <{0}> From: Bob @@ -4427,7 +4427,7 @@ Subject: =?utf-8?q?single_reply-to?= {} Date: Fri, 28 May 2021 10:15:05 +0000 To: Bob {} -From: Alice +From: Alice Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Transfer-Encoding: quoted-printable @@ -4476,7 +4476,7 @@ In-Reply-To: <{0}> Date: Sat, 03 Jul 2021 20:00:26 +0000 Chat-Version: 1.0 Message-ID: -To: +To: From: Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Transfer-Encoding: quoted-printable @@ -4524,7 +4524,7 @@ Sent with my Delta Chat Messenger: https://delta.chat Subject: =?utf-8?q?single_reply-to?= {} To: Bob , -From: Alice +From: Alice Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no Content-Transfer-Encoding: quoted-printable @@ -4567,7 +4567,7 @@ Message-ID: " r#"Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) Subject: Out subj To: "Bob" , "Claire" -From: Alice +From: Alice Message-ID: MIME-Version: 1.0 In-Reply-To: <{0}> @@ -4599,7 +4599,7 @@ Outgoing reply to all"#, br#"Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) Subject: In subj To: "Bob" , "Claire" -From: alice +From: alice Message-ID: MIME-Version: 1.0 In-Reply-To: @@ -4635,14 +4635,14 @@ Reply to all"#, let first_thread_mime = br#"Subject: First thread Message-ID: first@example.org -To: Alice , Bob +To: Alice , Bob From: Claire Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no First thread."#; let second_thread_mime = br#"Subject: Second thread Message-ID: second@example.org -To: Alice , Bob +To: Alice , Bob From: Claire Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no @@ -4735,7 +4735,7 @@ Second thread."#; let msg = t.get_last_msg().await; assert!(msg.has_html()); - assert_eq!(msg.id.get_html(&t).await?.unwrap().replace("\r\n", "\n"), "
 
\n\n
 \n
 \n
\n
Gesendet: Donnerstag, 12. August 2021 um 15:52 Uhr
\nVon: "Claire" <claire@example.org>
\nAn: alice@example.com
\nBetreff: subject
\n\n
bodytext
\n
\n
\n
\n\n"); + assert_eq!(msg.id.get_html(&t).await?.unwrap().replace("\r\n", "\n"), "
 
\n\n
 \n
 \n
\n
Gesendet: Donnerstag, 12. August 2021 um 15:52 Uhr
\nVon: "Claire" <claire@example.org>
\nAn: alice@example.org
\nBetreff: subject
\n\n
bodytext
\n
\n
\n
\n\n"); Ok(()) } @@ -4769,7 +4769,7 @@ Second thread."#; let mime = br#"Subject: First Message-ID: first@example.net -To: Alice +To: Alice From: Bob Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no @@ -4778,7 +4778,7 @@ First."#; let first = t.get_last_msg().await; let mime = br#"Subject: Second Message-ID: second@example.net -To: Alice +To: Alice From: Bob Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no @@ -4787,7 +4787,7 @@ First."#; let second = t.get_last_msg().await; let mime = br#"Subject: Third Message-ID: third@example.net -To: Alice +To: Alice From: Bob Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no @@ -4797,7 +4797,7 @@ First."#; let mime = br#"Subject: Message with references. Message-ID: second@example.net -To: Alice +To: Alice From: Bob In-Reply-To: References: diff --git a/src/download.rs b/src/download.rs index b0cb4c222..a3155c2e3 100644 --- a/src/download.rs +++ b/src/download.rs @@ -360,7 +360,7 @@ mod tests { dc_receive_imf_inner( &t, b"From: Bob \n\ - To: Alice \n\ + To: Alice \n\ Chat-Version: 1.0\n\ Subject: subject\n\ Message-ID: \n\ diff --git a/src/e2ee.rs b/src/e2ee.rs index a162fa8d6..d64f76a8b 100644 --- a/src/e2ee.rs +++ b/src/e2ee.rs @@ -464,7 +464,7 @@ Sent with my Delta Chat Messenger: https://delta.chat"; assert!(!msg.was_encrypted()); // Parsing a message is enough to update peerstate - let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") + let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") .await? .expect("no peerstate found in the database"); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual); @@ -495,7 +495,7 @@ Sent with my Delta Chat Messenger: https://delta.chat"; let msg = bob.parse_msg(&sent).await; assert!(msg.was_encrypted()); - let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") + let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") .await? .expect("no peerstate found in the database"); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual); @@ -509,7 +509,7 @@ Sent with my Delta Chat Messenger: https://delta.chat"; let msg = bob.parse_msg(&sent).await; assert!(!msg.was_encrypted()); - let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") + let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") .await? .expect("no peerstate found in the database"); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Mutual); @@ -524,7 +524,7 @@ Sent with my Delta Chat Messenger: https://delta.chat"; let msg = bob.parse_msg(&sent).await; assert!(!msg.was_encrypted()); - let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.com") + let peerstate_alice = Peerstate::from_addr(&bob.ctx, "alice@example.org") .await? .expect("no peerstate found in the database"); assert_eq!(peerstate_alice.prefer_encrypt, EncryptPreference::Reset); diff --git a/src/ephemeral.rs b/src/ephemeral.rs index f071093bf..8541fa863 100644 --- a/src/ephemeral.rs +++ b/src/ephemeral.rs @@ -936,7 +936,7 @@ mod tests { dc_receive_imf( &alice, b"From: Bob \n\ - To: Alice \n\ + To: Alice \n\ Chat-Version: 1.0\n\ Subject: Subject\n\ Message-ID: \n\ @@ -957,7 +957,7 @@ mod tests { dc_receive_imf( &alice, b"From: Bob \n\ - To: Alice \n\ + To: Alice \n\ Chat-Version: 1.0\n\ Subject: Subject\n\ Message-ID: \n\ @@ -994,7 +994,7 @@ mod tests { dc_receive_imf( &alice, b"From: Bob \n\ - To: Alice \n\ + To: Alice \n\ Chat-Version: 1.0\n\ Subject: Subject\n\ Message-ID: \n\ diff --git a/src/html.rs b/src/html.rs index 444e0f815..0e8c6c149 100644 --- a/src/html.rs +++ b/src/html.rs @@ -468,7 +468,7 @@ test some special html-characters as < > and & but also " and &#x // bob: check that bob also got the html-part of the forwarded message let bob = TestContext::new_bob().await; - let chat = bob.create_chat_with_contact("", "alice@example.com").await; + let chat = bob.create_chat_with_contact("", "alice@example.org").await; bob.recv_msg(&alice.pop_sent_msg().await).await; let msg = bob.get_last_msg_in(chat.get_id()).await; assert_ne!(msg.get_from_id(), DC_CONTACT_ID_SELF); diff --git a/src/key.rs b/src/key.rs index 4df1161c4..2592eb8d1 100644 --- a/src/key.rs +++ b/src/key.rs @@ -521,7 +521,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD #[async_std::test] async fn test_load_self_generate_public() { let t = TestContext::new().await; - t.set_config(Config::ConfiguredAddr, Some("alice@example.com")) + t.set_config(Config::ConfiguredAddr, Some("alice@example.org")) .await .unwrap(); let key = SignedPublicKey::load_self(&t).await; @@ -531,7 +531,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD #[async_std::test] async fn test_load_self_generate_secret() { let t = TestContext::new().await; - t.set_config(Config::ConfiguredAddr, Some("alice@example.com")) + t.set_config(Config::ConfiguredAddr, Some("alice@example.org")) .await .unwrap(); let key = SignedSecretKey::load_self(&t).await; @@ -543,7 +543,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD use std::thread; let t = TestContext::new().await; - t.set_config(Config::ConfiguredAddr, Some("alice@example.com")) + t.set_config(Config::ConfiguredAddr, Some("alice@example.org")) .await .unwrap(); let thr0 = { diff --git a/src/login_param.rs b/src/login_param.rs index 560c8306e..3e9153dcd 100644 --- a/src/login_param.rs +++ b/src/login_param.rs @@ -413,7 +413,7 @@ mod tests { let t = TestContext::new().await; let param = LoginParam { - addr: "alice@example.com".to_string(), + addr: "alice@example.org".to_string(), imap: ServerLoginParam { server: "imap.example.com".to_string(), user: "alice".to_string(), @@ -424,7 +424,7 @@ mod tests { }, smtp: ServerLoginParam { server: "smtp.example.com".to_string(), - user: "alice@example.com".to_string(), + user: "alice@example.org".to_string(), password: "bar".to_string(), port: 456, security: Socket::Ssl, diff --git a/src/message.rs b/src/message.rs index 41f1cc002..c061a2288 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1972,9 +1972,9 @@ mod tests { \n\ hello\n", if outgoing { - "From: alice@example.com\nTo: bob@example.net\n" + "From: alice@example.org\nTo: bob@example.net\n" } else { - "From: bob@example.net\nTo: alice@example.com\n" + "From: bob@example.net\nTo: alice@example.org\n" }, if chat_msg { "Chat-Version: 1.0\n" } else { "" }, ); @@ -2187,7 +2187,7 @@ mod tests { dc_receive_imf( &alice, b"From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Chat-Version: 1.0\n\ Message-ID: <123@example.com>\n\ Date: Fri, 29 Jan 2021 21:37:55 +0000\n\ @@ -2396,7 +2396,7 @@ mod tests { dc_receive_imf( &alice, b"From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Chat-Version: 1.0\n\ Message-ID: <123@example.com>\n\ Auto-Submitted: auto-generated\n\ @@ -2416,7 +2416,7 @@ mod tests { dc_receive_imf( &alice, b"From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Chat-Version: 1.0\n\ Message-ID: <456@example.com>\n\ Date: Fri, 29 Jan 2021 21:37:55 +0000\n\ diff --git a/src/mimefactory.rs b/src/mimefactory.rs index 5ccd77b6e..2a6b3f93b 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -1528,7 +1528,7 @@ mod tests { msg_to_subject_str( b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: Antw: Chat: hello\n\ Message-ID: <2222@example.com>\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ @@ -1543,7 +1543,7 @@ mod tests { msg_to_subject_str( b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: Infos: 42\n\ Message-ID: <2222@example.com>\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ @@ -1562,7 +1562,7 @@ mod tests { msg_to_subject_str( b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: Chat: hello\n\ Chat-Version: 1.0\n\ Message-ID: <2223@example.com>\n\ @@ -1580,7 +1580,7 @@ mod tests { // 3. Send the first message to a new contact let t = TestContext::new_alice().await; - assert_eq!(first_subject_str(t).await, "Message from alice@example.com"); + assert_eq!(first_subject_str(t).await, "Message from alice@example.org"); let t = TestContext::new_alice().await; t.set_config(Config::Displayname, Some("Alice")) @@ -1595,7 +1595,7 @@ mod tests { msg_to_subject_str( "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: äääää\n\ Chat-Version: 1.0\n\ Message-ID: <2893@example.com>\n\ @@ -1609,7 +1609,7 @@ mod tests { msg_to_subject_str( "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: aäääää\n\ Chat-Version: 1.0\n\ Message-ID: <2893@example.com>\n\ @@ -1628,7 +1628,7 @@ mod tests { dc_receive_imf( &t, b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ - From: alice@example.com\n\ + From: alice@example.org\n\ To: bob@example.com\n\ Subject: Hello, Bob\n\ Chat-Version: 1.0\n\ @@ -1645,7 +1645,7 @@ mod tests { let new_msg = incoming_msg_to_reply_msg( b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: message opened\n\ Date: Sun, 22 Mar 2020 23:37:57 +0000\n\ Chat-Version: 1.0\n\ @@ -1720,7 +1720,7 @@ mod tests { format!( "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: Different subject\n\ In-Reply-To: {}\n\ Message-ID: <2893@example.com>\n\ @@ -1775,7 +1775,7 @@ mod tests { mf.subject_str(&t).await.unwrap() } - // In `imf_raw`, From has to be bob@example.com, To has to be alice@example.com + // In `imf_raw`, From has to be bob@example.com, To has to be alice@example.org async fn msg_to_subject_str(imf_raw: &[u8]) -> String { let subject_str = msg_to_subject_str_inner(imf_raw, false, false, false).await; @@ -1836,7 +1836,7 @@ mod tests { &t, b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Bob \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: Some other, completely unrelated subject\n\ Message-ID: <3cl4@example.com>\n\ Date: Sun, 22 Mar 2020 22:37:56 +0000\n\ @@ -1896,7 +1896,7 @@ mod tests { let msg = incoming_msg_to_reply_msg( b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Charlie \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: Chat: hello\n\ Chat-Version: 1.0\n\ Message-ID: <2223@example.com>\n\ diff --git a/src/mimeparser.rs b/src/mimeparser.rs index aec43b48a..6537dc98b 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -3034,9 +3034,9 @@ Some reply Chat-Version: 1.0\n\ Message-ID: To: Bob -From: Alice +From: Alice Subject: subject -Chat-Disposition-Notification-To: alice@example.com +Chat-Disposition-Notification-To: alice@example.org Message. "###; @@ -3064,12 +3064,12 @@ Message. dc_receive_imf( &alice, "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ - From: alice@example.com\n\ + From: alice@example.org\n\ To: bob@example.net\n\ Subject: foo\n\ Message-ID: first@example.com\n\ Chat-Version: 1.0\n\ - Chat-Disposition-Notification-To: alice@example.com\n\ + Chat-Disposition-Notification-To: alice@example.org\n\ Date: Sun, 22 Mar 2020 22:37:57 +0000\n\ \n\ hello\n" @@ -3087,8 +3087,8 @@ Message. dc_receive_imf( &alice, "Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ - From: alice@example.com\n\ - To: alice@example.com\n\ + From: alice@example.org\n\ + To: alice@example.org\n\ Subject: message opened\n\ Date: Sun, 22 Mar 2020 23:37:57 +0000\n\ Chat-Version: 1.0\n\ diff --git a/src/qr.rs b/src/qr.rs index 595b3f563..4bcd628cd 100644 --- a/src/qr.rs +++ b/src/qr.rs @@ -792,12 +792,12 @@ mod tests { async fn test_decode_openpgp_fingerprint() -> Result<()> { let ctx = TestContext::new().await; - let alice_contact_id = Contact::create(&ctx, "Alice", "alice@example.com") + let alice_contact_id = Contact::create(&ctx, "Alice", "alice@example.org") .await .context("failed to create contact")?; let pub_key = alice_keypair().public; let peerstate = Peerstate { - addr: "alice@example.com".to_string(), + addr: "alice@example.org".to_string(), last_seen: 1, last_seen_autocrypt: 1, prefer_encrypt: EncryptPreference::Mutual, @@ -818,7 +818,7 @@ mod tests { let qr = check_qr( &ctx.ctx, - "OPENPGP4FPR:1234567890123456789012345678901234567890#a=alice@example.com", + "OPENPGP4FPR:1234567890123456789012345678901234567890#a=alice@example.org", ) .await?; if let Qr::FprMismatch { contact_id, .. } = qr { @@ -829,7 +829,7 @@ mod tests { let qr = check_qr( &ctx.ctx, - &format!("OPENPGP4FPR:{}#a=alice@example.com", pub_key.fingerprint()), + &format!("OPENPGP4FPR:{}#a=alice@example.org", pub_key.fingerprint()), ) .await?; if let Qr::FprOk { contact_id, .. } = qr { diff --git a/src/securejoin.rs b/src/securejoin.rs index 1910d96eb..c1a324063 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -975,7 +975,7 @@ mod tests { let sent = bob.pop_sent_msg().await; assert!(!bob.ctx.has_ongoing().await); - assert_eq!(sent.recipient(), "alice@example.com".parse().unwrap()); + assert_eq!(sent.recipient(), "alice@example.org".parse().unwrap()); let msg = alice.parse_msg(&sent).await; assert!(!msg.was_encrypted()); assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vc-request"); @@ -1010,7 +1010,7 @@ mod tests { progress, } => { let alice_contact_id = - Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) + Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown) .await .expect("Error looking up contact") .expect("Contact not found"); @@ -1095,7 +1095,7 @@ mod tests { // Bob should not yet have Alice verified let contact_alice_id = - Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) + Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown) .await .expect("Error looking up contact") .expect("Contact not found"); @@ -1130,7 +1130,7 @@ mod tests { let msg = Message::load_from_db(&bob.ctx, msg_id).await.unwrap(); assert!(msg.is_info()); let text = msg.get_text().unwrap(); - assert!(text.contains("alice@example.com verified")); + assert!(text.contains("alice@example.org verified")); } // Check Bob sent the final message @@ -1171,7 +1171,7 @@ mod tests { // Ensure Bob knows Alice_FP let alice_pubkey = SignedPublicKey::load_self(&alice.ctx).await?; let peerstate = Peerstate { - addr: "alice@example.com".into(), + addr: "alice@example.org".into(), last_seen: 10, last_seen_autocrypt: 10, prefer_encrypt: EncryptPreference::Mutual, @@ -1207,7 +1207,7 @@ mod tests { progress, } => { let alice_contact_id = - Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) + Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown) .await .expect("Error looking up contact") .expect("Contact not found"); @@ -1265,7 +1265,7 @@ mod tests { // Bob should not yet have Alice verified let contact_alice_id = - Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) + Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown) .await .expect("Error looking up contact") .expect("Contact not found"); @@ -1317,7 +1317,7 @@ mod tests { .pop_sent_msg() .await .payload() - .contains("alice@example.com")); + .contains("alice@example.org")); Ok(()) } @@ -1354,7 +1354,7 @@ mod tests { assert_eq!(Chatlist::try_load(&bob, 0, None, None).await?.len(), 1); let sent = bob.pop_sent_msg().await; - assert_eq!(sent.recipient(), "alice@example.com".parse().unwrap()); + assert_eq!(sent.recipient(), "alice@example.org".parse().unwrap()); let msg = alice.parse_msg(&sent).await; assert!(!msg.was_encrypted()); assert_eq!(msg.get_header(HeaderDef::SecureJoin).unwrap(), "vg-request"); @@ -1389,7 +1389,7 @@ mod tests { progress, } => { let alice_contact_id = - Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) + Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown) .await .expect("Error looking up contact") .expect("Contact not found"); @@ -1442,7 +1442,7 @@ mod tests { // Bob should not yet have Alice verified let contact_alice_id = - Contact::lookup_id_by_addr(&bob.ctx, "alice@example.com", Origin::Unknown) + Contact::lookup_id_by_addr(&bob.ctx, "alice@example.org", Origin::Unknown) .await .expect("Error looking up contact") .expect("Contact not found"); diff --git a/src/stock_str.rs b/src/stock_str.rs index 658c0d818..6028a80c5 100644 --- a/src/stock_str.rs +++ b/src/stock_str.rs @@ -1229,20 +1229,20 @@ mod tests { async fn test_stock_system_msg_add_member_by_me() { let t = TestContext::new().await; assert_eq!( - msg_add_member(&t, "alice@example.com", DC_CONTACT_ID_SELF).await, - "Member alice@example.com added by me." + msg_add_member(&t, "alice@example.org", DC_CONTACT_ID_SELF).await, + "Member alice@example.org added by me." ) } #[async_std::test] async fn test_stock_system_msg_add_member_by_me_with_displayname() { let t = TestContext::new().await; - Contact::create(&t, "Alice", "alice@example.com") + Contact::create(&t, "Alice", "alice@example.org") .await .expect("failed to create contact"); assert_eq!( - msg_add_member(&t, "alice@example.com", DC_CONTACT_ID_SELF).await, - "Member Alice (alice@example.com) added by me." + msg_add_member(&t, "alice@example.org", DC_CONTACT_ID_SELF).await, + "Member Alice (alice@example.org) added by me." ); } @@ -1250,7 +1250,7 @@ mod tests { async fn test_stock_system_msg_add_member_by_other_with_displayname() { let t = TestContext::new().await; let contact_id = { - Contact::create(&t, "Alice", "alice@example.com") + Contact::create(&t, "Alice", "alice@example.org") .await .expect("Failed to create contact Alice"); Contact::create(&t, "Bob", "bob@example.com") @@ -1258,8 +1258,8 @@ mod tests { .expect("failed to create bob") }; assert_eq!( - msg_add_member(&t, "alice@example.com", contact_id,).await, - "Member Alice (alice@example.com) added by Bob (bob@example.com)." + msg_add_member(&t, "alice@example.org", contact_id,).await, + "Member Alice (alice@example.org) added by Bob (bob@example.com)." ); } diff --git a/src/test_utils.rs b/src/test_utils.rs index 2e60c3d37..5629b8174 100644 --- a/src/test_utils.rs +++ b/src/test_utils.rs @@ -195,7 +195,7 @@ impl TestContext { sinks.push(Box::new(move |evt| Box::pin(sink(evt)))); } - /// Configure with alice@example.com. + /// Configure with alice@example.org. /// /// The context will be fake-configured as the alice user, with a pre-generated secret /// key. The email address of the user is returned as a string. @@ -544,13 +544,13 @@ impl SentMessage { } } -/// Load a pre-generated keypair for alice@example.com from disk. +/// Load a pre-generated keypair for alice@example.org from disk. /// /// This saves CPU cycles by avoiding having to generate a key. /// /// The keypair was created using the crate::key::tests::gen_key test. pub fn alice_keypair() -> key::KeyPair { - let addr = EmailAddress::new("alice@example.com").unwrap(); + let addr = EmailAddress::new("alice@example.org").unwrap(); let public = key::SignedPublicKey::from_asc(include_str!("../test-data/key/alice-public.asc")) .unwrap() diff --git a/src/update_helper.rs b/src/update_helper.rs index 72b7240a2..1b7a405a6 100644 --- a/src/update_helper.rs +++ b/src/update_helper.rs @@ -92,7 +92,7 @@ mod tests { dc_receive_imf( &t, b"From: Bob Authname \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: updated subject\n\ Message-ID: \n\ Chat-Version: 1.0\n\ @@ -107,7 +107,7 @@ mod tests { dc_receive_imf( &t, b"From: Bob Authname \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Subject: original subject\n\ Message-ID: \n\ Chat-Version: 1.0\n\ @@ -137,7 +137,7 @@ mod tests { dc_receive_imf( &t, b"From: Bob Authname \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: \n\ Chat-Version: 1.0\n\ Chat-Group-ID: abcde\n\ @@ -157,7 +157,7 @@ mod tests { dc_receive_imf( &t, b"From: Bob Authname \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: \n\ Chat-Version: 1.0\n\ Chat-Group-ID: abcde\n\ @@ -174,7 +174,7 @@ mod tests { dc_receive_imf( &t, b"From: Bob Authname \n\ - To: alice@example.com\n\ + To: alice@example.org\n\ Message-ID: \n\ Chat-Version: 1.0\n\ Chat-Group-ID: abcde\n\ diff --git a/test-data/message/AutocryptSetupMessage.eml b/test-data/message/AutocryptSetupMessage.eml index 97d0b33ef..9e147f5c6 100644 --- a/test-data/message/AutocryptSetupMessage.eml +++ b/test-data/message/AutocryptSetupMessage.eml @@ -1,10 +1,10 @@ -Return-Path: -Delivered-To: alice@example.com +Return-Path: +Delivered-To: alice@example.org Received: from hq5.merlinux.eu by hq5.merlinux.eu with LMTP id gNKpOrrTvF+tVAAAPzvFDg - (envelope-from ) - for ; Tue, 24 Nov 2020 10:34:50 +0100 + (envelope-from ) + for ; Tue, 24 Nov 2020 10:34:50 +0100 Subject: Autocrypt Setup Message DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=testrun.org; s=testrun; t=1606210490; @@ -21,8 +21,8 @@ Date: Tue, 24 Nov 2020 09:34:48 +0000 Chat-Version: 1.0 Autocrypt-Setup-Message: v1 Message-ID: -To: -From: +To: +From: Content-Type: multipart/mixed; boundary="dKhu3bbmBniQsT8W8w58YRCCiBK2YY" diff --git a/test-data/message/gmx-forward.eml b/test-data/message/gmx-forward.eml index b9a0703d1..56c61745a 100644 --- a/test-data/message/gmx-forward.eml +++ b/test-data/message/gmx-forward.eml @@ -1,9 +1,9 @@ -Return-Path: +Return-Path: Delivered-To: bob@example.org Received: from hq5.merlinux.eu by hq5.merlinux.eu with LMTP id GJ4eNagpFWF5UwAAPzvFDg - (envelope-from ) + (envelope-from ) for ; Thu, 12 Aug 2021 16:01:12 +0200 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by hq5.merlinux.eu (Postfix) with ESMTPS id 3033227A0003 @@ -24,7 +24,7 @@ Received: from [193.96.224.73] ([193.96.224.73]) by web-mail.gmx.net 16:01:11 +0200 MIME-Version: 1.0 Message-ID: -From: Alice +From: Alice To: bob@example.org Subject: Fw: subject Content-Type: text/html; charset=UTF-8 @@ -60,7 +60,7 @@ X-UI-Out-Filterresults: notjunk:1;V03:K0:pksZU4GoRZI=:jPKwLt7m9sSdgel28Ha/o7
Gesendet: Donnerstag, 12. August 2021 um 15:52 Uhr
Von: "Claire" <claire@example.org>
-An: alice@example.com
+An: alice@example.org
Betreff: subject
bodytext
diff --git a/test-data/message/many_images_amazon_via_apple_mail.eml b/test-data/message/many_images_amazon_via_apple_mail.eml index 894c4e200..6414d4dab 100644 --- a/test-data/message/many_images_amazon_via_apple_mail.eml +++ b/test-data/message/many_images_amazon_via_apple_mail.eml @@ -1,16 +1,16 @@ Return-Path: -Delivered-To: alice@example.com +Delivered-To: alice@example.org Received: from hq5.merlinux.eu by hq5.merlinux.eu with LMTP id t5IeKWSbkV+eZAAAPzvFDg (envelope-from ) - for ; Thu, 22 Oct 2020 16:47:00 +0200 + for ; Thu, 22 Oct 2020 16:47:00 +0200 Received: from dd37930.kasserver.com (dd37930.kasserver.com [85.13.154.127]) by hq5.merlinux.eu (Postfix) with ESMTPS id E942727A0011 - for ; Thu, 22 Oct 2020 16:46:59 +0200 (CEST) + for ; Thu, 22 Oct 2020 16:46:59 +0200 (CEST) Received: from macbook.fritz.box (i59F5C9C2.versanet.de [89.245.201.194]) by dd37930.kasserver.com (Postfix) with ESMTPSA id C1EAC53C066B - for ; Thu, 22 Oct 2020 16:46:58 +0200 (CEST) + for ; Thu, 22 Oct 2020 16:46:58 +0200 (CEST) From: paula Content-Type: multipart/alternative; boundary="Apple-Mail=_9A2A284B-D732-46ED-9F21-7E32AE214CE9" @@ -22,7 +22,7 @@ Subject: =?utf-8?Q?Anker_SoundCore_2_Bluetooth_Lautsprecher=2C_Fantastisch?= =?utf-8?Q?_=26_HiFi?= Message-Id: <7D32DF54-6498-48A6-B0F9-952499061C19@kadeifalong.de> Date: Thu, 22 Oct 2020 16:46:56 +0200 -To: alice@example.com +To: alice@example.org X-Mailer: Apple Mail (2.3445.104.11) X-Spam: Yes diff --git a/test-data/message/protonmail-mixed-up.eml b/test-data/message/protonmail-mixed-up.eml index 1a0105d7d..d408fab69 100644 --- a/test-data/message/protonmail-mixed-up.eml +++ b/test-data/message/protonmail-mixed-up.eml @@ -1,9 +1,9 @@ -Return-Path: +Return-Path: Delivered-To: bob@example.org Date: Mon, 29 Mar 2021 11:30:57 +0000 To: Bob -From: Alice -Reply-To: Alice +From: Alice +Reply-To: Alice Subject: ... Message-ID: In-Reply-To: diff --git a/test-data/message/protonmail-repaired.eml b/test-data/message/protonmail-repaired.eml index eec98022b..241b088dc 100644 --- a/test-data/message/protonmail-repaired.eml +++ b/test-data/message/protonmail-repaired.eml @@ -1,9 +1,9 @@ -Return-Path: +Return-Path: Delivered-To: bob@example.org Date: Mon, 29 Mar 2021 11:30:57 +0000 To: Bob -From: Alice -Reply-To: Alice +From: Alice +Reply-To: Alice Subject: ... Message-ID: In-Reply-To: diff --git a/test-data/message/subj_with_multimedia_msg.eml b/test-data/message/subj_with_multimedia_msg.eml index 20b19cf80..3dc559b07 100644 --- a/test-data/message/subj_with_multimedia_msg.eml +++ b/test-data/message/subj_with_multimedia_msg.eml @@ -1,7 +1,7 @@ Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Hocuri Subject: subj with important info -To: alice@example.com +To: alice@example.org Message-ID: <6e107266-b2bd-e87f-4996-29b000abcfb0@testrun.org> Date: Thu, 17 Dec 2020 15:38:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 diff --git a/test-data/message/text_alt_plain_html.eml b/test-data/message/text_alt_plain_html.eml index 13f20c7d8..4cb271a3b 100644 --- a/test-data/message/text_alt_plain_html.eml +++ b/test-data/message/text_alt_plain_html.eml @@ -1,7 +1,7 @@ Subject: mime-modified test Message-ID: 12345@testrun.org Date: Sat, 07 Dec 2019 19:00:27 +0000 -To: alice@example.com +To: alice@example.org From: sender@testrun.org Content-Type: multipart/alternative; boundary="==BREAK==" diff --git a/test-data/message/wrong-html.eml b/test-data/message/wrong-html.eml index 9540209c6..6c8a7d092 100644 --- a/test-data/message/wrong-html.eml +++ b/test-data/message/wrong-html.eml @@ -1,5 +1,5 @@ Return-Path: -X-Original-To: alice@example.com +X-Original-To: alice@example.org Delivered-To: m045a7e8@dd37930.kasserver.com Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by dd37930.kasserver.com (Postfix) with ESMTPS id 271F34B4258C @@ -11,7 +11,7 @@ Received: from oxbsltgw18.schlund.de ([172.19.249.35]) by Date: Thu, 6 Aug 2020 18:40:30 +0200 (CEST) From: Camping Reply-To: Camping -To: Alice +To: Alice Message-ID: <512278196.1287440.1596732031020@email.ionos.fr> Subject: Re: subj? MIME-Version: 1.0