From 0dc0b4be6e9ba07774efedee102a23e89eef8e85 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 5 Jan 2018 16:17:51 +0100 Subject: Composer test --- components/kube/tests/tst_composerview.qml | 41 +++++++++-- framework/src/CMakeLists.txt | 1 + framework/src/domainobjectcontroller.cpp | 109 +++++++++++++++++++++++++++++ framework/src/domainobjectcontroller.h | 48 +++++++++++++ framework/src/frameworkplugin.cpp | 2 + tests/kubetestrunner.cpp | 32 +++++++++ 6 files changed, 226 insertions(+), 7 deletions(-) create mode 100644 framework/src/domainobjectcontroller.cpp create mode 100644 framework/src/domainobjectcontroller.h diff --git a/components/kube/tests/tst_composerview.qml b/components/kube/tests/tst_composerview.qml index 4b0362a7..b7b6b3df 100644 --- a/components/kube/tests/tst_composerview.qml +++ b/components/kube/tests/tst_composerview.qml @@ -20,6 +20,7 @@ import QtQuick 2.7 import QtTest 1.0 import "../qml" +import org.kube.framework 1.0 as Kube TestCase { id: testCase @@ -33,24 +34,50 @@ TestCase { focus: true } - function test_start() { + function test_1start() { verify(composer) } - function test_verifyInitialFocus() { + function test_2verifyInitialFocus() { var newMailButton = findChild(composer, "newMailButton"); verify(newMailButton) verify(newMailButton.activeFocus) } - function test_sendMessage() { - var mail = null + Component { + id: controllerComponent + Kube.DomainObjectController {} + } + + Component { + id: outboxComponent + Kube.OutboxModel {} + } + + function test_3sendMessage() { + 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 loadAsDraft = true - composer.loadMessage(mail, loadAsDraft) + composer.loadMessage(createdMail, loadAsDraft) var sendMailButton = findChild(composer, "sendButton") verify(sendMailButton) - verify(sendMailButton.enabled) + tryVerify(function(){ return sendMailButton.enabled }) sendMailButton.clicked() - //TODO verify the mail is sent + var outbox = outboxComponent.createObject(null, {}) + tryCompare(outbox, "count", 1) } } diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt index a5b2f6bc..526fbefe 100644 --- a/framework/src/CMakeLists.txt +++ b/framework/src/CMakeLists.txt @@ -46,6 +46,7 @@ add_library(kubeframework SHARED webengineprofile.cpp startupcheck.cpp keyring.cpp + domainobjectcontroller.cpp ) target_link_libraries(kubeframework sink diff --git a/framework/src/domainobjectcontroller.cpp b/framework/src/domainobjectcontroller.cpp new file mode 100644 index 00000000..eb1fd417 --- /dev/null +++ b/framework/src/domainobjectcontroller.cpp @@ -0,0 +1,109 @@ +/* + Copyright (c) 2018 Christian Mollekopf + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ +#include "domainobjectcontroller.h" + +#include +#include +#include +#include + +using namespace Kube; + +DomainObjectController::DomainObjectController(QObject *parent) + : QObject(parent) +{ + +} + +QStringList toStringList(const QVariantList &list) +{ + QStringList s; + for (const auto &e : list) { + s << e.toString(); + } + return s; +} + +void DomainObjectController::create(const QVariantMap &object) +{ + using namespace Sink::ApplicationDomain; + qWarning() << "Creating " << object; + auto type = object["type"].toString(); + if (type == getTypeName()) { + 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(), + {}, + {}, + {}, + {}); + + Sink::Query query; + query.containsFilter(ResourceCapabilities::Mail::storage); + query.filter("account1"); + Sink::Store::fetchAll(query) + .then([=](const QList &resources) { + if (!resources.isEmpty()) { + auto resourceId = resources[0]->identifier(); + qWarning() << "Using resource " << resourceId << " from account " << resources[0]->getAccount(); + auto mail = ApplicationDomainType::createEntity(resourceId); + mail.setMimeMessage(msg->encodedContent(true)); + Sink::Store::create(mail).exec(); + monitor(QVariant::fromValue(Mail::Ptr::create(mail))); + } else { + qWarning() << "No resources found."; + } + }).exec(); + } + +} + +void DomainObjectController::monitor(const QVariant &object) +{ + using namespace Sink::ApplicationDomain; + qWarning() << "Monitoring " << object; + auto mail = object.value(); + Q_ASSERT(mail); + Sink::Query query{*mail}; + query.setFlags(Sink::Query::LiveQuery); + mModel = Sink::Store::loadModel(query); + QObject::connect(mModel.data(), &QAbstractItemModel::rowsInserted, [=](const QModelIndex &index, int start, int end) { + for (int i = start; i <= end; i++) { + auto mail = mModel->index(i, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).value(); + mCurrentObject = QVariant::fromValue(mail); + emit currentObjectChanged(); + break; + } + }); +} + +QVariant DomainObjectController::currentObject() const +{ + return mCurrentObject; +} diff --git a/framework/src/domainobjectcontroller.h b/framework/src/domainobjectcontroller.h new file mode 100644 index 00000000..5805c5a8 --- /dev/null +++ b/framework/src/domainobjectcontroller.h @@ -0,0 +1,48 @@ +/* + Copyright (c) 2018 Christian Mollekopf + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ +#pragma once + +#include +#include +#include +#include + +namespace Kube { + +class DomainObjectController : public QObject +{ + Q_OBJECT + Q_PROPERTY(QVariant currentObject READ currentObject NOTIFY currentObjectChanged) +public: + explicit DomainObjectController(QObject *parent = 0); + + QVariant currentObject() const; + + Q_INVOKABLE void create(const QVariantMap &object); + Q_INVOKABLE void monitor(const QVariant &object); + +signals: + void currentObjectChanged(); + +private: + QVariant mCurrentObject; + QSharedPointer mModel; +}; + +} diff --git a/framework/src/frameworkplugin.cpp b/framework/src/frameworkplugin.cpp index 1de776a5..f768be1b 100644 --- a/framework/src/frameworkplugin.cpp +++ b/framework/src/frameworkplugin.cpp @@ -40,6 +40,7 @@ #include "startupcheck.h" #include "keyring.h" #include "controller.h" +#include "domainobjectcontroller.h" #include #include @@ -133,6 +134,7 @@ void FrameworkPlugin::registerTypes (const char *uri) qmlRegisterType(uri, 1, 0, "Settings"); qmlRegisterType(uri, 1, 0, "Listener"); + qmlRegisterType(uri, 1, 0, "DomainObjectController"); qmlRegisterSingletonType(uri, 1, 0, "Fabric", fabric_singletontype_provider); qmlRegisterType(uri, 1, 0, "KubeImage"); diff --git a/tests/kubetestrunner.cpp b/tests/kubetestrunner.cpp index b6c88341..3bf06d44 100644 --- a/tests/kubetestrunner.cpp +++ b/tests/kubetestrunner.cpp @@ -1,10 +1,42 @@ +/* + Copyright (c) 2018 Christian Mollekopf + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ #include #include +#include int main(int argc, char **argv) { QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true); Sink::Test::initTest(); + + auto resource = Sink::ApplicationDomain::DummyResource::create("account1"); + Sink::Store::create(resource).exec().waitForFinished(); + + auto transportResource = Sink::ApplicationDomain::MailtransportResource::create("account1"); + Sink::Store::create(transportResource).exec().waitForFinished(); + + auto identity = Sink::ApplicationDomain::Identity{}; + identity.setAccount("account1"); + identity.setAddress("identity@example.org"); + identity.setName("Identity Name"); + Sink::Store::create(identity).exec().waitForFinished(); + QTEST_ADD_GPU_BLACKLIST_SUPPORT QTEST_SET_MAIN_SOURCE_PATH return quick_test_main(argc, argv, "kubetest", 0); -- cgit v1.2.3