From 972f3a4e96876e4c36162a11062e40863d88a2a1 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sun, 15 Nov 2015 12:46:26 +0100 Subject: Cleanup --- tests/genericfacadebenchmark.cpp | 3 +-- tests/genericfacadetest.cpp | 39 ++++++++++++++++++--------------------- tests/testimplementations.h | 26 -------------------------- 3 files changed, 19 insertions(+), 49 deletions(-) (limited to 'tests') diff --git a/tests/genericfacadebenchmark.cpp b/tests/genericfacadebenchmark.cpp index 29c91d7..94d6f41 100644 --- a/tests/genericfacadebenchmark.cpp +++ b/tests/genericfacadebenchmark.cpp @@ -56,8 +56,7 @@ private Q_SLOTS: QBENCHMARK { auto resultSet = QSharedPointer >::create(); auto resourceAccess = QSharedPointer::create(); - auto storage = QSharedPointer >::create("identifier"); - TestResourceFacade facade(identifier, storage, resourceAccess); + TestResourceFacade facade(identifier, resourceAccess); async::SyncListResult result(resultSet->emitter()); 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 diff --git a/tests/testimplementations.h b/tests/testimplementations.h index 1436c68..c371456 100644 --- a/tests/testimplementations.h +++ b/tests/testimplementations.h @@ -21,13 +21,11 @@ #include -#include #include #include #include #include #include -#include #include //Replace with something different @@ -44,30 +42,6 @@ public: virtual ~TestEventAdaptorFactory() {}; }; -class TestEntityStorage : public EntityStorage -{ -public: - using EntityStorage::EntityStorage; - virtual qint64 read(const Akonadi2::Query &query, qint64 oldRevision, const QSharedPointer > &resultProvider) Q_DECL_OVERRIDE - { - for (const auto &res : mResults) { - resultProvider->add(res); - } - for (const auto &res : mModifications) { - resultProvider->modify(res); - } - for (const auto &res : mRemovals) { - resultProvider->remove(res); - } - return mLatestRevision; - } - - QList mResults; - QList mModifications; - QList mRemovals; - qint64 mLatestRevision; -}; - class TestResourceAccess : public Akonadi2::ResourceAccessInterface { Q_OBJECT -- cgit v1.2.3