1 files changed, 47 insertions, 3 deletions

diff --git a/framework/src/domain/settings/tests/settingstest.cpp b/framework/src/domain/settings/tests/settingstest.cpp
index 2d997468..3b8ae69b 100644
--- a/framework/src/domain/settings/tests/settingstest.cpp
+++ b/framework/src/domain/settings/tests/settingstest.cpp
@@ -24,6 +24,8 @@ public:
         loadAccount();
         loadImapResource();
         loadMailtransportResource();
+        loadMaildirResource();
+        loadCardDavResource();
         loadIdentity();
     }
 
@@ -32,6 +34,8 @@ public:
         saveAccount();
         saveImapResource();
         saveMailtransportResource();
+        saveMaildirResource();
+        saveCardDavResource();
         saveIdentity();
     }
 
@@ -39,6 +43,8 @@ public:
     {
         removeResource(mMailtransportIdentifier);
         removeResource(mImapIdentifier);
+        removeResource(mMaildirIdentifier);
+        removeResource(mCardDavIdentifier);
         removeIdentity();
         removeAccount();
     }
@@ -56,7 +62,6 @@ private slots:
 
     void testLoad()
     {
-        auto accountId = "accountid";
         auto imapServer = QString("imapserver");
         auto imapUsername = QString("imapName");
         auto imapPassword = QString("imapPw");
@@ -65,21 +70,33 @@ private slots:
         auto smtpPassword = QString("smtpPw");
         auto username = QString("username");
         auto emailAddress = QString("emailAddress");
+        auto path = QString("path");
+        auto accountName = QString("accountName");
+        auto carddavServer = QString("carddavServer");
+        auto carddavUsername = QString("carddavUsername");
+        auto carddavPassword = QString("carddavPassword");
 
         TestSettings settings;
-        settings.setAccountIdentifier(accountId);
+        settings.setProperty("accountType", "test");
+        settings.setProperty("accountName", accountName);
         settings.setProperty("imapServer", imapServer);
         settings.setProperty("imapUsername", imapUsername);
         settings.setProperty("imapPassword", imapPassword);
         settings.setProperty("smtpServer", smtpServer);
         settings.setProperty("smtpUsername", smtpUsername);
         settings.setProperty("smtpPassword", smtpPassword);
+        settings.setProperty("carddavServer", carddavServer);
+        settings.setProperty("carddavUsername", carddavUsername);
+        settings.setProperty("carddavPassword", carddavPassword);
+        settings.setProperty("path", path);
         settings.setProperty("userName", username);
         settings.setProperty("emailAddress", emailAddress);
         settings.save();
 
+        auto accountId = settings.accountIdentifier();
+
         Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
-            QCOMPARE(resources.size(), 2);
+            QCOMPARE(resources.size(), 4);
         })
         .exec().waitForFinished();
 
@@ -88,29 +105,45 @@ private slots:
             TestSettings readSettings;
             QSignalSpy spy(&readSettings, &TestSettings::imapResourceChanged);
             QSignalSpy spy1(&readSettings, &TestSettings::smtpResourceChanged);
+            QSignalSpy spy2(&readSettings, &TestSettings::cardDavResourceChanged);
+            QSignalSpy spy3(&readSettings, &TestSettings::changed);
+            QSignalSpy spy4(&readSettings, &TestSettings::pathChanged);
             readSettings.setAccountIdentifier(accountId);
             //Once for clear and once for the new setting
             QTRY_COMPARE(spy.count(), 2);
             QTRY_COMPARE(spy1.count(), 2);
+            QTRY_COMPARE(spy2.count(), 2);
+            QTRY_COMPARE(spy3.count(), 2);
+            QTRY_COMPARE(spy4.count(), 2);
             QVERIFY(!readSettings.accountIdentifier().isEmpty());
