11 files changed, 64 insertions, 166 deletions

diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt
index ca72f050..e14fda4e 100644
--- a/accounts/CMakeLists.txt
+++ b/accounts/CMakeLists.txt
@@ -1,5 +1,13 @@
 include_directories(../framework/src/)
 
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Qml)
+
+find_package(Sink CONFIG REQUIRED)
+find_package(KAsync CONFIG REQUIRED)
+find_package(KF5 REQUIRED COMPONENTS Package Mime)
+
+include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
+
 add_subdirectory(maildir)
 add_subdirectory(imap)
 add_subdirectory(kolabnow)
diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
index 7a71264f..5be1b134 100644
--- a/accounts/gmail/CMakeLists.txt
+++ b/accounts/gmail/CMakeLists.txt
@@ -1,13 +1,5 @@
 project(kube-accounts-gmail)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
-
-find_package(Sink CONFIG REQUIRED)
-find_package(KAsync CONFIG REQUIRED)
-find_package(KF5 REQUIRED COMPONENTS Package Mime)
-
-include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-
 set(SRCS
     gmailsettings.cpp
     gmailaccountplugin.cpp
diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt
index 5ec32bbc..5bd25a93 100644
--- a/accounts/imap/CMakeLists.txt
+++ b/accounts/imap/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(kube-accounts-imap)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Qml)
 
 find_package(Sink CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
@@ -22,16 +22,6 @@ target_link_libraries(imapaccountplugin
     Qt5::Qml
 )
 
-add_library(imapaccount_static STATIC ${SRCS})
-target_link_libraries(imapaccount_static
-    sink
-    frameworkplugin
-    Qt5::Core
-    Qt5::Quick
-    Qt5::Qml
-)
-add_subdirectory(tests)
-
 kpackage_install_package(package org.kube.accounts.imap "genericqml")
 
 install(TARGETS imapaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/imap)
diff --git a/accounts/imap/tests/CMakeLists.txt b/accounts/imap/tests/CMakeLists.txt
deleted file mode 100644
index bdfffe4b..00000000
--- a/accounts/imap/tests/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-include_directories(../)
-add_executable(imapsettingstest settingstest.cpp)
-add_test(imapsettingstest imapsettingstest)
-target_link_libraries(imapsettingstest
-    sink
-    imapaccount_static
-    Qt5::Core
-    Qt5::Concurrent
-    Qt5::Test
-)
diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt
index 8b84d9da..fd168537 100644
--- a/accounts/kolabnow/CMakeLists.txt
+++ b/accounts/kolabnow/CMakeLists.txt
@@ -1,13 +1,5 @@
 project(kube-accounts-kolabnow)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
-
-find_package(Sink CONFIG REQUIRED)
-find_package(KAsync CONFIG REQUIRED)
-find_package(KF5 REQUIRED COMPONENTS Package Mime)
-
-include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-
 set(SRCS
     kolabnowsettings.cpp
     kolabnowaccountplugin.cpp
@@ -22,16 +14,6 @@ target_link_libraries(kolabnowaccountplugin
     Qt5::Qml
 )
 
-add_library(kolabnowaccount_static STATIC ${SRCS})
-target_link_libraries(kolabnowaccount_static
-    sink
-    frameworkplugin
-    Qt5::Core
-    Qt5::Quick
-    Qt5::Qml
-)
-# add_subdirectory(tests)
-
 kpackage_install_package(package org.kube.accounts.kolabnow "genericqml")
 
 install(TARGETS kolabnowaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/kolabnow)
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index 1b017328..dc0f02fe 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -1,13 +1,5 @@
 project(kube-accounts-maildir)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
-
-find_package(Sink CONFIG REQUIRED)
-find_package(KAsync CONFIG REQUIRED)
-find_package(KF5 REQUIRED COMPONENTS Package Mime)
-
-include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-
 set(SRCS
     maildirsettings.cpp
     maildiraccountplugin.cpp
@@ -22,16 +14,6 @@ target_link_libraries(maildiraccountplugin
     Qt5::Qml
 )
 
-add_library(maildiraccount_static STATIC ${SRCS})
-target_link_libraries(maildiraccount_static
-    sink
-    frameworkplugin
-    Qt5::Core
-    Qt5::Quick
-    Qt5::Qml
-)
-add_subdirectory(tests)
-
 kpackage_install_package(package org.kube.accounts.maildir "genericqml")
 
 install(TARGETS maildiraccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/maildir)
diff --git a/accounts/maildir/tests/CMakeLists.txt b/accounts/maildir/tests/CMakeLists.txt
deleted file mode 100644
index 13d706b2..00000000
--- a/accounts/maildir/tests/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-include_directories(../)
-add_executable(maildirsettingstest settingstest.cpp)
-add_test(maildirsettingstest maildirsettingstest)
-target_link_libraries(maildirsettingstest
-    sink
-    maildiraccount_static
-    Qt5::Core
-    Qt5::Test
-    Qt5::Concurrent
-)
diff --git a/accounts/maildir/tests/settingstest.cpp b/accounts/maildir/tests/settingstest.cpp
deleted file mode 100644
index bf041e3c..00000000
--- a/accounts/maildir/tests/settingstest.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <QTest>
-#include <QDebug>
-#include <QSignalSpy>
-#include <functional>
-#include <QStandardPaths>
-#include <QDir>
-#include <sink/test.h>
-#include <sink/store.h>
-
-#include "maildirsettings.h"
-
-class SettingsTest : public QObject
-{
-    Q_OBJECT
-private slots:
-
-    void initTestCase()
-    {
-        Sink::Test::initTest();
-    }
-
-    void testLoad()
-    {
-        auto accountId = "accountid";
-        auto maildirPath = QDir::tempPath();
-        auto smtpServer = QString("smtpserver");
-        auto smtpUsername = QString("username");
-        auto smtpPassword = QString("password");
-        auto username = QString("username");
-        auto emailAddress = QString("emailAddress");
-
-        MaildirSettings settings;
-        settings.setAccountIdentifier(accountId);
-        settings.setPath(maildirPath);
-        settings.setProperty("smtpServer", smtpServer);
-        settings.setProperty("smtpUsername", smtpUsername);
-        settings.setProperty("smtpPassword", smtpPassword);
-        settings.setProperty("userName", username);
-        settings.setProperty("emailAddress", emailAddress);
-        settings.save();
-
-        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
-            QCOMPARE(resources.size(), 2);
-        })
-        .exec().waitForFinished();
-
-        //Ensure we can read back all the information using the accountid
-        {
-            MaildirSettings readSettings;
-            QSignalSpy spy(&readSettings, &MaildirSettings::pathChanged);
-            QSignalSpy spy1(&readSettings, &MaildirSettings::smtpResourceChanged);
-            readSettings.setAccountIdentifier(accountId);
-            //Once for clear and once for once for the new setting
-            QTRY_COMPARE(spy.count(), 2);
-            QTRY_COMPARE(spy1.count(), 2);
-            QVERIFY(!readSettings.accountIdentifier().isEmpty());
-            QCOMPARE(readSettings.path().toString(), maildirPath);
-            QCOMPARE(readSettings.property("smtpServer").toString(), smtpServer);
-            QCOMPARE(readSettings.property("smtpUsername").toString(), smtpUsername);
-            QCOMPARE(readSettings.property("smtpPassword").toString(), smtpPassword);
-            QCOMPARE(readSettings.property("userName").toString(), smtpUsername);
-            QCOMPARE(readSettings.property("emailAddress").toString(), emailAddress);
-        }
-
-        {
-            MaildirSettings settings;
-            QSignalSpy spy(&settings, &MaildirSettings::pathChanged);
-            settings.setAccountIdentifier(accountId);
-            QTRY_COMPARE(spy.count(), 2);
-            settings.remove();
-        }
-
-        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
-            QCOMPARE(resources.size(), 0);
-        })
-        .exec().waitForFinished();
-    }
-};
-
-QTEST_GUILESS_MAIN(SettingsTest)
-#include "settingstest.moc"
diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt
index a22e8c06..8bb3d05c 100644
--- a/framework/src/CMakeLists.txt
+++ b/framework/src/CMakeLists.txt
@@ -69,5 +69,6 @@ set(BUILD_TESTING ON)
 
 add_subdirectory(domain/mime/tests)
 add_subdirectory(domain/mime/mimetreeparser)
