1 files changed, 40 insertions, 36 deletions

diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 879ffc4..172232f 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -13,34 +13,41 @@ template <typename T>
 class DummyResourceFacade : public Sink::StoreFacade<T>
 {
 public:
-    static std::shared_ptr<DummyResourceFacade<T> > registerFacade(const QByteArray &instanceIdentifier = QByteArray())
+    static std::shared_ptr<DummyResourceFacade<T>> registerFacade(const QByteArray &instanceIdentifier = QByteArray())
     {
-        static QMap<QByteArray, std::shared_ptr<DummyResourceFacade<T> > > map;
-        auto facade = std::make_shared<DummyResourceFacade<T> >();
+        static QMap<QByteArray, std::shared_ptr<DummyResourceFacade<T>>> map;
+        auto facade = std::make_shared<DummyResourceFacade<T>>();
         map.insert(instanceIdentifier, facade);
         bool alwaysReturnFacade = instanceIdentifier.isEmpty();
-        Sink::FacadeFactory::instance().registerFacade<T, DummyResourceFacade<T> >("dummyresource",
-            [alwaysReturnFacade](const QByteArray &instanceIdentifier) {
-                if (alwaysReturnFacade) {
-                    return map.value(QByteArray());
-                }
-                return map.value(instanceIdentifier);
+        Sink::FacadeFactory::instance().registerFacade<T, DummyResourceFacade<T>>("dummyresource", [alwaysReturnFacade](const QByteArray &instanceIdentifier) {
+            if (alwaysReturnFacade) {
+                return map.value(QByteArray());
             }
-        );
+            return map.value(instanceIdentifier);
+        });
         return facade;
     }
     ~DummyResourceFacade(){};
-    KAsync::Job<void> create(const T &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
-    KAsync::Job<void> modify(const T &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
-    KAsync::Job<void> remove(const T &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
-    QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename T::Ptr>::Ptr > load(const Sink::Query &query) Q_DECL_OVERRIDE
+    KAsync::Job<void> create(const T &domainObject) Q_DECL_OVERRIDE
+    {
+        return KAsync::null<void>();
+    };
+    KAsync::Job<void> modify(const T &domainObject) Q_DECL_OVERRIDE
+    {
+        return KAsync::null<void>();
+    };
+    KAsync::Job<void> remove(const T &domainObject) Q_DECL_OVERRIDE
+    {
+        return KAsync::null<void>();
+    };
+    QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename T::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE
     {
         auto resultProvider = new Sink::ResultProvider<typename T::Ptr>();
         resultProvider->onDone([resultProvider]() {
             Trace() << "Result provider is done";
             delete resultProvider;
         });
-        //We have to do it this way, otherwise we're not setting the fetcher right
+        // We have to do it this way, otherwise we're not setting the fetcher right
         auto emitter = resultProvider->emitter();
 
         resultProvider->setFetcher([query, resultProvider, this](const typename T::Ptr &parent) {
@@ -60,8 +67,7 @@ public:
             }
             resultProvider->initialResultSetComplete(parent);
         });
-        auto job = KAsync::start<void>([query, resultProvider]() {
-        });
+        auto job = KAsync::start<void>([query, resultProvider]() {});
         mResultProvider = resultProvider;
         return qMakePair(job, emitter);
     }
@@ -73,7 +79,7 @@ public:
 
 /**
  * Test of the client api implementation.
- * 
+ *
  * This test works with injected dummy facades and thus doesn't write to storage.
  */
 class ClientAPITest : public QObject
@@ -113,7 +119,7 @@ private slots:
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
     }
 
-    //TODO: This test doesn't belong to this testsuite
+    // TODO: This test doesn't belong to this testsuite
     void resourceManagement()
     {
         ResourceConfig::clear();
@@ -158,13 +164,13 @@ private slots:
     void testModelNested()
     {
         auto facade = DummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade();
-        auto folder =  QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         subfolder->setProperty("parent", "id");
         facade->results << folder << subfolder;
         ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
-        //Test
+        // Test
         Sink::Query query;
         query.resources << "dummyresource.instance1";
         query.liveQuery = false;
@@ -181,13 +187,13 @@ private slots:
     void testModelSignals()
     {
         auto facade = DummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade();
-        auto folder =  QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         subfolder->setProperty("parent", "id");
         facade->results << folder << subfolder;
         ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
-        //Test
+        // Test
         Sink::Query query;
         query.resources << "dummyresource.instance1";
         query.liveQuery = false;
@@ -203,13 +209,14 @@ private slots:
     void testModelNestedLive()
     {
         auto facade = DummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade();
-        auto folder =  QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        auto subfolder =
+            QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         subfolder->setProperty("parent", "id");
         facade->results << folder << subfolder;
         ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
-        //Test
+        // Test
         Sink::Query query;
         query.resources << "dummyresource.instance1";
         query.liveQuery = true;
@@ -222,7 +229,7 @@ private slots:
 
         auto resultProvider = facade->mResultProvider;
 
-        //Test new toplevel folder
+        // Test new toplevel folder
         {
             QSignalSpy rowsInsertedSpy(model.data(), SIGNAL(rowsInserted(const QModelIndex &, int, int)));
             auto folder2 = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id2", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
@@ -232,7 +239,7 @@ private slots:
             QCOMPARE(rowsInsertedSpy.at(0).at(0).value<QModelIndex>(), QModelIndex());
         }
 
-        //Test changed name
+        // Test changed name
         {
             QSignalSpy dataChanged(model.data(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));
             folder->setProperty("subject", "modifiedSubject");
@@ -241,7 +248,7 @@ private slots:
             QTRY_COMPARE(dataChanged.count(), 1);
         }
 
-        //Test removal
+        // Test removal
         {
             QSignalSpy rowsRemovedSpy(model.data(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
             folder->setProperty("subject", "modifiedSubject");
@@ -250,7 +257,7 @@ private slots:
             QTRY_COMPARE(rowsRemovedSpy.count(), 1);
         }
 
-        //TODO: A modification can also be a move
+        // TODO: A modification can also be a move
     }
 
     void testLoadMultiResource()
@@ -274,7 +281,7 @@ private slots:
         });
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
         QCOMPARE(model->rowCount(QModelIndex()), 2);
-        //Ensure children fetched is only emitted once (when all resources are done)
+        // Ensure children fetched is only emitted once (when all resources are done)
         QTest::qWait(50);
         QCOMPARE(childrenFetchedCount, 1);
     }
@@ -291,15 +298,12 @@ private slots:
 
         bool gotValue = false;
         auto result = Sink::Store::fetchOne<Sink::ApplicationDomain::Event>(query)
-            .then<void, Sink::ApplicationDomain::Event>([&gotValue](const Sink::ApplicationDomain::Event &event) {
-                gotValue = true;
-            }).exec();
+                          .then<void, Sink::ApplicationDomain::Event>([&gotValue](const Sink::ApplicationDomain::Event &event) { gotValue = true; })
+                          .exec();
         result.waitForFinished();
         QVERIFY(!result.errorCode());
         QVERIFY(gotValue);
     }
-
-
 };
 
 QTEST_MAIN(ClientAPITest)