ENGINE-633: some non-pEp mail tests added

test/src/DefaultFromEmailTest.cc

@@ -842,10 +842,20 @@ TEST_F(DefaultFromEmailTest, check_pEp_v2_2_import_two_alternate_available) {
 
 // A. Test successful cases
 
-TEST_F(DefaultFromEmailTest, check_unencrypted_key_import_carol) {
+TEST_F(DefaultFromEmailTest, check_unencrypted_key_import_bob_no_pEp) {
+    const TestUtilsPreset::IdentityInfo& sender_info = TestUtilsPreset::presets[TestUtilsPreset::BOB];
+    set_up_and_check_initial_identities(TestUtilsPreset::BOB, sender_info);
+
+    // Ok, we now have a blank slate. Run the import mail fun.
+    read_decrypt_check_incoming_mail("test_mails/CanonicalFrom2.2BobToAliceUnencrypted_OpenPGP.eml",
+                                     PEP_rating_unencrypted, PEP_UNENCRYPTED);
+
+    // Check that the default key matches the canonical default key for this sender,
+    // if expected to be present.
+    check_sender_default_key_status(sender_info, PEP_ct_OpenPGP_unconfirmed);
 }
 
-TEST_F(DefaultFromEmailTest, check_unencrypted_key_import_john) {
+TEST_F(DefaultFromEmailTest, check_unencrypted_key_import_sylvia_no_pEp) {
 }
 
 TEST_F(DefaultFromEmailTest, check_unencrypted_key_import_sylvia) {
@@ -853,13 +863,12 @@ TEST_F(DefaultFromEmailTest, check_unencrypted_key_import_sylvia) {
     set_up_and_check_initial_identities(TestUtilsPreset::SYLVIA, sender_info);
 
     // Ok, we now have a blank slate. Run the import mail fun.
-    read_decrypt_check_incoming_mail("test_mails/CanonicalFrom2.2SylviaToAliceUnencrypted.eml", 
+    read_decrypt_check_incoming_mail("test_mails/CanonicalFrom2.2SylviaToAliceUnencrypted_OpenPGP.eml",
                                      PEP_rating_unencrypted, PEP_UNENCRYPTED);
 
     // Check that the default key matches the canonical default key for this sender,
     // if expected to be present.
-    check_sender_default_key_status(sender_info, PEP_ct_pEp_unconfirmed);
-
+    check_sender_default_key_status(sender_info, PEP_ct_OpenPGP_unconfirmed);
 }
 
 TEST_F(DefaultFromEmailTest, check_unencrypted_key_import_bob) {

test/test_mails/CanonicalFrom2.2BobToAliceUnencrypted_OpenPGP.eml

@@ -0,0 +1,67 @@
+X-Envelope-From: <pep.test.bob@pep-project.org>
+X-Delivery-Time: 1624019274
+X-UID: 25795
+Return-Path: <pep.test.bob@pep-project.org>
+From: pep.test.bob@pep-project.org
+Subject: unencrypted mail with key
+To: pep.test.alice@pep-project.org
+Message-ID: <a000ead8-8ded-eead-4094-a557845ec069@darthmama.org>
+Date: Fri, 18 Jun 2021 14:27:53 +0200
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
+ Thunderbird/78.8.1
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="------------CFDC8333F6E9B7FAB7FB0D85"
+Content-Language: en-US
+
+This is a multi-part message in MIME format.
+--------------CFDC8333F6E9B7FAB7FB0D85
+Content-Type: text/plain; charset=utf-8; format=flowed
+Content-Transfer-Encoding: 7bit
+
+Here's an unencrypted OpenPGP mail with my key, fools!
+
+
+
+
+--------------CFDC8333F6E9B7FAB7FB0D85
+Content-Type: text/plain; charset=UTF-8;
+ name="pep-test-bob-0xC9C2EE39_pub.asc"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+ filename="pep-test-bob-0xC9C2EE39_pub.asc"
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUVOQkZWNFBsOEJDQUN1
+dWtRTHdzSGZ0SDVqa1ZzU0w3Q09GaGFtTnNFRThsWjhNRzFmMVJ4NXp0UHVaVG5hCllYeVdP
+RGdwajJCeHowVGNQK1ExN0diTEtzZTdUV0QxazlpMVJ6TFd6OFpTQ0xZcTJUdGpMV1BsZVZ1
+R0dXZXEKWTN0VFdIQy9uRmJpdm9sTlBBMG1MMjAzOFRHZEJvbFBhWmlQWjRQOHd1UVZZTmZE
+cWk0dXRjZXpHRE5TOE9IaApFUGhmeUtLb1NNNzlITG9VUGM2eHNmaW14UE1yeWxJL2k4YkZ2
+ZkRZejV2bXlkZWZ2QXhOaHFqTEgzR21oajFwCm5JbnNyYUVpeWg3WTJ6QXhDZnI2aEQ5bmt5
+N1dpeEJpbktGRmhRcGNVdTFvK0llNlVHd0xWYlR5Uk1PY1Jzb2IKeWFocUEvbTJIZkRSajFZ
+K244SEhxc1FrQjJCdG1NWVhsYTNqQUJFQkFBRzBRWEJGY0NCVVpYTjBJRUp2WWlBbwpkR1Z6
+ZENCclpYa3NJR1J2YmlkMElIVnpaU2tnUEhCbGNDNTBaWE4wTG1KdllrQndaWEF0Y0hKdmFt
+VmpkQzV2CmNtYytpUUU0QkJNQkFnQWlCUUpWZUQ1ZkFoc0RCZ3NKQ0FjREFnWVZDQUlKQ2dz
+RUZnSURBUUllQVFJWGdBQUsKQ1JCWnYvU0l5Y0x1T2FSNUNBQ2ozRTZ5a05xakdTNVB6Z2hZ
+ZkxKc282ajk1NFF6THdPb3pUelUvMy9IV0g0bApDM0ptZnIwcEdJNTFLWjZYZXZycDNOOVN4
+UnFydUpDRlJ0d05lSDN1aklnRGgvVUhDVUVzUC8rZDc0U09lbklCCllHVUtFMU9KbWg4L0xR
+ZGtOU2M2Sk5kekpqRFdkS2VoNmNBTUZ2V2p1L05xdGwvbDBGR3NwUVU5ZG1DTXR6a0sKZ213
+b0taVzU2YUVWWjJsVHhxTkVvMWFRK2xMck51ZUJxMC9RNWtBVkV6VUc3VWZtMTl3WGpXZW5F
+TWVlRWxYMwpVQUd1ZExKdWNreDd1RDhXL3lCd3FyUkFiYUNTZVpmNlJWQkx6OTZla2pXclZm
+TW5tamtQdVFQUHQ1Y3M5OFJ4ClFUcHhrN2I2eExhV1h5bWhBNmNZVStGQVc0RHBiamZKak1X
+SUZEY0t1UUVOQkZWNFBsOEJDQURLUTJTVjZnalIKNU42OXhWZGlDYWVmandvYnJYUjFuaXVC
+SEJOVFhNSndQazJ4ditlN2ZZMjhSSzFCek9EWUN6QmhwbHR2Um9DYwpKaTlTN1JxeXo4MW5i
+eG53LzFUYUt0bjZkRERoWlBWSGpOM3Zhc0R1ZU02eFRFZkVpaE5jME93ZjR3ejlTQmp1CnJl
+ZFVWa2RUeFU3RnhTZ1ZQMTBkT3hoZHRraldqR1cxREY2V2xZQThCQUlFZGJwb2hlSkh6M05G
+a2hQUThEbHoKbzdJb2UydDd2clR6dGNCWDExbzJlK0ZQT3ExU21oRXI3OHdiUk9BeUNWQVhL
+KzhxRGg0ekRxOGlBTVpLL0tuWgpybTZwUDAwK2lCUmNiK0pRZ24zR24raFUwbGdFM1lCOWtC
+SkxlV2FIeEVQTm5uTk52Vy9CTWw1M2N0ZjhJcCtwCnpwQTFLL1MyM0tVN0FCRUJBQUdKQVI4
+RUdBRUNBQWtGQWxWNFBsOENHd3dBQ2drUVdiLzBpTW5DN2pscWJ3Zi8KZFA0c1hEUmlSNXVW
+TWg1V2hPbjFTOE1uSFpoTFdBUTZmSTkvS3hnZ0NQaGdZNnpBZ3N6UE11dHpCc1FsVjRQNgpR
+WDMwZDk5SU1KcnpHWVl4ak43WjZmRjd1czl1MTAzK0dUekdRSDcvNDdKRzBlU1RTYUtRdnFF
+YU4xKzZNL09CClpLY3dOVzZ4SGErbGhJUzVuSkdWM09leS9SRlF3dWNCdWpRYnR5akROM2FH
+c2h3cXpoSlhGQmxGM1JxRnpMeHUKQUptZU9WZWRhS3ZkUGpSaGdGdXhoa2ljVWhWcDI3cVhR
+Q3BEcGtVa2o5aGI3NXlDRTZwQXpvcE82czY1eUhzbgpGeWVod2d5TXJmcFRQbFBNODZCMUxI
+NElFd1NhT3JFSlNkSG5uRkQ4bm5TSWpSeWZyYTNkc0kvUlZObVlYOEVrCk1HSUN6b1I0bFdj
+WUZTaEpRTTZRUWc9PQo9dWdpRQotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0t
+Cg==
+--------------CFDC8333F6E9B7FAB7FB0D85--

test/test_mails/CanonicalFrom2.2SylviaToAliceUnencrypted_OpenPGP.eml

@@ -0,0 +1,89 @@
+From: sylvia@darthmama.org
+Subject: unencrypted mail with key
+To: Alice Spivek Hyatt <pep.test.alice@pep-project.org>
+Message-ID: <426741a7-9142-117a-bba1-249b6068b104@darthmama.org>
+Date: Fri, 18 Jun 2021 14:22:06 +0200
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
+ Thunderbird/78.8.1
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="------------CE0FAF85E74A139FFF01B697"
+Content-Language: en-US
+
+This is a multi-part message in MIME format.
+--------------CE0FAF85E74A139FFF01B697
+Content-Type: text/plain; charset=utf-8; format=flowed
+Content-Transfer-Encoding: 7bit
+
+Here's an unencrypted OpenPGP mail with my key, fools!
+
+
+--------------CE0FAF85E74A139FFF01B697
+Content-Type: text/plain; charset=UTF-8;
+ name="sylvia-0x585A6780_pub.asc"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+ filename="sylvia-0x585A6780_pub.asc"
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUlOQkdDNC9PVUJFQUM3
+Z2Z3NUk4eldtcHVXWWRLeTNZZGF3bXBSaE5sMTBsTmhBY1o0ZDBack01YjhQcWVzCmZXN21H
+MStLOTZ5dHdmS3ZzaWlRWEorTGN2dGowcUlRTm03YlN6NEFTOXQ0ZHIvNFIrMFVxYmw4NGxU
+RGlQN2cKVUJobVNMdERhOU16bVA0WXZDclRRS2kxSjhvUlkvaEpWN2UrZkNBQVpVTDAvdks1
+NFEyaWMxdTlndUk5Njd4dQpxQTZEOWFSNHkrOVZRRFdmN1dEZkhiZ2NaTk9ldkZSTHlVZHNO
+VmdvVFNKbWZDOUYzOE42b05ub3pBVUFNRm53CmVFRk5yUXB5T2lVWG5kRm9sdEQrdzZpT0l6
+Z2k1ZkpvQnRzQklSUmYrVGtwTXAzQlpSdUNjc2Q2ZmlGNC9Ha0kKSE1JcHhpUDBrRWo2Smcz
+a0VTNFpqTk9DeWxhNU5wN0g4UnYveGRGVWRvWGJyL2lkQWtERDRQRTNxV1pDMnF2cQpFUnlD
+aS9vbTJOL2pPaWU2VlhtTHNhcUZCSzVKTTJxTVMzWTY2Z1IzWEthTFZpMlhTeTQxZy9Xcm54
+dU9KMGlpCjgycThXZytYR2lUT05DTXI4S29GVEtKNk1Wd3N0TE5ySE1iVnN1UTc0ZHlmbUV4
+c3VsSmY5aGtiWFNpelNmZ0IKRmFjQmJlVm5GeWtTKzJyVHhrYWdzK0wrR1d1UkpBRWthOVJJ
+V2wySmI4VW9JSk9tNzMzNlg0bXFQUHRIb2tvSwpRd1M0OXU2a1FTRWt6RE9BSzR2c01seTly
+bFA0WWhsdWNHMG9FclRGVmczWk0xMjBmeCtQMXlkTEdVQjVMZWRNCm9zaFc2N2FpK0t2REZa
+U0txZ3JjcThFOGUvUVgvTmxwYnN1VDcrZm5naUMxVHNDSVpNNDZhR0w5dVFBUkFRQUIKdEhO
+VGVXeDJhV0VnVUd4aGRHZ2dLRU5oYm05dWFXTmhiR3g1SUdsdWRHVnVaR1ZrSUdadmNpQndj
+bVYyYVc5MQpjMng1SUhWdWEyNXZkMjRnY21WamFYQnBaVzUwY3lBdElHbHVkSEp2WkhWalpX
+UWdTblZ1WlNBeU1ESXhLU0E4CmMzbHNkbWxoUUdSaGNuUm9iV0Z0WVM1dmNtYytpUUpPQkJN
+QkNBQTRGaUVFREE4RlB1MkhCWXh6TUtFZkVMaWQKTVZoYVo0QUZBbUM0L09VQ0d3TUZDd2tJ
+QndJR0ZRb0pDQXNDQkJZQ0F3RUNIZ0VDRjRBQUNna1FFTGlkTVZoYQpaNEM1TFJBQWpUZE1C
+TndETFlpLzFoOU0yUVEvdTZvRlAzaUZpMm5pdkF6WUNvbmc0bEdNSVp5SEk1YUtvclRkCmx4
+NFIxSjBXUHl0VlJtZXcyeHFyU29DcDlqZlVER3J0R0pBbGs1ZjFMeis0VjlqNkF0RDdsbitK
+Sy9YL0NHSU0KRy9jTlVkdkRJMEhJNlRwaC9YRDlCRVlITkg5cG9lSTQ5UHFmenQyc2taRCtj
+bmNFOGxORVJHd2U4SGxLYzZrRApKOWRTYmNlZmZLT0sxSzE5QWs0NTRXYVhUTTk2YzBPZFcw
+T3dKRTVzVVVNMHNqd09ob3ZoSU1DbTk0STZHZG82CnNwRHpxck1WNnFXcTE4aXhaUG9BZFVQ
+d2JkKzkvL1ZJYVRVdlA1QWZhQlVyR0dtamF2M2cwcEhLcm1DTG1vM0YKc21rMVpiVlVHUnk1
+M3lQV0xwWFo5dEM5VnZiam0wOFJBczZ5WVYyREJBYXAwcmtDbExkb0RRazRhcnI5dUxSTwpK
+QnNXY21VaFYxNkUyL0NWdjliVXZuUERwL2JlZ0p3ZWQ4YUQrQldwdlZZeEdNYThzbi9FWXl5
+T1AxQmg3S0JvCmhlUWRsL2QzU09lOGY5NkVha0JjSXBXaEY5eDg3MkUzWEVxRXZpZDJFMm5H
+eWJyRys0Qng2NXErQXNEQUQzcncKVHZJMEJrbHdBaFZ5eDVjb3owMjJtTFl1b3FOenBqSHFK
+SWhFUk1ndTdLWDJwT3U3YkhjZGlZNDNNd2k2NWVqSgpRVjdBdldmL29RcSt2ZDdzNS9IVjg0
+cFNhYVg0UTl6VHB2YXpQQStZemJVSjRqQXc5Yk96V0w1YlFva25vSVFNCkRUeHpBWWlTWllE
+SzJCOW9kVVBRSkEyM0hRajZmanlUZWZjcDV1N3lUOEhmbW9VYjB4NjVBZzBFWUxqODVRRVEK
+QUxlOHM0dDhpYU4xQU40aXNFeWhENllkTzh1OGNjNVROQWtrTHZQS2VKWlMvWnd3b0ZQU0kr
+Y2lYZjJBUjlwUwowa0REZzhVdnNsbnVWU0Nhc1JoN1FOOWJ3Q3llYzR3ajNja1ZiTjIyL3Na
+WDNCUVRNL2RCNDNSRENwcUFYbEFzCnhoMS9Nd092WUVQdzNMaGtBc1dMYmFGV0JRQjhQOVht
+V3lIOXRCVnlSamFIcEdScEEzcEd6L2pIUjIvY2V6RzkKYnprMGpQRUQ3SWhTcURGSEVOajJO
+KzFBRnIrdmRMNW1Gc0VSMkt5eTN0aTZjc2R3VmpTbHZsZVZjYXk0a28zagpQWkVlcGFvNzFw
+M2RBRVNmM3pWbW03UDlkZHdUa0wySkE2WjhiclVpSHlyY0U3cExlSTRKcHVQWTJwTjBFYlpI
+CnBJM1crbTVERFhFVXpIajFGQ2lsNzgxVUx0cVl5L2xXaitVWHJ6NzBHdHl4Z044VFhMY1VT
+M2tjekhHMUtSZ2QKVy95MkhTNWhabTNCMENWTTBHMkY3Y3hqVFZLV3UyKzlwSk56cnBld2d0
+TWtUK0MrS2JoR3Z1UUJVTEdjcGIzTgpHVHcwb1hQakQ1T2l5MU1wQitQdjdGbXdzQVFYVlBa
+QmlJYUt0WWMxRSthTUdhUjVlam9lTjY1dERwTGlRSi84CjArTTBwVFpibHNDS2MwYThwTlVG
+NFVydFA4encrOFhCODZwb1RyM2VvSm9yV2gvSU1BLzRqUGtEaWZ5N0pRRGUKUGorSmhNMm9Z
+VEtIb0VGM1BFUnVJM0U0VE4zY0JWSGR4TDVqTW1OdlBxVEZySFNoWGN2SlRqWWF2Uy9MUUtX
+QwpvWDZ3SFZkMUdNcFAzdWY3ZnZHVUtnUWprcUllbjg2OG81VVBvQWNlQVNvSEFCRUJBQUdK
+QWpZRUdBRUlBQ0FXCklRUU1Ed1UrN1ljRmpITXdvUjhRdUoweFdGcG5nQVVDWUxqODVRSWJE
+QUFLQ1JBUXVKMHhXRnBuZ0h2TUVBQ3AKcFh5Nko5cDlCclo5cXNpZkNXR3lsMyttM2xRNUlk
+ZmpjVG9LaDJ3UlBYL3Z5WWtXQ3FTaGxrdU40eTFFNUN4aQpWWDY1MTR0b0dkbnJxWnhybjMr
+ZDFycnY0cWFYbmJpUGIzVWVWQk43Njd3R3VuQ1JUK251SGttZmMzRC9ORHBoCjJCWGlVSHR2
+RmNjL3F4dFZDcWtSNksvRTFENGkvS0hEOE1RdmNOdjBrbGFtOEVPcCtOMW5NNjRFVUtrMEpN
+K1kKRUE2TDduSHhmZmlBTlNGVnpwTmJmZ3BwaUg0dzhEYXd1YkF3ek84bjhKbGlNbkllak5t
+OVo2QS8xbmgwZXYwUwpJMlJRbnc5L3VLa245eDNaVXZUbHRKVlB6SWRMdktCdGdmc1h1eWY1
+RXVDSkgxS0daalUzRmgreThoa0F6V20xCnJTV3c4TWpmamJ5Z0VzR0lhQzZsSzV5VTM5SGtG
+dDB4Y3VZVWVNYmpCMGgxdS8vUE0rUXByUkVlVEltM3hNR2oKdlF1L3IzRXdsNHBmV0oxSTls
+Mi9WNDRaNWZ3eGNNQ1JoUkkxTnJLQzJIc3dGd09NcEVsWi95ZDE3YWVYbmV1OApubzJkWGJE
+UWVCTCtRMWRac3oxWEJJQktMa29TMXdFZmFoUE5PYXFYT3A3aHhaTk1qZGZLWEZRZWxRcXB1
+MXpJCnZ4Wmkvb2ZvU1R5d21qaWdyQzdNcTNQRHV2TmdKV3puZG1PbndkQ2MvQkQ4UXBUcFpB
+MDFOTFVBQ2tNWGEyaWsKVExINmxqakdZcWFKakJRVjRJREdVbzJVOFErS0hYa0oraU5DcnI0
+OHJRQjJ4cHhIeDFQQy9XRjBPUUhYSE5WRApsSzROa0xHcE1LRXZiT2dacnlXNVRxbElxeERV
+ZmREcVI4TFBlUmdSSUE9PQo9KzQyagotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBCTE9DSy0t
+LS0tCg==
+--------------CE0FAF85E74A139FFF01B697--