From 75c231f0758603120ec562af772b48b5f6ac0e24 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 13 Nov 2015 23:31:41 +0100 Subject: DummyResourceTest and QueryTest are passing sync has been removed from the query code and is now a separate step --- tests/dummyresourcetest.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'tests/dummyresourcetest.cpp') 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 result(Akonadi2::Store::load(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 result(Akonadi2::Store::load(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 result(Akonadi2::Store::load(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 result(Akonadi2::Store::load(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 result(Akonadi2::Store::load(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(event2).exec().waitForFinished(); + //Ensure all local data is processed + Akonadi2::Store::synchronize(query).exec().waitForFinished(); + //Test modify { async::SyncListResult result(Akonadi2::Store::load(query)); @@ -210,6 +231,9 @@ private Q_SLOTS: Akonadi2::Store::remove(event2).exec().waitForFinished(); + //Ensure all local data is processed + Akonadi2::Store::synchronize(query).exec().waitForFinished(); + //Test remove { async::SyncListResult result(Akonadi2::Store::load(query)); -- cgit v1.2.3 From 088d8a40c195ce6dcb91556a17f69d26e5586a3e Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sat, 28 Nov 2015 12:48:43 +0100 Subject: Removed most uses of SyncListResult and brought back the dummyresourcetest --- tests/dummyresourcetest.cpp | 81 +++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 40 deletions(-) (limited to 'tests/dummyresourcetest.cpp') diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp index 3b90e6c..d2fcda7 100644 --- a/tests/dummyresourcetest.cpp +++ b/tests/dummyresourcetest.cpp @@ -4,10 +4,10 @@ #include "dummyresource/resourcefactory.h" #include "clientapi.h" -#include "synclistresult.h" #include "commands.h" #include "entitybuffer.h" #include "resourceconfig.h" +#include "modelresult.h" #include "pipeline.h" #include "log.h" @@ -68,10 +68,9 @@ private Q_SLOTS: Akonadi2::Store::synchronize(query).exec().waitForFinished(); query.propertyFilter.insert("uid", "testuid"); - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QCOMPARE(result.size(), 1); - auto value = result.first(); + auto model = Akonadi2::Store::loadModel(query); + QTRY_COMPARE(model->rowCount(QModelIndex()), 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); } @@ -95,10 +94,11 @@ private Q_SLOTS: Akonadi2::Store::synchronize(query).exec().waitForFinished(); query.propertyFilter.insert("uid", "testuid"); - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QCOMPARE(result.size(), 1); - auto value = result.first(); + + auto model = Akonadi2::Store::loadModel(query); + QTRY_COMPARE(model->rowCount(QModelIndex()), 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + qDebug() << value->getProperty("uid").toByteArray(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); } @@ -124,10 +124,11 @@ private Q_SLOTS: Akonadi2::Store::synchronize(query).exec().waitForFinished(); query.propertyFilter.insert("summary", "summaryValue2"); - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QCOMPARE(result.size(), 1); - auto value = result.first(); + + auto model = Akonadi2::Store::loadModel(query); + QTRY_COMPARE(model->rowCount(QModelIndex()), 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + qDebug() << value->getProperty("uid").toByteArray(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid2")); } @@ -157,10 +158,10 @@ private Q_SLOTS: //Ensure all local data is processed Akonadi2::Store::synchronize(query).exec().waitForFinished(); - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QVERIFY(!result.isEmpty()); - auto value = result.first(); + auto model = Akonadi2::Store::loadModel(query); + QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + QVERIFY(!value->getProperty("summary").toString().isEmpty()); qDebug() << value->getProperty("summary").toString(); } @@ -175,10 +176,10 @@ private Q_SLOTS: //Ensure all local data is processed Akonadi2::Store::synchronize(query).exec().waitForFinished(); - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QVERIFY(!result.isEmpty()); - auto value = result.first(); + auto model = Akonadi2::Store::loadModel(query); + QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + QVERIFY(!value->getProperty("subject").toString().isEmpty()); qDebug() << value->getProperty("subject").toString(); } @@ -203,10 +204,10 @@ private Q_SLOTS: //Test create Akonadi2::ApplicationDomain::Event event2; { - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QCOMPARE(result.size(), 1); - auto value = result.first(); + auto model = Akonadi2::Store::loadModel(query); + QTRY_COMPARE(model->rowCount(QModelIndex()), 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue")); event2 = *value; @@ -221,10 +222,10 @@ private Q_SLOTS: //Test modify { - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QCOMPARE(result.size(), 1); - auto value = result.first(); + auto model = Akonadi2::Store::loadModel(query); + QTRY_COMPARE(model->rowCount(QModelIndex()), 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2")); } @@ -236,9 +237,9 @@ private Q_SLOTS: //Test remove { - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); - QTRY_COMPARE(result.size(), 0); + auto model = Akonadi2::Store::loadModel(query); + //TODO ensure the initial query is done + QTRY_COMPARE(model->rowCount(QModelIndex()), 0); } } @@ -252,9 +253,8 @@ private Q_SLOTS: query.liveQuery = true; query.propertyFilter.insert("uid", "testuid"); - - async::SyncListResult result(Akonadi2::Store::load(query)); - result.exec(); + auto model = Akonadi2::Store::loadModel(query); + //TODO ensure the initial query is done Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1"); event.setProperty("uid", "testuid"); @@ -265,8 +265,8 @@ private Q_SLOTS: //Test create Akonadi2::ApplicationDomain::Event event2; { - QTRY_COMPARE(result.size(), 1); - auto value = result.first(); + QTRY_COMPARE(model->rowCount(QModelIndex()), 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue")); event2 = *value; @@ -278,8 +278,9 @@ private Q_SLOTS: //Test modify { - QTRY_COMPARE(result.size(), 1); - auto value = result.first(); + //TODO wait for a change signal + QTRY_COMPARE(model->rowCount(QModelIndex()), 1); + auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2")); } @@ -288,7 +289,7 @@ private Q_SLOTS: //Test remove { - QTRY_COMPARE(result.size(), 0); + QTRY_COMPARE(model->rowCount(QModelIndex()), 0); } } -- cgit v1.2.3 From 887abffb3f712acaa23eae174d5890f337fe43cb Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sat, 28 Nov 2015 16:20:38 +0100 Subject: Cleanup --- tests/dummyresourcetest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/dummyresourcetest.cpp') diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp index d2fcda7..20c725f 100644 --- a/tests/dummyresourcetest.cpp +++ b/tests/dummyresourcetest.cpp @@ -70,7 +70,7 @@ private Q_SLOTS: query.propertyFilter.insert("uid", "testuid"); auto model = Akonadi2::Store::loadModel(query); QTRY_COMPARE(model->rowCount(QModelIndex()), 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); } @@ -97,7 +97,7 @@ private Q_SLOTS: auto model = Akonadi2::Store::loadModel(query); QTRY_COMPARE(model->rowCount(QModelIndex()), 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); qDebug() << value->getProperty("uid").toByteArray(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); @@ -127,7 +127,7 @@ private Q_SLOTS: auto model = Akonadi2::Store::loadModel(query); QTRY_COMPARE(model->rowCount(QModelIndex()), 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); qDebug() << value->getProperty("uid").toByteArray(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid2")); @@ -160,7 +160,7 @@ private Q_SLOTS: auto model = Akonadi2::Store::loadModel(query); QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); QVERIFY(!value->getProperty("summary").toString().isEmpty()); qDebug() << value->getProperty("summary").toString(); @@ -178,7 +178,7 @@ private Q_SLOTS: auto model = Akonadi2::Store::loadModel(query); QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); QVERIFY(!value->getProperty("subject").toString().isEmpty()); qDebug() << value->getProperty("subject").toString(); @@ -206,7 +206,7 @@ private Q_SLOTS: { auto model = Akonadi2::Store::loadModel(query); QTRY_COMPARE(model->rowCount(QModelIndex()), 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue")); @@ -224,7 +224,7 @@ private Q_SLOTS: { auto model = Akonadi2::Store::loadModel(query); QTRY_COMPARE(model->rowCount(QModelIndex()), 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2")); @@ -266,7 +266,7 @@ private Q_SLOTS: Akonadi2::ApplicationDomain::Event event2; { QTRY_COMPARE(model->rowCount(QModelIndex()), 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue")); event2 = *value; @@ -280,7 +280,7 @@ private Q_SLOTS: { //TODO wait for a change signal QTRY_COMPARE(model->rowCount(QModelIndex()), 1); - auto value = model->index(0, 0, QModelIndex()).data(ModelResult::DomainObjectRole).value(); + auto value = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value(); QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid")); QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2")); } -- cgit v1.2.3