From 7daeec83233c522980d5e477fee82045de57f77d Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 12 Jan 2017 11:45:15 +0100
Subject: syncThen is no longer necessary

---
 tests/accountstest.cpp              |  8 ++++----
 tests/clientapitest.cpp             |  2 +-
 tests/mailsynctest.cpp              | 28 ++++++++++++++--------------
 tests/mailtest.cpp                  | 18 +++++++++---------
 tests/mailthreadtest.cpp            |  2 +-
 tests/resourcecommunicationtest.cpp |  6 +++---
 6 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'tests')

diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index cce5c7b..0ab18ef 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -39,7 +39,7 @@ private slots:
         account.setIcon(accountIcon);
         Store::create(account).exec().waitForFinished();
 
-        Store::fetchAll<SinkAccount>(Query()).syncThen<void, QList<SinkAccount::Ptr>>([&](const QList<SinkAccount::Ptr> &accounts) {
+        Store::fetchAll<SinkAccount>(Query()).then([&](const QList<SinkAccount::Ptr> &accounts) {
             QCOMPARE(accounts.size(), 1);
             auto account = accounts.first();
             QCOMPARE(account->getAccountType(), QString("maildir"));
@@ -60,7 +60,7 @@ private slots:
         Store::create(resource).exec().waitForFinished();
 
 
-        Store::fetchAll<SinkResource>(Query()).syncThen<void, QList<SinkResource::Ptr>>([&](const QList<SinkResource::Ptr> &resources) {
+        Store::fetchAll<SinkResource>(Query()).then([&](const QList<SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 1);
             auto resource = resources.first();
             QCOMPARE(resource->getResourceType(), QByteArray("sink.mailtransport"));
@@ -74,7 +74,7 @@ private slots:
         identity.setAccount(account.identifier());
         Store::create(identity).exec().waitForFinished();
 
-        Store::fetchAll<Identity>(Query()).syncThen<void, QList<Identity::Ptr>>([&](const QList<Identity::Ptr> &identities) {
+        Store::fetchAll<Identity>(Query()).then([&](const QList<Identity::Ptr> &identities) {
             QCOMPARE(identities.size(), 1);
             QCOMPARE(identities.first()->getName(), smtpServer);
             QCOMPARE(identities.first()->getAddress(), smtpUsername);
@@ -85,7 +85,7 @@ private slots:
 
         Store::remove(resource).exec().waitForFinished();
 
-        Store::fetchAll<SinkResource>(Query()).syncThen<void, QList<SinkResource::Ptr>>([](const QList<SinkResource::Ptr> &resources) {
+        Store::fetchAll<SinkResource>(Query()).then([](const QList<SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 0);
         })
         .exec().waitForFinished();
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 544b981..8fc76df 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -276,7 +276,7 @@ private slots:
 
         bool gotValue = false;
         auto result = Sink::Store::fetchOne<Sink::ApplicationDomain::Event>(query)
-                          .syncThen<void, Sink::ApplicationDomain::Event>([&gotValue](const Sink::ApplicationDomain::Event &event) { gotValue = true; })
+                          .then([&gotValue](const Sink::ApplicationDomain::Event &event) { gotValue = true; })
                           .exec();
         result.waitForFinished();
         QVERIFY(!result.errorCode());
diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index 96a2daa..d3b0fe3 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -68,7 +68,7 @@ void MailSyncTest::testListFolders()
     //First figure out how many folders we have by default
     {
         auto job = Store::fetchAll<Folder>(Query())
-            .syncThen<void, QList<Folder::Ptr>>([&](const QList<Folder::Ptr> &folders) {
+            .then([&](const QList<Folder::Ptr> &folders) {
                 QStringList names;
                 for (const auto &folder : folders) {
                     names << folder->getName();
@@ -87,7 +87,7 @@ void MailSyncTest::testListFolders()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([=](const QList<Folder::Ptr> &folders) {
         QStringList names;
         QHash<QByteArray, QByteArray> specialPurposeFolders;
         for (const auto &folder : folders) {
@@ -128,7 +128,7 @@ void MailSyncTest::testListNewFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -153,7 +153,7 @@ void MailSyncTest::testListRemovedFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -178,7 +178,7 @@ void MailSyncTest::testListFolderHierarchy()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([=](const QList<Folder::Ptr> &folders) {
         QHash<QString, Folder::Ptr> map;
         for (const auto &folder : folders) {
             map.insert(folder->getName(), folder);
@@ -221,7 +221,7 @@ void MailSyncTest::testListNewSubFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -249,7 +249,7 @@ void MailSyncTest::testListRemovedSubFolder()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Folder>(query).syncThen<void, QList<Folder::Ptr>>([](const QList<Folder::Ptr> &folders) {
+    auto job = Store::fetchAll<Folder>(query).then([](const QList<Folder::Ptr> &folders) {
         QStringList names;
         for (const auto &folder : folders) {
             names << folder->getName();
@@ -269,7 +269,7 @@ void MailSyncTest::testListMails()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+    auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
         QCOMPARE(mails.size(), 1);
         QVERIFY(mails.first()->getSubject().startsWith(QString("[Nepomuk] Jenkins build is still unstable")));
         const auto data = mails.first()->getMimeMessage();
@@ -298,7 +298,7 @@ void MailSyncTest::testResyncMails()
     VERIFYEXEC(Store::synchronize(query));
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
-    auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+    auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
         QCOMPARE(mails.size(), 1);
     });
     VERIFYEXEC(job);
@@ -323,7 +323,7 @@ void MailSyncTest::testFetchNewRemovedMessages()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 2);
         });
         VERIFYEXEC(job);
@@ -335,7 +335,7 @@ void MailSyncTest::testFetchNewRemovedMessages()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 1);
         });
         VERIFYEXEC(job);
@@ -358,7 +358,7 @@ void MailSyncTest::testFlagChange()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 0);
         });
         VERIFYEXEC(job);
@@ -371,7 +371,7 @@ void MailSyncTest::testFlagChange()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
 
     {
-        auto job = Store::fetchAll<Mail>(query).syncThen<void, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+        auto job = Store::fetchAll<Mail>(query).then([](const QList<Mail::Ptr> &mails) {
             QCOMPARE(mails.size(), 1);
             QVERIFY(mails.first()->getImportant());
         });
@@ -387,7 +387,7 @@ void MailSyncTest::testSyncSingleFolder()
 
     Folder::Ptr folder;
     {
-        auto job = Store::fetchAll<Folder>(Sink::Query{}.resourceFilter(mResourceInstanceIdentifier).filter<Folder::Name>("test")).template syncThen<void, QList<Folder::Ptr>>([&](const QList<Folder::Ptr> &folders) {
+        auto job = Store::fetchAll<Folder>(Sink::Query{}.resourceFilter(mResourceInstanceIdentifier).filter<Folder::Name>("test")).template then([&](const QList<Folder::Ptr> &folders) {
             QCOMPARE(folders.size(), 1);
             folder = folders.first();
         });
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index fe28cde..c51fc56 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -67,7 +67,7 @@ void MailTest::testCreateModifyDeleteFolder()
     //First figure out how many folders we have by default
     {
         auto job = Store::fetchAll<Folder>(Query())
-            .syncThen<void, QList<Folder::Ptr>>([&](const QList<Folder::Ptr> &folders) {
+            .then([&](const QList<Folder::Ptr> &folders) {
                 baseCount = folders.size();
             });
         VERIFYEXEC(job);
@@ -84,7 +84,7 @@ void MailTest::testCreateModifyDeleteFolder()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Folder>(Query().request<Folder::Name>().request<Folder::Icon>())
-            .syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+            .then([=](const QList<Folder::Ptr> &folders) {
                 QCOMPARE(folders.size(), baseCount + 1);
                 QHash<QString, Folder::Ptr> foldersByName;
                 for (const auto &folder : folders) {
@@ -110,7 +110,7 @@ void MailTest::testCreateModifyDeleteFolder()
         VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
         {
             auto job = Store::fetchAll<Folder>(Query().request<Folder::Name>().request<Folder::Icon>())
-                .syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+                .then([=](const QList<Folder::Ptr> &folders) {
                     QCOMPARE(folders.size(), baseCount + 1);
                     QHash<QString, Folder::Ptr> foldersByName;
                     for (const auto &folder : folders) {
@@ -131,7 +131,7 @@ void MailTest::testCreateModifyDeleteFolder()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Folder>(Query().request<Folder::Name>().request<Folder::Icon>())
-            .syncThen<void, QList<Folder::Ptr>>([=](const QList<Folder::Ptr> &folders) {
+            .then([=](const QList<Folder::Ptr> &folders) {
                 QCOMPARE(folders.size(), baseCount);
             });
         VERIFYEXEC(job);
@@ -161,7 +161,7 @@ void MailTest::testCreateModifyDeleteMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 QCOMPARE(mail.getSubject(), subject);
@@ -190,7 +190,7 @@ void MailTest::testCreateModifyDeleteMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 QCOMPARE(mail.getSubject(), subject2);
@@ -212,7 +212,7 @@ void MailTest::testCreateModifyDeleteMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 0);
             });
         VERIFYEXEC(job);
@@ -248,7 +248,7 @@ void MailTest::testMoveMail()
     Mail modifiedMail;
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=, &modifiedMail](const QList<Mail::Ptr> &mails) {
+            .then([=, &modifiedMail](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 modifiedMail = mail;
@@ -267,7 +267,7 @@ void MailTest::testMoveMail()
     VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>())
-            .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
+            .then([=](const QList<Mail::Ptr> &mails) {
                 QCOMPARE(mails.size(), 1);
                 auto mail = *mails.first();
                 QCOMPARE(mail.getFolder(), folder1.identifier());
diff --git a/tests/mailthreadtest.cpp b/tests/mailthreadtest.cpp
index 3684514..82f9331 100644
--- a/tests/mailthreadtest.cpp
+++ b/tests/mailthreadtest.cpp
@@ -179,7 +179,7 @@ void MailThreadTest::testIndexInMixedOrder()
     /* VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier)); */
     /* { */
     /*     auto job = Store::fetchAll<Mail>(Query::RequestedProperties(QByteArrayList() << Mail::Folder::name << Mail::Subject::name)) */
-    /*         .syncThen<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) { */
+    /*         .then([=](const QList<Mail::Ptr> &mails) { */
     /*             QCOMPARE(mails.size(), 0); */
     /*         }); */
     /*     VERIFYEXEC(job); */
diff --git a/tests/resourcecommunicationtest.cpp b/tests/resourcecommunicationtest.cpp
index 201db53..7beafc7 100644
--- a/tests/resourcecommunicationtest.cpp
+++ b/tests/resourcecommunicationtest.cpp
@@ -51,7 +51,7 @@ private slots:
         int errors = 0;
         for (int i = 0; i < count; i++) {
             auto result = resourceAccess.sendCommand(Sink::Commands::PingCommand)
-                                .syncThen<void>([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
+                                .then([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
                                     complete++;
                                     if (error) {
                                         qWarning() << error.errorMessage;
@@ -77,7 +77,7 @@ private slots:
         int errors = 0;
         for (int i = 0; i < count; i++) {
             resourceAccess.sendCommand(Sink::Commands::PingCommand)
-                .syncThen<void>([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
+                .then([&resourceAccess, &errors, &complete](const KAsync::Error &error) {
                     complete++;
                     if (error) {
                         qWarning() << error.errorMessage;
@@ -104,7 +104,7 @@ private slots:
             auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resourceIdentifier, "");
             weakRef = resourceAccess.toWeakRef();
             resourceAccess->open();
-            resourceAccess->sendCommand(Sink::Commands::PingCommand).syncThen<void>([resourceAccess]() { qDebug() << "Ping complete";  }).exec();
+            resourceAccess->sendCommand(Sink::Commands::PingCommand).then([resourceAccess]() { qDebug() << "Ping complete";  }).exec();
         }
         QVERIFY(weakRef.toStrongRef());
         QTRY_VERIFY(!weakRef.toStrongRef());
-- 
cgit v1.2.3