+add_subdirectory(domain/settings/tests)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/framework/src/domain/settings/tests/CMakeLists.txt b/framework/src/domain/settings/tests/CMakeLists.txt
new file mode 100644
index 00000000..9cb3f37c
--- /dev/null
+++ b/framework/src/domain/settings/tests/CMakeLists.txt
@@ -0,0 +1,9 @@
+include_directories(../)
+add_executable(settingstest settingstest.cpp)
+add_test(settingstest settingstest)
+target_link_libraries(settingstest
+    frameworkplugin
+    Qt5::Core
+    Qt5::Concurrent
+    Qt5::Test
+)
diff --git a/accounts/imap/tests/settingstest.cpp b/framework/src/domain/settings/tests/settingstest.cpp
index 386a9082..2d997468 100644
--- a/accounts/imap/tests/settingstest.cpp
+++ b/framework/src/domain/settings/tests/settingstest.cpp
@@ -7,7 +7,42 @@
 #include <sink/test.h>
 #include <sink/store.h>
 
-#include "imapsettings.h"
+#include <accountsettings.h>
+
+
+class TestSettings : public AccountSettings
+{
+    Q_OBJECT
+
+public:
+    TestSettings(QObject *parent = 0)
+        : AccountSettings{parent}
+    {}
+
+    Q_INVOKABLE virtual void load() Q_DECL_OVERRIDE
+    {
+        loadAccount();
+        loadImapResource();
+        loadMailtransportResource();
+        loadIdentity();
+    }
+
+    Q_INVOKABLE virtual void save() Q_DECL_OVERRIDE
+    {
+        saveAccount();
+        saveImapResource();
+        saveMailtransportResource();
+        saveIdentity();
+    }
+
+    Q_INVOKABLE virtual void remove() Q_DECL_OVERRIDE
+    {
+        removeResource(mMailtransportIdentifier);
+        removeResource(mImapIdentifier);
+        removeIdentity();
+        removeAccount();
+    }
+};
 
 class SettingsTest : public QObject
 {
@@ -31,7 +66,7 @@ private slots:
         auto username = QString("username");
         auto emailAddress = QString("emailAddress");
 
-        ImapSettings settings;
+        TestSettings settings;
         settings.setAccountIdentifier(accountId);
         settings.setProperty("imapServer", imapServer);
         settings.setProperty("imapUsername", imapUsername);
@@ -50,9 +85,9 @@ private slots:
 
         //Ensure we can read back all the information using the accountid
         {
-            ImapSettings readSettings;
-            QSignalSpy spy(&readSettings, &ImapSettings::imapResourceChanged);
-            QSignalSpy spy1(&readSettings, &ImapSettings::smtpResourceChanged);
+            TestSettings readSettings;
+            QSignalSpy spy(&readSettings, &TestSettings::imapResourceChanged);
+            QSignalSpy spy1(&readSettings, &TestSettings::smtpResourceChanged);
             readSettings.setAccountIdentifier(accountId);
             //Once for clear and once for the new setting
             QTRY_COMPARE(spy.count(), 2);
@@ -83,9 +118,9 @@ private slots:
 
         //Read back settings again
         {
-            ImapSettings readSettings;
-            QSignalSpy spy(&readSettings, &ImapSettings::imapResourceChanged);
-            QSignalSpy spy1(&readSettings, &ImapSettings::smtpResourceChanged);
+            TestSettings readSettings;
+            QSignalSpy spy(&readSettings, &TestSettings::imapResourceChanged);
+            QSignalSpy spy1(&readSettings, &TestSettings::smtpResourceChanged);
             readSettings.setAccountIdentifier(accountId);
             //Once for clear and once for the new setting
             QTRY_COMPARE(spy.count(), 2);
@@ -102,8 +137,8 @@ private slots:
         }
 
         {
-            ImapSettings settings;
-            QSignalSpy spy(&settings, &ImapSettings::imapResourceChanged);
+            TestSettings settings;
+            QSignalSpy spy(&settings, &TestSettings::imapResourceChanged);
             settings.setAccountIdentifier(accountId);
             QTRY_COMPARE(spy.count(), 2);
             settings.remove();