1 files changed, 55 insertions, 20 deletions

diff --git a/examples/carddavresource/tests/carddavtest.cpp b/examples/carddavresource/tests/carddavtest.cpp
index b0f41d1..1d6762d 100644
--- a/examples/carddavresource/tests/carddavtest.cpp
+++ b/examples/carddavresource/tests/carddavtest.cpp
@@ -11,6 +11,7 @@
 #include <KDAV2/DavUrl>
 #include <KDAV2/DavItemCreateJob>
 #include <KDAV2/DavCollectionsFetchJob>
+#include <KDAV2/DavCollectionCreateJob>
 #include <KDAV2/DavCollection>
 #include <KContacts/Addressee>
 #include <KContacts/VCardConverter>
@@ -30,28 +31,28 @@ class CardDavTest : public QObject
         resource.setProperty("server", "http://localhost/dav/addressbooks/user/doe");
         resource.setProperty("username", "doe");
         Sink::SecretStore::instance().insert(resource.identifier(), "doe");
-        resource.setProperty("testmode", true);
         return resource;
     }
 
 
     QByteArray mResourceInstanceIdentifier;
 
-    void createContact(const QString &firstname, const QString &lastname)
+    void createContact(const QString &firstname, const QString &lastname, const QString &collectionName)
     {
         QUrl mainUrl(QStringLiteral("http://localhost/dav/addressbooks/user/doe"));
         mainUrl.setUserName(QStringLiteral("doe"));
         mainUrl.setPassword(QStringLiteral("doe"));
 
-
         KDAV2::DavUrl davUrl(mainUrl, KDAV2::CardDav);
 
         auto *job = new KDAV2::DavCollectionsFetchJob(davUrl);
         job->exec();
 
         const auto collectionUrl = [&] {
-            if (!job->collections().isEmpty()) {
-                return job->collections().first().url().url();
+            for (const auto &col : job->collections()) {
+                if (col.displayName() == collectionName) {
+                    return col.url().url();
+                }
             }
             return QUrl{};
         }();
@@ -69,11 +70,33 @@ class CardDavTest : public QObject
         }
     }
 
+    void createCollection(const QString &name)
+    {
+        QUrl mainUrl(QStringLiteral("http://localhost/dav/addressbooks/user/doe/") + name);
+        mainUrl.setUserName(QStringLiteral("doe"));
+        mainUrl.setPassword(QStringLiteral("doe"));
+
+        KDAV2::DavUrl davUrl(mainUrl, KDAV2::CardDav);
+        KDAV2::DavCollection collection{davUrl, name, KDAV2::DavCollection::Contacts};
+
+        auto createJob = new KDAV2::DavCollectionCreateJob(collection);
+        createJob->exec();
+        if (createJob->error()) {
+            qWarning() << createJob->errorString();
+        }
+    }
+
+    void resetTestEnvironment()
+    {
+        system("resetmailbox.sh");
+    }
+
 private slots:
 
     void initTestCase()
     {
         Sink::Test::initTest();
+        resetTestEnvironment();
         auto resource = createResource();
         QVERIFY(!resource.identifier().isEmpty());
         VERIFYEXEC(Sink::Store::create(resource));
@@ -90,10 +113,25 @@ private slots:
         VERIFYEXEC(Sink::ResourceControl::start(mResourceInstanceIdentifier));
     }
 
+    void testSyncAddressbooks()
+    {
+        createCollection("addressbook2");
+
+        Sink::SyncScope scope;
+        scope.setType<Addressbook>();
+        scope.resourceFilter(mResourceInstanceIdentifier);
+
+        VERIFYEXEC(Sink::Store::synchronize(scope));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+        const auto addressbooks = Sink::Store::read<Addressbook>(Sink::Query().resourceFilter(mResourceInstanceIdentifier));
+        QCOMPARE(addressbooks.size(), 2);
+    }
+
     void testSyncContacts()
     {
-        createContact("john", "doe");
-        createContact("jane", "doe");
+        createContact("john", "doe", "personal");
+        createContact("jane", "doe", "personal");
+        createContact("fred", "durst", "addressbook2");
         Sink::SyncScope scope;
         scope.setType<Sink::ApplicationDomain::Contact>();
         scope.resourceFilter(mResourceInstanceIdentifier);
@@ -101,27 +139,24 @@ private slots:
         VERIFYEXEC(Sink::Store::synchronize(scope));
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
         const auto contacts = Sink::Store::read<Sink::ApplicationDomain::Contact>(Sink::Query().resourceFilter(mResourceInstanceIdentifier));
-        QCOMPARE(contacts.size(), 2);
+        QCOMPARE(contacts.size(), 3);
 
         //Ensure a resync works
         {
             VERIFYEXEC(Sink::Store::synchronize(scope));
             VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
             const auto contacts = Sink::Store::read<Sink::ApplicationDomain::Contact>(Sink::Query().resourceFilter(mResourceInstanceIdentifier));
-            QCOMPARE(contacts.size(), 2);
+            QCOMPARE(contacts.size(), 3);
         }
-    }
 
-    void testSyncAddressbooks()
-    {
-        Sink::SyncScope scope;
-        scope.setType<Addressbook>();
-        scope.resourceFilter(mResourceInstanceIdentifier);
-
-        VERIFYEXEC(Sink::Store::synchronize(scope));
-        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
-        const auto addressbooks = Sink::Store::read<Addressbook>(Sink::Query().resourceFilter(mResourceInstanceIdentifier));
-        QCOMPARE(addressbooks.size(), 1);
+        //Ensure a resync after another creation works
+        createContact("alf", "alf", "addressbook2");
+        {
+            VERIFYEXEC(Sink::Store::synchronize(scope));
+            VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+            const auto contacts = Sink::Store::read<Sink::ApplicationDomain::Contact>(Sink::Query().resourceFilter(mResourceInstanceIdentifier));
+            QCOMPARE(contacts.size(), 4);
+        }
     }
 
     void testAddContact()