From 4d4028af66144535634ec8c9c4aa229758b57372 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sun, 5 Jun 2016 18:00:02 +0200
Subject: Allow the maildir resource to skip the folder rename test

---
 common/domain/applicationdomaintype.cpp |  2 +-
 tests/mailtest.cpp                      | 48 +++++++++++++++++----------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 1e111ec..e219608 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -245,7 +245,7 @@ namespace MaildirResource {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
         resource.setProperty("type", "org.kde.maildir");
         resource.setProperty("account", account);
-        resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << "storage" << "drafts"));
+        resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << "storage" << "drafts" << "-folder.rename"));
         return resource;
     }
 }
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index 9046180..d45187e 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -98,30 +98,32 @@ void MailTest::testCreateModifyDeleteFolder()
     VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier));
     VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::ExistenceInspection(folder, true)));
 
-    QString name2 = "name2";
-    QByteArray icon2 = "icon2";
-    folder.setName(name2);
-    folder.setIcon(icon2);
-
-    VERIFYEXEC(Store::modify(folder));
-    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
-    {
-        auto job = Store::fetchAll<Folder>(Query::RequestedProperties(QByteArrayList() << Folder::Name::name << Folder::Icon::name))
-            .then<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
-                QCOMPARE(folders.size(), baseCount + 1);
-                QHash<QString, Folder::Ptr> foldersByName;
-                for (const auto &folder : folders) {
-                    foldersByName.insert(folder->getName(), folder);
-                }
-                QVERIFY(foldersByName.contains(name2));
-                auto folder = *foldersByName.value(name2);
-                QCOMPARE(folder.getName(), name2);
-                QCOMPARE(folder.getIcon(), icon2);
-            });
-        VERIFYEXEC(job);
+    if (!mCapabilities.contains("-folder.rename")) {
+        QString name2 = "name2";
+        QByteArray icon2 = "icon2";
+        folder.setName(name2);
+        folder.setIcon(icon2);
+
+        VERIFYEXEC(Store::modify(folder));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        {
+            auto job = Store::fetchAll<Folder>(Query::RequestedProperties(QByteArrayList() << Folder::Name::name << Folder::Icon::name))
+                .then<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+                    QCOMPARE(folders.size(), baseCount + 1);
+                    QHash<QString, Folder::Ptr> foldersByName;
+                    for (const auto &folder : folders) {
+                        foldersByName.insert(folder->getName(), folder);
+                    }
+                    QVERIFY(foldersByName.contains(name2));
+                    auto folder = *foldersByName.value(name2);
+                    QCOMPARE(folder.getName(), name2);
+                    QCOMPARE(folder.getIcon(), icon2);
+                });
+            VERIFYEXEC(job);
+        }
+        VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::ExistenceInspection(folder, true)));
     }
-    VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier));
-    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::ExistenceInspection(folder, true)));
 
     VERIFYEXEC(Store::remove(folder));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
-- 
cgit v1.2.3