Fix tests

They weren't adapted to delayed run of the dummy backend.

3 files changed, 21 insertions, 7 deletions

diff --git a/libmuon/backends/DummyBackend/tests/DummyTest.cpp b/libmuon/backends/DummyBackend/tests/DummyTest.cpp
index 63b2a2d..5bd3719 100644
--- a/libmuon/backends/DummyBackend/tests/DummyTest.cpp
+++ b/libmuon/backends/DummyBackend/tests/DummyTest.cpp
@@ -52,15 +52,21 @@ DummyTest::DummyTest(QObject* parent): QObject(parent)
 //     new ModelTest(m_model, m_model);
 
     m_appBackend = backendByName(m_model, "DummyBackend");
+}
+
+void DummyTest::init()
+{
     QVERIFY(m_appBackend);
-    QSignalSpy spy(m_appBackend, SIGNAL(backendReady()));
-    QVERIFY(spy.wait(0));
+    while(m_appBackend->isFetching()) {
+        QSignalSpy spy(m_appBackend, &AbstractResourcesBackend::fetchingChanged);
+        QVERIFY(spy.wait());
+    }
 }
 
 void DummyTest::testReadData()
 {
     QBENCHMARK {
-        for(int i=0; i<m_model->rowCount(); i++) {
+        for(int i=0, c=m_model->rowCount(); i<c; i++) {
             QModelIndex idx = m_model->index(i, 0);
             QVERIFY(!m_model->data(idx, ResourcesModel::NameRole).isNull());
         }
diff --git a/libmuon/backends/DummyBackend/tests/DummyTest.h b/libmuon/backends/DummyBackend/tests/DummyTest.h
index 3b288de..f877955 100644
--- a/libmuon/backends/DummyBackend/tests/DummyTest.h
+++ b/libmuon/backends/DummyBackend/tests/DummyTest.h
@@ -33,6 +33,8 @@ public:
     explicit DummyTest(QObject* parent = nullptr);
 
 private slots:
+    void init();
+
     void testReadData();
     void testProxy();
     void testFetch();
diff --git a/libmuon/backends/DummyBackend/tests/UpdateDummyTest.cpp b/libmuon/backends/DummyBackend/tests/UpdateDummyTest.cpp
index 7577f32..f310759 100644
--- a/libmuon/backends/DummyBackend/tests/UpdateDummyTest.cpp
+++ b/libmuon/backends/DummyBackend/tests/UpdateDummyTest.cpp
@@ -55,12 +55,18 @@ public:
 //         new ModelTest(m_model, m_model);
 
         m_appBackend = backendByName(m_model, "DummyBackend");
-        QVERIFY(m_appBackend);
-        QSignalSpy spy(m_appBackend, SIGNAL(backendReady()));
-        QVERIFY(spy.wait(0));
     }
 
 private slots:
+    void init()
+    {
+        QVERIFY(m_appBackend);
+        while(m_appBackend->isFetching()) {
+            QSignalSpy spy(m_appBackend, &AbstractResourcesBackend::fetchingChanged);
+            QVERIFY(spy.wait());
+        }
+    }
+
     void testUpdate()
     {
         ResourcesUpdatesModel* rum = new ResourcesUpdatesModel(this);
@@ -81,7 +87,7 @@ private slots:
 
         rum->updateAll();
 
-        QSignalSpy spy(rum, SIGNAL(progressingChanged()));
+        QSignalSpy spy(rum, &ResourcesUpdatesModel::progressingChanged);
         QVERIFY(spy.wait());
         QCOMPARE(rum->isProgressing(), true);
         QVERIFY(spy.wait());