4 files changed, 94 insertions, 34 deletions

diff --git a/components/kube/tests/tst_composerview.qml b/components/kube/tests/tst_composerview.qml
index d9cd2dfb..a315c79a 100644
--- a/components/kube/tests/tst_composerview.qml
+++ b/components/kube/tests/tst_composerview.qml
@@ -49,16 +49,6 @@ TestCase {
         verify(newMailButton.activeFocus)
     }
 
-    Component {
-        id: controllerComponent
-        Kube.DomainObjectController {}
-    }
-
-    Component {
-        id: outboxComponent
-        Kube.OutboxModel {}
-    }
-
     function test_3sendMessage() {
         var initialState = {
             accounts: [{
@@ -78,26 +68,21 @@ TestCase {
                     id: "resource2",
                     account: "account1",
                     type: "mailtransport"
+                }],
+                mails:[{
+                    resource: "resource1",
+                    subject: "subject",
+                    body: "body",
+                    to: ["to@example.org"],
+                    cc: ["cc@example.org"],
+                    bcc: ["bcc@example.org"],
+                    draft: true
                 }]
         }
         TestStore.setup(initialState)
         var composer = createTemporaryObject(composerComponent, testCase, {})
 
-        var domainObjectController = controllerComponent.createObject(null, {blocking: true})
-        var mail = {
-            type: "mail",
-            subject: "subject",
-            body: "body",
-            to: ["to@example.org"],
-            cc: ["cc@example.org"],
-            bcc: ["bcc@example.org"],
-            draft: true
-        }
-        domainObjectController.create(mail)
-
-        tryVerify(function(){ return domainObjectController.currentObject })
-        var createdMail = domainObjectController.currentObject
-        verify(createdMail)
+        var createdMail = TestStore.load("mail", {resource: "resource1"})
 
         var loadAsDraft = true
         composer.loadMessage(createdMail, loadAsDraft)
@@ -105,7 +90,9 @@ TestCase {
         verify(sendMailButton)
         tryVerify(function(){ return sendMailButton.enabled })
         sendMailButton.clicked()
-        var outbox = outboxComponent.createObject(null, {})
-        tryCompare(outbox, "count", 1)
+
+        tryVerify(function(){ return TestStore.load("mail", {resource: "resource2"}) })
+        //TODO ensure draft is deleted
+        //TODO ensure draft is deleted
     }
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ca394d9e..b5eb2a96 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,4 +7,5 @@ target_link_libraries(kubetestrunner
     Qt5::QuickTest
     Qt5::Quick
     sink
+    kubeframework
 )
diff --git a/tests/teststore.cpp b/tests/teststore.cpp
index a8cd0b2d..728af885 100644
--- a/tests/teststore.cpp
+++ b/tests/teststore.cpp
@@ -19,10 +19,15 @@
 #include "teststore.h"
 
 #include <sink/store.h>
+#include <sink/resourcecontrol.h>
+#include <sink/secretstore.h>
+#include <kmime/kmime_message.h>
 
 #include <QDebug>
 #include <QVariant>
 
+#include "framework/src/domain/mime/mailtemplates.h"
+
 using namespace Kube;
 
 static void iterateOverObjects(const QVariantList &list, std::function<void(const QVariantMap &)> callback)
@@ -33,20 +38,62 @@ static void iterateOverObjects(const QVariantList &list, std::function<void(cons
     }
 }
 
+static QStringList toStringList(const QVariantList &list)
+{
+    QStringList s;
+    for (const auto &e : list) {
+        s << e.toString();
+    }
+    return s;
+}
+
+static void createMail(const QVariantMap &object)
+{
+    using namespace Sink::ApplicationDomain;
+
+    auto toAddresses = toStringList(object["to"].toList());
+    auto ccAddresses = toStringList(object["cc"].toList());
+    auto bccAddresses = toStringList(object["bcc"].toList());
+
+    KMime::Types::Mailbox mb;
+    mb.fromUnicodeString("identity@example.org");
+    auto msg = MailTemplates::createMessage({},
+            toAddresses,
+            ccAddresses,
+            bccAddresses,
+            mb,
+            object["subject"].toString(),
+            object["body"].toString(),
+            {},
+            {},
+            {},
+            {});
+
+    auto mail = ApplicationDomainType::createEntity<Mail>(object["resource"].toByteArray());
+    mail.setMimeMessage(msg->encodedContent(true));
+    Sink::Store::create<Mail>(mail).exec().waitForFinished();
+}
+
 void TestStore::setup(const QVariantMap &map)
 {
-    iterateOverObjects(map.value("resources").toList(), [] (const QVariantMap &object) {
+    QByteArrayList resources;
+    iterateOverObjects(map.value("resources").toList(), [&] (const QVariantMap &object) {
+        resources << object["id"].toByteArray();
         auto resource = [&] {
+            using namespace Sink::ApplicationDomain;
+            auto resource = ApplicationDomainType::createEntity<SinkResource>("", object["id"].toByteArray());
             if (object["type"] == "dummy") {
-                return Sink::ApplicationDomain::DummyResource::create(object["account"].toByteArray());
-            }
-            if (object["type"] == "mailtransport") {
-                return Sink::ApplicationDomain::MailtransportResource::create(object["account"].toByteArray());
+                resource.setResourceType("sink.dummy");
+            } else if (object["type"] == "mailtransport") {
+                resource.setResourceType("sink.mailtransport");
+            } else {
+                Q_ASSERT(false);
             }
-            Q_ASSERT(false);
-            return Sink::ApplicationDomain::SinkResource{};
+            return resource;
         }();
+        resource.setAccount(object["account"].toByteArray());
         Sink::Store::create(resource).exec().waitForFinished();
+        Sink::SecretStore::instance().insert(resource.identifier(), "secret");
     });
 
     iterateOverObjects(map.value("identities").toList(), [] (const QVariantMap &object) {
@@ -56,4 +103,27 @@ void TestStore::setup(const QVariantMap &map)
         identity.setName(object["name"].toString());
         Sink::Store::create(identity).exec().waitForFinished();
     });
+
+    iterateOverObjects(map.value("mails").toList(), createMail);
+
+    Sink::ResourceControl::flushMessageQueue(resources).exec().waitForFinished();
+}
+
+QVariant TestStore::load(const QByteArray &type, const QVariantMap &filter)
+{
+    using namespace Sink::ApplicationDomain;
+    if (type == "mail") {
+        Sink::Query query;
+        if (filter.contains("resource")) {
+            query.resourceFilter(filter.value("resource").toByteArray());
+        }
+        auto list = Sink::Store::read<Mail>(query);
+        if (!list.isEmpty()) {
+            return QVariant::fromValue(Mail::Ptr::create(list.first()));
+        }
+        return {};
+    }
+
+    Q_ASSERT(false);
+    return {};
 }
diff --git a/tests/teststore.h b/tests/teststore.h
index f0578ca5..e8fce6da 100644
--- a/tests/teststore.h
+++ b/tests/teststore.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <QObject>
+#include <QVariant>
 
 namespace Kube {
 
@@ -26,6 +27,7 @@ class TestStore : public QObject {
     Q_OBJECT
 public:
     Q_INVOKABLE void setup(const QVariantMap &);
+    Q_INVOKABLE QVariant load(const QByteArray &type, const QVariantMap &);
 };
 
 }