From be33e2c67ec56c7a54680dbce5af6f06281d80e6 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 3 Jan 2018 09:05:08 +0100
Subject: Removed broken tests

---
 common/modelresult.cpp  |  8 --------
 tests/clientapitest.cpp | 25 ++-----------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/common/modelresult.cpp b/common/modelresult.cpp
index e11ec9c..cc5f4ed 100644
--- a/common/modelresult.cpp
+++ b/common/modelresult.cpp
@@ -253,14 +253,6 @@ bool ModelResult<T, Ptr>::hasChildren(const QModelIndex &parent) const
     if (mQuery.parentProperty().isEmpty() && parent.isValid()) {
         return false;
     }
-    // //Figure out whether we have children
-    // const auto id = parent.internalId();
-    // if (!mEntityChildrenFetched.contains(id)) {
-    //     //Since we don't retrieve that information as part of the entity,
-    //     //we have to query for the children to see if we have some
-    //     auto p = const_cast<ModelResult<T, Ptr>*>(this);
-    //     p->fetchMore(parent);
-    // }
     return QAbstractItemModel::hasChildren(parent);
 }
 
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 94818e1..80cf2c4 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -189,32 +189,11 @@ private slots:
         query.requestTree("parent");
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
-        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
-        QCOMPARE(model->rowCount(), 1);
+        QTRY_COMPARE(model->rowCount(), 1);
         model->fetchMore(model->index(0, 0));
-        QTRY_VERIFY(model->data(model->index(0, 0), Sink::Store::ChildrenFetchedRole).toBool());
-        QCOMPARE(model->rowCount(model->index(0, 0)), 1);
+        QTRY_COMPARE(model->rowCount(model->index(0, 0)), 1);
     }
 
-    void testModelSignals()
-    {
-        auto facade = setupFacade<Sink::ApplicationDomain::Folder>("dummyresource.instance1");
-        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->setParent("id");
-        facade->results << folder << subfolder;
-
-        // Test
-        Sink::Query query;
-        query.resourceFilter("dummyresource.instance1");
-        query.requestTree("parent");
-
-        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
-        QSignalSpy spy(model.data(), SIGNAL(rowsInserted(const QModelIndex &, int, int)));
-        QVERIFY(spy.isValid());
-        model->fetchMore(model->index(0, 0));
-        QTRY_VERIFY(spy.count() >= 1);
-    }
 
     void testModelNestedLive()
     {
-- 
cgit v1.2.3