+            QCOMPARE(readSettings.property("accountName").toString(), accountName);
             QCOMPARE(readSettings.property("imapServer").toString(), imapServer);
             QCOMPARE(readSettings.property("imapUsername").toString(), imapUsername);
             QCOMPARE(readSettings.property("imapPassword").toString(), imapPassword);
             QCOMPARE(readSettings.property("smtpServer").toString(), smtpServer);
             QCOMPARE(readSettings.property("smtpUsername").toString(), smtpUsername);
             QCOMPARE(readSettings.property("smtpPassword").toString(), smtpPassword);
+            QCOMPARE(readSettings.property("carddavServer").toString(), carddavServer);
+            QCOMPARE(readSettings.property("carddavUsername").toString(), carddavUsername);
+            QCOMPARE(readSettings.property("carddavPassword").toString(), carddavPassword);
+            QCOMPARE(readSettings.property("path").toString(), path);
             QCOMPARE(readSettings.property("userName").toString(), username);
             QCOMPARE(readSettings.property("emailAddress").toString(), emailAddress);
         }
 
         //Modify all settings
         {
+            settings.setProperty("accountName", accountName + "mod");
             settings.setProperty("imapServer", imapServer + "mod");
             settings.setProperty("imapUsername", imapUsername + "mod");
             settings.setProperty("imapPassword", imapPassword + "mod");
             settings.setProperty("smtpServer", smtpServer + "mod");
             settings.setProperty("smtpUsername", smtpUsername + "mod");
             settings.setProperty("smtpPassword", smtpPassword + "mod");
+            settings.setProperty("carddavServer", carddavServer + "mod");
+            settings.setProperty("carddavUsername", carddavUsername + "mod");
+            settings.setProperty("carddavPassword", carddavPassword + "mod");
+            settings.setProperty("path", path + "mod");
             settings.setProperty("userName", username + "mod");
             settings.setProperty("emailAddress", emailAddress + "mod");
             settings.save();
@@ -121,17 +154,28 @@ private slots:
             TestSettings readSettings;
             QSignalSpy spy(&readSettings, &TestSettings::imapResourceChanged);
             QSignalSpy spy1(&readSettings, &TestSettings::smtpResourceChanged);
+            QSignalSpy spy2(&readSettings, &TestSettings::cardDavResourceChanged);
+            QSignalSpy spy3(&readSettings, &TestSettings::changed);
+            QSignalSpy spy4(&readSettings, &TestSettings::pathChanged);
             readSettings.setAccountIdentifier(accountId);
             //Once for clear and once for the new setting
             QTRY_COMPARE(spy.count(), 2);
             QTRY_COMPARE(spy1.count(), 2);
+            QTRY_COMPARE(spy2.count(), 2);
+            QTRY_COMPARE(spy3.count(), 2);
+            QTRY_COMPARE(spy4.count(), 2);
             QVERIFY(!readSettings.accountIdentifier().isEmpty());
+            QCOMPARE(readSettings.property("accountName").toString(), accountName + "mod");
             QCOMPARE(readSettings.property("imapServer").toString(), imapServer + "mod");
             QCOMPARE(readSettings.property("imapUsername").toString(), imapUsername + "mod");
             QCOMPARE(readSettings.property("imapPassword").toString(), imapPassword + "mod");
             QCOMPARE(readSettings.property("smtpServer").toString(), smtpServer + "mod");
             QCOMPARE(readSettings.property("smtpUsername").toString(), smtpUsername + "mod");
             QCOMPARE(readSettings.property("smtpPassword").toString(), smtpPassword + "mod");
+            QCOMPARE(readSettings.property("carddavServer").toString(), carddavServer + "mod");
+            QCOMPARE(readSettings.property("carddavUsername").toString(), carddavUsername + "mod");
+            QCOMPARE(readSettings.property("carddavPassword").toString(), carddavPassword + "mod");
+            QCOMPARE(readSettings.property("path").toString(), path + "mod");
             QCOMPARE(readSettings.property("userName").toString(), username + "mod");
             QCOMPARE(readSettings.property("emailAddress").toString(), emailAddress + "mod");
         }