DummyResourceTest and QueryTest are passing

sync has been removed from the query code and is now a separate step

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index d027266..3b90e6c 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -64,6 +64,9 @@ private Q_SLOTS:
         query.syncOnDemand = false;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         query.propertyFilter.insert("uid", "testuid");
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
@@ -88,6 +91,9 @@ private Q_SLOTS:
         query.syncOnDemand = false;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         query.propertyFilter.insert("uid", "testuid");
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
@@ -114,6 +120,9 @@ private Q_SLOTS:
         query.syncOnDemand = false;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         query.propertyFilter.insert("summary", "summaryValue2");
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
@@ -145,6 +154,9 @@ private Q_SLOTS:
         query.syncOnDemand = true;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
         QVERIFY(!result.isEmpty());
@@ -160,6 +172,9 @@ private Q_SLOTS:
         query.syncOnDemand = true;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         async::SyncListResult<Akonadi2::ApplicationDomain::Mail::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Mail>(query));
         result.exec();
         QVERIFY(!result.isEmpty());
@@ -182,6 +197,9 @@ private Q_SLOTS:
         query.processAll = true;
         query.propertyFilter.insert("uid", "testuid");
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         //Test create
         Akonadi2::ApplicationDomain::Event event2;
         {
@@ -198,6 +216,9 @@ private Q_SLOTS:
         event2.setProperty("summary", "summaryValue2");
         Akonadi2::Store::modify<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         //Test modify
         {
             async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
@@ -210,6 +231,9 @@ private Q_SLOTS:
 
         Akonadi2::Store::remove<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         //Test remove
         {
             async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));