From c8d7a4288692fe550cb63c6cb7730d9cf22b4c6e Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 13 Jul 2023 14:09:22 +0800 Subject: [PATCH] Fix SyncMoveTest modifier type Signed-off-by: Claudio Cambra --- test/testsyncmove.cpp | 49 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp index 04f29f8bebf9..a22f1b288784 100644 --- a/test/testsyncmove.cpp +++ b/test/testsyncmove.cpp @@ -768,35 +768,36 @@ private slots: { QFETCH(bool, local); FakeFolder fakeFolder { FileInfo::A12_B12_C12_S12() }; - auto &modifier = local ? fakeFolder.localModifier() : fakeFolder.remoteModifier(); - - modifier.mkdir("FolA"); - modifier.mkdir("FolA/FolB"); - modifier.mkdir("FolA/FolB/FolC"); - modifier.mkdir("FolA/FolB/FolC/FolD"); - modifier.mkdir("FolA/FolB/FolC/FolD/FolE"); - modifier.insert("FolA/FileA.txt"); - modifier.insert("FolA/FolB/FileB.txt"); - modifier.insert("FolA/FolB/FolC/FileC.txt"); - modifier.insert("FolA/FolB/FolC/FolD/FileD.txt"); - modifier.insert("FolA/FolB/FolC/FolD/FolE/FileE.txt"); + const auto modifier = local ? static_cast(&(fakeFolder.localModifier())) : static_cast(&(fakeFolder.remoteModifier())); + QVERIFY(modifier); + + modifier->mkdir("FolA"); + modifier->mkdir("FolA/FolB"); + modifier->mkdir("FolA/FolB/FolC"); + modifier->mkdir("FolA/FolB/FolC/FolD"); + modifier->mkdir("FolA/FolB/FolC/FolD/FolE"); + modifier->insert("FolA/FileA.txt"); + modifier->insert("FolA/FolB/FileB.txt"); + modifier->insert("FolA/FolB/FolC/FileC.txt"); + modifier->insert("FolA/FolB/FolC/FolD/FileD.txt"); + modifier->insert("FolA/FolB/FolC/FolD/FolE/FileE.txt"); QVERIFY(fakeFolder.syncOnce()); OperationCounter counter; fakeFolder.setServerOverride(counter.functor()); - modifier.insert("FolA/FileA2.txt"); - modifier.insert("FolA/FolB/FileB2.txt"); - modifier.insert("FolA/FolB/FolC/FileC2.txt"); - modifier.insert("FolA/FolB/FolC/FolD/FileD2.txt"); - modifier.insert("FolA/FolB/FolC/FolD/FolE/FileE2.txt"); - modifier.rename("FolA", "FolA_Renamed"); - modifier.rename("FolA_Renamed/FolB", "FolB_Renamed"); - modifier.rename("FolB_Renamed/FolC", "FolA"); - modifier.rename("FolA/FolD", "FolA/FolD_Renamed"); - modifier.mkdir("FolB_Renamed/New"); - modifier.rename("FolA/FolD_Renamed/FolE", "FolB_Renamed/New/FolE"); - auto expected = local ? fakeFolder.currentLocalState() : fakeFolder.currentRemoteState(); + modifier->insert("FolA/FileA2.txt"); + modifier->insert("FolA/FolB/FileB2.txt"); + modifier->insert("FolA/FolB/FolC/FileC2.txt"); + modifier->insert("FolA/FolB/FolC/FolD/FileD2.txt"); + modifier->insert("FolA/FolB/FolC/FolD/FolE/FileE2.txt"); + modifier->rename("FolA", "FolA_Renamed"); + modifier->rename("FolA_Renamed/FolB", "FolB_Renamed"); + modifier->rename("FolB_Renamed/FolC", "FolA"); + modifier->rename("FolA/FolD", "FolA/FolD_Renamed"); + modifier->mkdir("FolB_Renamed/New"); + modifier->rename("FolA/FolD_Renamed/FolE", "FolB_Renamed/New/FolE"); + const auto expected = local ? fakeFolder.currentLocalState() : fakeFolder.currentRemoteState(); QVERIFY(fakeFolder.syncOnce()); QCOMPARE(fakeFolder.currentLocalState(), expected); QCOMPARE(fakeFolder.currentRemoteState(), expected);