From af0f69d6c267d231d01b69525b91add8309e43e0 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 21 Oct 2015 12:05:09 +0200 Subject: ClientAPI: Don't require an explicit instance identifier --- tests/clientapitest.cpp | 5 ++--- tests/dummyresourcebenchmark.cpp | 4 ++-- tests/dummyresourcetest.cpp | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp index 03cc732..8779716 100644 --- a/tests/clientapitest.cpp +++ b/tests/clientapitest.cpp @@ -95,8 +95,7 @@ private Q_SLOTS: res.setProperty("identifier", "dummyresource.identifier1"); res.setProperty("type", "dummyresource"); - Akonadi2::Store::create(res, "resourceconfig").exec().waitForFinished(); - + Akonadi2::Store::create(res).exec().waitForFinished(); { Akonadi2::Query query; query.resources << "resourceconfig"; @@ -106,7 +105,7 @@ private Q_SLOTS: QCOMPARE(result.size(), 1); } - Akonadi2::Store::remove(res, "resourceconfig").exec().waitForFinished(); + Akonadi2::Store::remove(res).exec().waitForFinished(); { Akonadi2::Query query; query.resources << "resourceconfig"; diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp index c020c6b..370acd2 100644 --- a/tests/dummyresourcebenchmark.cpp +++ b/tests/dummyresourcebenchmark.cpp @@ -72,11 +72,11 @@ private Q_SLOTS: int num = 100; QList > waitCondition; for (int i = 0; i < num; i++) { - Akonadi2::ApplicationDomain::Event event; + Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); - waitCondition << Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec(); + waitCondition << Akonadi2::Store::create(event).exec(); } waitForCompletion(waitCondition).exec().waitForFinished(); auto appendTime = time.elapsed(); diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp index 9d7d092..48bb7b0 100644 --- a/tests/dummyresourcetest.cpp +++ b/tests/dummyresourcetest.cpp @@ -48,11 +48,11 @@ private Q_SLOTS: void testWriteToFacadeAndQueryByUid() { - Akonadi2::ApplicationDomain::Event event; + Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); - Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::create(event).exec().waitForFinished(); Akonadi2::Query query; query.resources << "org.kde.dummy.instance1"; @@ -69,14 +69,14 @@ private Q_SLOTS: void testWriteToFacadeAndQueryByUid2() { - Akonadi2::ApplicationDomain::Event event; + Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1"); event.setProperty("summary", "summaryValue"); event.setProperty("uid", "testuid"); - Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::create(event).exec().waitForFinished(); event.setProperty("uid", "testuid2"); - Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::create(event).exec().waitForFinished(); Akonadi2::Query query; query.resources << "org.kde.dummy.instance1"; @@ -94,15 +94,15 @@ private Q_SLOTS: void testWriteToFacadeAndQueryBySummary() { - Akonadi2::ApplicationDomain::Event event; + Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1"); event.setProperty("uid", "testuid"); event.setProperty("summary", "summaryValue1"); - Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::create(event).exec().waitForFinished(); event.setProperty("uid", "testuid2"); event.setProperty("summary", "summaryValue2"); - Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::create(event).exec().waitForFinished(); Akonadi2::Query query; query.resources << "org.kde.dummy.instance1"; @@ -165,11 +165,11 @@ private Q_SLOTS: void testWriteModifyDelete() { - Akonadi2::ApplicationDomain::Event event; + Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); - Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::create(event).exec().waitForFinished(); Akonadi2::Query query; query.resources << "org.kde.dummy.instance1"; @@ -191,7 +191,7 @@ private Q_SLOTS: event2.setProperty("uid", "testuid"); event2.setProperty("summary", "summaryValue2"); - Akonadi2::Store::modify(event2, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::modify(event2).exec().waitForFinished(); //Test modify { @@ -203,7 +203,7 @@ private Q_SLOTS: QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2")); } - Akonadi2::Store::remove(event2, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::remove(event2).exec().waitForFinished(); //Test remove { @@ -227,11 +227,11 @@ private Q_SLOTS: async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); - Akonadi2::ApplicationDomain::Event event; + Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1"); event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); - Akonadi2::Store::create(event, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::create(event).exec().waitForFinished(); //Test create Akonadi2::ApplicationDomain::Event event2; @@ -245,7 +245,7 @@ private Q_SLOTS: event2.setProperty("uid", "testuid"); event2.setProperty("summary", "summaryValue2"); - Akonadi2::Store::modify(event2, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::modify(event2).exec().waitForFinished(); //Test modify { @@ -255,7 +255,7 @@ private Q_SLOTS: QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2")); } - Akonadi2::Store::remove(event2, "org.kde.dummy.instance1").exec().waitForFinished(); + Akonadi2::Store::remove(event2).exec().waitForFinished(); //Test remove { -- cgit v1.2.3