From ecd3de61f51e78d9db91a4e106b2cf9adfdd9131 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 30 Oct 2019 17:49:25 +0100 Subject: [PATCH] Fix build of tests. Resulted from a conflict between two patches --- test/testsyncvirtualfiles.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/testsyncvirtualfiles.cpp b/test/testsyncvirtualfiles.cpp index c203ba88d..a1af6cfb9 100644 --- a/test/testsyncvirtualfiles.cpp +++ b/test/testsyncvirtualfiles.cpp @@ -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(); }; -- 2.30.2