1 files changed, 26 insertions, 8 deletions

diff --git a/framework/src/domain/mime/tests/mailtemplatetest.cpp b/framework/src/domain/mime/tests/mailtemplatetest.cpp
index 6338cd58..d5642bb6 100644
--- a/framework/src/domain/mime/tests/mailtemplatetest.cpp
+++ b/framework/src/domain/mime/tests/mailtemplatetest.cpp
@@ -31,16 +31,16 @@ static std::vector< GpgME::Key, std::allocator< GpgME::Key > > getKeys(bool smim
     if (smime) {
         const QGpgME::Protocol *const backend = QGpgME::smime();
         Q_ASSERT(backend);
-        job = backend->keyListJob(false);
+        job = backend->keyListJob(/* remote = */ false);
     } else {
         const QGpgME::Protocol *const backend = QGpgME::openpgp();
         Q_ASSERT(backend);
-        job = backend->keyListJob(false);
+        job = backend->keyListJob(/* remote = */ false);
     }
     Q_ASSERT(job);
 
     std::vector< GpgME::Key > keys;
-    GpgME::KeyListResult res = job->exec(QStringList(), true, keys);
+    GpgME::KeyListResult res = job->exec(QStringList(), /* secretOnly = */ true, keys);
 
     if (!smime) {
         Q_ASSERT(keys.size() == 3);
@@ -401,7 +401,7 @@ private slots:
 
         std::vector<GpgME::Key> keys = getKeys();
 
-        auto result = MailTemplates::createMessage({}, to, cc, bcc, from, subject, body, false, attachments, keys);
+        auto result = MailTemplates::createMessage({}, to, cc, bcc, from, subject, body, false, attachments, keys, {}, keys[0]);
 
         QVERIFY(result);
         // qWarning() << "---------------------------------";
@@ -409,9 +409,17 @@ private slots:
         // qWarning() << "---------------------------------";
         QCOMPARE(result->subject()->asUnicodeString(), subject);
         QVERIFY(result->date(false)->dateTime().isValid());
-        QVERIFY(result->contentType()->isMimeType("multipart/signed"));
 
-        const auto contents = result->contents();
+        QCOMPARE(result->contentType()->mimeType(), "multipart/mixed");
+        auto resultAttachments = result->attachments();
+        QCOMPARE(resultAttachments.size(), 1);
+        QCOMPARE(resultAttachments[0]->contentDisposition()->filename(), "0x8F246DE6.asc");
+
+        auto signedMessage = result->contents()[0];
+
+        QVERIFY(signedMessage->contentType()->isMimeType("multipart/signed"));
+
+        const auto contents = signedMessage->contents();
         QCOMPARE(contents.size(), 2);
         {
             auto c = contents.at(0);
@@ -441,9 +449,19 @@ private slots:
         QVERIFY(result);
         QCOMPARE(result->subject()->asUnicodeString(), subject);
         QVERIFY(result->date(false)->dateTime().isValid());
-        QVERIFY(result->contentType()->isMimeType("multipart/signed"));
 
-        const auto contents = result->contents();
+        QCOMPARE(result->contentType()->mimeType(), "multipart/mixed");
+        auto resultAttachments = result->attachments();
+        QCOMPARE(resultAttachments.size(), 3);
+        // It seems KMime searches for the attachments using depth-first
+        // search, so the public key is last
+        QCOMPARE(resultAttachments[2]->contentDisposition()->filename(), "0x8F246DE6.asc");
+
+        auto signedMessage = result->contents()[0];
+
+        QVERIFY(signedMessage->contentType()->isMimeType("multipart/signed"));
+
+        const auto contents = signedMessage->contents();
         QCOMPARE(contents.size(), 2);
         {
             auto c = contents.at(0);