Fix build of tests.
authorOlivier Goffart <ogoffart@woboq.com>
Wed, 30 Oct 2019 16:49:25 +0000 (17:49 +0100)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:59:02 +0000 (10:59 +0100)
Resulted from a conflict between two patches

test/testsyncvirtualfiles.cpp

index c203ba88d54a995e0953c430d015bf68c9e08859..a1af6cfb96220ed2d77e992f3abab4745f0e14fd 100644 (file)
@@ -1061,10 +1061,10 @@ private slots:
         fakeFolder.localModifier().remove("A/file3" DVSUFFIX);
         fakeFolder.localModifier().remove("A/file3" DVSUFFIX DVSUFFIX);
         QVERIFY(fakeFolder.syncOnce());
-        QVERIFY(findItem(completeSpy, "A/file1" DVSUFFIX)->isEmpty());
-        QVERIFY(findItem(completeSpy, "A/file2" DVSUFFIX)->isEmpty());
-        QVERIFY(findItem(completeSpy, "A/file3" DVSUFFIX)->isEmpty());
-        QVERIFY(findItem(completeSpy, "A/file3" DVSUFFIX DVSUFFIX)->isEmpty());
+        QVERIFY(completeSpy.findItem("A/file1" DVSUFFIX)->isEmpty());
+        QVERIFY(completeSpy.findItem("A/file2" DVSUFFIX)->isEmpty());
+        QVERIFY(completeSpy.findItem("A/file3" DVSUFFIX)->isEmpty());
+        QVERIFY(completeSpy.findItem("A/file3" DVSUFFIX DVSUFFIX)->isEmpty());
         cleanup();
 
         // Local removal: when querying server
@@ -1105,7 +1105,7 @@ private slots:
         FakeFolder fakeFolder{ FileInfo() };
         setupVfs(fakeFolder);
 
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        ItemCompletedSpy completeSpy(fakeFolder);
         auto cleanup = [&]() {
             completeSpy.clear();
         };