From 972f3a4e96876e4c36162a11062e40863d88a2a1 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sun, 15 Nov 2015 12:46:26 +0100 Subject: Cleanup --- tests/genericfacadetest.cpp | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'tests/genericfacadetest.cpp') diff --git a/tests/genericfacadetest.cpp b/tests/genericfacadetest.cpp index 67320c3..9e7500f 100644 --- a/tests/genericfacadetest.cpp +++ b/tests/genericfacadetest.cpp @@ -17,6 +17,7 @@ * Test for the generic facade implementation. * * This test doesn't use the actual storage and thus only tests the update logic of the facade. + * //FIXME this now uses the actual storage */ class GenericFacadeTest : public QObject { @@ -34,10 +35,9 @@ private Q_SLOTS: query.liveQuery = false; auto resultSet = QSharedPointer >::create(); - auto storage = QSharedPointer::create("identifier"); auto resourceAccess = QSharedPointer::create(); - storage->mResults << Akonadi2::ApplicationDomain::Event::Ptr::create(); - TestResourceFacade facade("identifier", storage, resourceAccess); + // storage->mResults << Akonadi2::ApplicationDomain::Event::Ptr::create(); + TestResourceFacade facade("identifier", resourceAccess); async::SyncListResult result(resultSet->emitter()); @@ -56,10 +56,9 @@ private Q_SLOTS: query.liveQuery = true; auto resultSet = QSharedPointer >::create(); - auto storage = QSharedPointer::create("identifier"); auto resourceAccess = QSharedPointer::create(); - storage->mResults << Akonadi2::ApplicationDomain::Event::Ptr::create(); - TestResourceFacade facade("identifier", storage, resourceAccess); + // storage->mResults << Akonadi2::ApplicationDomain::Event::Ptr::create(); + TestResourceFacade facade("identifier", resourceAccess); async::SyncListResult result(resultSet->emitter()); @@ -70,9 +69,9 @@ private Q_SLOTS: QCOMPARE(result.size(), 1); //Enter a second result - storage->mResults.clear(); - storage->mResults << QSharedPointer::create("resource", "id2", 0, QSharedPointer()); - storage->mLatestRevision = 2; + // storage->mResults.clear(); + // storage->mResults << QSharedPointer::create("resource", "id2", 0, QSharedPointer()); + // storage->mLatestRevision = 2; resourceAccess->emit revisionChanged(2); //Hack to get event loop in synclistresult to abort again @@ -88,12 +87,11 @@ private Q_SLOTS: query.liveQuery = true; auto resultSet = QSharedPointer >::create(); - auto storage = QSharedPointer::create("identifier"); auto resourceAccess = QSharedPointer::create(); auto entity = QSharedPointer::create("resource", "id2", 0, QSharedPointer::create()); entity->setProperty("test", "test1"); - storage->mResults << entity; - TestResourceFacade facade("identifier", storage, resourceAccess); + // storage->mResults << entity; + TestResourceFacade facade("identifier", resourceAccess); async::SyncListResult result(resultSet->emitter()); @@ -104,11 +102,11 @@ private Q_SLOTS: QCOMPARE(result.size(), 1); //Modify the entity again - storage->mResults.clear(); + // storage->mResults.clear(); entity = QSharedPointer::create("resource", "id2", 0, QSharedPointer::create()); entity->setProperty("test", "test2"); - storage->mModifications << entity; - storage->mLatestRevision = 2; + // storage->mModifications << entity; + // storage->mLatestRevision = 2; resourceAccess->emit revisionChanged(2); //Hack to get event loop in synclistresult to abort again @@ -125,11 +123,10 @@ private Q_SLOTS: query.liveQuery = true; auto resultSet = QSharedPointer >::create(); - auto storage = QSharedPointer::create("identifier"); auto resourceAccess = QSharedPointer::create(); auto entity = QSharedPointer::create("resource", "id2", 0, QSharedPointer()); - storage->mResults << entity; - TestResourceFacade facade("identifier", storage, resourceAccess); + // storage->mResults << entity; + TestResourceFacade facade("identifier", resourceAccess); async::SyncListResult result(resultSet->emitter()); @@ -140,9 +137,9 @@ private Q_SLOTS: QCOMPARE(result.size(), 1); //Remove the entity again - storage->mResults.clear(); - storage->mRemovals << entity; - storage->mLatestRevision = 2; + // storage->mResults.clear(); + // storage->mRemovals << entity; + // storage->mLatestRevision = 2; resourceAccess->emit revisionChanged(2); //Hack to get event loop in synclistresult to abort again -- cgit v1.2.3 From 0f24357d01bd8a278f03793db863d3f71ac37ef2 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 18 Nov 2015 00:51:55 +0100 Subject: Don't use a smart pointer for the result provider We're not doing any lifetime management anyways. --- tests/genericfacadetest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/genericfacadetest.cpp') diff --git a/tests/genericfacadetest.cpp b/tests/genericfacadetest.cpp index 9e7500f..bb95f4e 100644 --- a/tests/genericfacadetest.cpp +++ b/tests/genericfacadetest.cpp @@ -41,7 +41,7 @@ private Q_SLOTS: async::SyncListResult result(resultSet->emitter()); - facade.load(query, resultSet).exec().waitForFinished(); + facade.load(query, *resultSet).exec().waitForFinished(); resultSet->initialResultSetComplete(); //We have to wait for the events that deliver the results to be processed by the eventloop @@ -62,7 +62,7 @@ private Q_SLOTS: async::SyncListResult result(resultSet->emitter()); - facade.load(query, resultSet).exec().waitForFinished(); + facade.load(query, *resultSet).exec().waitForFinished(); resultSet->initialResultSetComplete(); result.exec(); @@ -95,7 +95,7 @@ private Q_SLOTS: async::SyncListResult result(resultSet->emitter()); - facade.load(query, resultSet).exec().waitForFinished(); + facade.load(query, *resultSet).exec().waitForFinished(); resultSet->initialResultSetComplete(); result.exec(); @@ -130,7 +130,7 @@ private Q_SLOTS: async::SyncListResult result(resultSet->emitter()); - facade.load(query, resultSet).exec().waitForFinished(); + facade.load(query, *resultSet).exec().waitForFinished(); resultSet->initialResultSetComplete(); result.exec(); -- cgit v1.2.3