From b36cbed21f2b76154d5c021fd53768d227106205 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 15 Jun 2016 07:34:51 +0200 Subject: Start using the sync api in tests. --- tests/mailtest.cpp | 109 +++++++++++++++++------------------------------------ 1 file changed, 35 insertions(+), 74 deletions(-) (limited to 'tests') diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp index 6dfe901..bef34fc 100644 --- a/tests/mailtest.cpp +++ b/tests/mailtest.cpp @@ -344,37 +344,29 @@ void MailTest::testCreateDraft() VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier)); QByteArray folderIdentifier; - auto job = Store::fetchOne(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name)) - .then([&](const ApplicationDomain::Mail &mail) { - folderIdentifier = mail.getProperty("folder").toByteArray(); - QVERIFY(!folderIdentifier.isEmpty()); - }); - VERIFYEXEC(job); + + auto createdDraft = Store::readOne(Query::IdentityFilter(mail).request()); + folderIdentifier = createdDraft.getFolder(); + QVERIFY(!folderIdentifier.isEmpty()); //Ensure we can also query by folder { - auto job = Store::fetchAll(Query::PropertyFilter("folder", folderIdentifier)) - .then >([&](const QList &mails) { - bool found = false; - for (const auto m : mails) { - if (m->identifier() == mail.identifier()) { - found = true; - } - } - QVERIFY(found); - }); - VERIFYEXEC(job); + auto mails = Store::read(Query::Query().filter(folderIdentifier)); + bool found = false; + for (const auto m : mails) { + if (m.identifier() == mail.identifier()) { + found = true; + } + } + QVERIFY(found); } //Ensure the folder is also existing { ApplicationDomain::Folder folder; - auto job = Store::fetchAll(Query::IdentityFilter(folderIdentifier)) - .then >([&](const QList &folders) { - QCOMPARE(folders.size(), 1); - folder = *folders.first(); - }); - VERIFYEXEC(job); + auto folders = Store::read(Query::IdentityFilter(folderIdentifier)); + QCOMPARE(folders.size(), 1); + folder = folders.first(); VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::ExistenceInspection(folder, true))); } VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::ExistenceInspection(mail, true))); @@ -402,41 +394,26 @@ void MailTest::testModifyMailToDraft() VERIFYEXEC(Store::create(mail)); VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier)); - auto modifiedMail = Store::readOne(Query::IdentityFilter(mail).request().request()); - // ApplicationDomain::Mail modifiedMail; - // { - // auto job = Store::fetchOne(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name)) - // .then([&](const ApplicationDomain::Mail &mail) { - // modifiedMail = mail; - // }); - // VERIFYEXEC(job); - // } + auto modifiedMail = Store::readOne(Query::IdentityFilter(mail)); modifiedMail.setDraft(true); VERIFYEXEC(Store::modify(modifiedMail)); VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier)); VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier)); QByteArray folderIdentifier; - auto job = Store::fetchOne(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name)) - .then([&](const ApplicationDomain::Mail &mail) { - folderIdentifier = mail.getProperty("folder").toByteArray(); - QVERIFY(!folderIdentifier.isEmpty()); - }); - VERIFYEXEC(job); + { + auto createdDraft = Store::readOne(Query::IdentityFilter(mail).request()); + folderIdentifier = createdDraft.getFolder(); + QVERIFY(!folderIdentifier.isEmpty()); + } //Ensure the folder is also existing { ApplicationDomain::Folder folder; - Query query; - query.ids << folderIdentifier; - query.request(); - auto job = Store::fetchAll(Query::IdentityFilter(folderIdentifier)) - .then >([&](const QList &folders) { - QCOMPARE(folders.size(), 1); - folder = *folders.first(); - QVERIFY(folder.getSpecialPurpose().contains("drafts")); - }); - VERIFYEXEC(job); + auto folders = Store::read(Query::IdentityFilter(folderIdentifier).request()); + QCOMPARE(folders.size(), 1); + folder = folders.first(); + QVERIFY(folder.getSpecialPurpose().contains("drafts")); VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::ExistenceInspection(folder, true))); } VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::ExistenceInspection(mail, true))); @@ -464,42 +441,26 @@ void MailTest::testModifyMailToTrash() VERIFYEXEC(Store::create(mail)); VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier)); - // auto modifiedMail = Store::read(Query::IdentityFilter(mail).request().request()).value(); - - ApplicationDomain::Mail modifiedMail; - { - auto job = Store::fetchOne(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name)) - .then([&](const ApplicationDomain::Mail &mail) { - modifiedMail = mail; - }); - VERIFYEXEC(job); - } + auto modifiedMail = Store::readOne(Query::IdentityFilter(mail)); modifiedMail.setTrash(true); VERIFYEXEC(Store::modify(modifiedMail)); VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier)); VERIFYEXEC(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier)); QByteArray folderIdentifier; - auto job = Store::fetchOne(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name)) - .then([&](const ApplicationDomain::Mail &mail) { - folderIdentifier = mail.getProperty("folder").toByteArray(); - QVERIFY(!folderIdentifier.isEmpty()); - }); - VERIFYEXEC(job); + { + auto createdMail = Store::readOne(Query::IdentityFilter(mail).request()); + folderIdentifier = createdMail.getFolder(); + QVERIFY(!folderIdentifier.isEmpty()); + } //Ensure the folder is also existing { ApplicationDomain::Folder folder; - Query query; - query.ids << folderIdentifier; - query.request(); - auto job = Store::fetchAll(Query::IdentityFilter(folderIdentifier)) - .then >([&](const QList &folders) { - QCOMPARE(folders.size(), 1); - folder = *folders.first(); - QVERIFY(folder.getSpecialPurpose().contains("trash")); - }); - VERIFYEXEC(job); + auto folders = Store::read(Query::IdentityFilter(folderIdentifier).request()); + QCOMPARE(folders.size(), 1); + folder = folders.first(); + QVERIFY(folder.getSpecialPurpose().contains("trash")); VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::ExistenceInspection(folder, true))); } VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::ExistenceInspection(mail, true))); -- cgit v1.2.3