Skip to content

Commit ac75c61

Browse files
committed
fix(vfs/windows): no folders on-demand in stable branch: adapt tests
we have some tests from master branch that rely on folders on-demand be enaled update those tests to work without folders on-demand Signed-off-by: Matthieu Gallien <[email protected]>
1 parent 0b610cf commit ac75c61

File tree

1 file changed

+15
-46
lines changed

1 file changed

+15
-46
lines changed

test/testsynccfapi.cpp

Lines changed: 15 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,38 +1611,23 @@ private slots:
16111611
QCOMPARE(completeSpy.size(), 9);
16121612
QVERIFY(itemInstruction(completeSpy, "rootfile1", CSYNC_INSTRUCTION_NEW));
16131613
QVERIFY(itemInstruction(completeSpy, "first folder", CSYNC_INSTRUCTION_NEW));
1614+
QVERIFY(itemInstruction(completeSpy, "first folder/file1", CSYNC_INSTRUCTION_NEW));
1615+
QVERIFY(itemInstruction(completeSpy, "first folder/file2", CSYNC_INSTRUCTION_NEW));
1616+
QVERIFY(itemInstruction(completeSpy, "first folder/file3", CSYNC_INSTRUCTION_NEW));
1617+
QVERIFY(itemInstruction(completeSpy, "first folder/second folder", CSYNC_INSTRUCTION_NEW));
1618+
QVERIFY(itemInstruction(completeSpy, "first folder/second folder/second file1", CSYNC_INSTRUCTION_NEW));
1619+
QVERIFY(itemInstruction(completeSpy, "first folder/second folder/second file2", CSYNC_INSTRUCTION_NEW));
1620+
QVERIFY(itemInstruction(completeSpy, "first folder/second folder/second file3", CSYNC_INSTRUCTION_NEW));
16141621

16151622
cleanup();
16161623

1617-
OCC::showInFileManager(fakeFolder.localPath() + "first folder");
1618-
1619-
QTest::qWait(5000);
1620-
16211624
QVERIFY(fakeFolder.syncOnce());
1622-
1623-
OCC::showInFileManager(fakeFolder.localPath() + "first folder");
1624-
1625-
QTest::qWait(5000);
1626-
1627-
const auto file3Info = fakeFolder.localModifier().find("first folder/file3");
1628-
QVERIFY(file3Info.exists());
1629-
const auto secondFolderInfo = fakeFolder.localModifier().find("first folder/second folder");
1630-
QVERIFY(secondFolderInfo.exists());
1631-
const auto wrongFirstFolderInfo = fakeFolder.localModifier().find("first folder/first folder");
1632-
QVERIFY(!wrongFirstFolderInfo.exists());
1633-
1634-
QVERIFY(fakeFolder.syncOnce());
1635-
1636-
OCC::showInFileManager(fakeFolder.localPath() + "first folder/second folder");
1637-
1638-
QTest::qWait(5000);
1639-
1640-
const auto secondFile3Info = fakeFolder.localModifier().find("first folder/second folder/second file3");
1641-
QVERIFY(secondFile3Info.exists());
1642-
const auto wrongSecondFolderInfo = fakeFolder.localModifier().find("first folder/second folder/second folder");
1643-
QVERIFY(!wrongSecondFolderInfo.exists());
1625+
QCOMPARE(completeSpy.size(), 0);
1626+
cleanup();
16441627

16451628
QVERIFY(fakeFolder.syncOnce());
1629+
QCOMPARE(completeSpy.size(), 0);
1630+
cleanup();
16461631
}
16471632

16481633
void switchVfsOffWithOnDemandFolder()
@@ -1727,30 +1712,14 @@ private slots:
17271712

17281713
QVERIFY(fakeFolder.syncOnce());
17291714

1730-
QCOMPARE(completeSpy.size(), 2);
1715+
QCOMPARE(completeSpy.size(), 5);
17311716
QVERIFY(itemInstruction(completeSpy, "zdirectory", CSYNC_INSTRUCTION_NEW));
1717+
QVERIFY(itemInstruction(completeSpy, "zdirectory/zsubdir", CSYNC_INSTRUCTION_NEW));
17321718
QVERIFY(itemInstruction(completeSpy, "fileFromRoot.txt", CSYNC_INSTRUCTION_NEW));
1719+
QVERIFY(itemInstruction(completeSpy, "zdirectory/afileFromDirectory.txt", CSYNC_INSTRUCTION_NEW));
1720+
QVERIFY(itemInstruction(completeSpy, "zdirectory/zsubdir/afileFromSubdir.txt", CSYNC_INSTRUCTION_NEW));
17331721
cleanup();
17341722

1735-
OCC::showInFileManager(fakeFolder.localPath() + "zdirectory");
1736-
1737-
QTest::qWait(5000);
1738-
1739-
OCC::showInFileManager(fakeFolder.localPath() + "zdirectory");
1740-
1741-
QTest::qWait(5000);
1742-
1743-
OCC::showInFileManager(fakeFolder.localPath() + "zdirectory/zsubdir");
1744-
1745-
QTest::qWait(5000);
1746-
1747-
const auto afileFromDirectoryInfo = fakeFolder.localModifier().find("zdirectory/afileFromDirectory.txt");
1748-
QVERIFY(afileFromDirectoryInfo.exists());
1749-
const auto zsubdirInfo = fakeFolder.localModifier().find("zdirectory/zsubdir");
1750-
QVERIFY(zsubdirInfo.exists());
1751-
const auto afileFromSubdirInfo = fakeFolder.localModifier().find("zdirectory/zsubdir/afileFromSubdir.txt");
1752-
QVERIFY(afileFromSubdirInfo.exists());
1753-
17541723
QVERIFY(fakeFolder.syncOnce());
17551724
QCOMPARE(completeSpy.size(), 0);
17561725
cleanup();

0 commit comments

Comments
 (0)