syncThen is no longer necessary

1 files changed, 14 insertions, 14 deletions

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();
         });