Skip to content

fix(tests): ensure we compare remote state against local state #9009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgallien merged 2 commits into from
Nov 5, 2025
Merged

fix(tests): ensure we compare remote state against local state #9009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba97e0d
fix(tests): ensure we compare remote state against local state
mgallien Nov 3, 2025
ca20934
fix(vfs/windows): test cannot use currentLocalState() with virtual files
mgallien Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions test/testsynccfapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* any purpose.
*/

#include <QtTest>

Check failure on line 10 in test/testsynccfapi.cpp

View workflow job for this annotation

GitHub Actions / build

test/testsynccfapi.cpp:10:10 [clang-diagnostic-error] 

'QtTest' file not found
#include "syncenginetestutils.h"
#include "common/vfs.h"
#include "config.h"
Expand Down Expand Up @@ -1518,7 +1518,7 @@
fakeFolder.remoteModifier().rename("B", "_B");

QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState());
QVERIFY(fakeFolder.currentRemoteState().find("_A/a1m"));
QVERIFY(fakeFolder.currentRemoteState().find("_B/b1m"));

Expand All @@ -1528,7 +1528,7 @@
fakeFolder.localModifier().rename("_A", "S/A");
fakeFolder.remoteModifier().rename("_B", "S/B");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState());
QVERIFY(fakeFolder.currentRemoteState().find("S/A/a2m"));
QVERIFY(fakeFolder.currentRemoteState().find("S/B/b2m"));
}
Expand All @@ -1551,7 +1551,8 @@
fakeFolder.remoteModifier().insert("first folder/second folder/second file3");

QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState());
QEXPECT_FAIL("", "windows VFS breaks comparison using currentLocalState()", Abort);
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState());
}

void testSyncFolderNewDeleteConflictExpectDeletion()
Expand Down
6 changes: 3 additions & 3 deletions test/testsyncmove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* any purpose.
*/

#include <QtTest>

Check failure on line 11 in test/testsyncmove.cpp

View workflow job for this annotation

GitHub Actions / build

test/testsyncmove.cpp:11:10 [clang-diagnostic-error] 

'QtTest' file not found
#include "common/result.h"
#include "syncenginetestutils.h"
#include <syncengine.h>
Expand Down Expand Up @@ -868,7 +868,7 @@
fakeFolder.remoteModifier().rename("B", "_B");

QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState());
QVERIFY(fakeFolder.currentRemoteState().find("_A/a1m"));
QVERIFY(fakeFolder.currentRemoteState().find("_B/b1m"));
QCOMPARE(counter.nDELETE, 0);
Expand All @@ -883,7 +883,7 @@
fakeFolder.localModifier().rename("_A", "S/A");
fakeFolder.remoteModifier().rename("_B", "S/B");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState());
QVERIFY(fakeFolder.currentRemoteState().find("S/A/a2m"));
QVERIFY(fakeFolder.currentRemoteState().find("S/B/b2m"));
QCOMPARE(counter.nDELETE, 0);
Expand All @@ -907,7 +907,7 @@
fakeFolder.remoteModifier().rename("B/b2", "C/b2");

QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentRemoteState());
QCOMPARE(fakeFolder.currentRemoteState(), fakeFolder.currentLocalState());
QVERIFY(fakeFolder.currentRemoteState().find("A/b1"));
QVERIFY(fakeFolder.currentRemoteState().find("C/b1"));
QVERIFY(fakeFolder.currentRemoteState().find("A/b2"));
Expand Down
Loading