@@ -989,7 +989,6 @@ private Q_SLOTS:
989989 QTest::addColumn<Vfs::Mode>(" vfsMode" );
990990
991991 QTest::newRow (" Vfs::Off" ) << Vfs::Off;
992- QTest::newRow (" Vfs::WithSuffix" ) << Vfs::WithSuffix;
993992#ifdef Q_OS_WIN32
994993 if (VfsPluginManager::instance ().isVfsPluginAvailable (Vfs::WindowsCfApi)) {
995994 QTest::newRow (" Vfs::WindowsCfApi" ) << Vfs::WindowsCfApi;
@@ -1002,14 +1001,6 @@ private Q_SLOTS:
10021001 void testMovedWithError ()
10031002 {
10041003 QFETCH (Vfs::Mode, vfsMode);
1005- const auto getName = [vfsMode] (const QString &s)
1006- {
1007- if (vfsMode == Vfs::WithSuffix)
1008- {
1009- return QStringLiteral (" %1%2" ).arg (s, Theme::instance ()->appDotVirtualFileSuffix ());
1010- }
1011- return s;
1012- };
10131004 const QString src = QStringLiteral (" folder/folderA/file.txt" );
10141005 const QString dest = QStringLiteral (" folder/folderB/file.txt" );
10151006 FakeFolder fakeFolder{ FileInfo{ QString (), { FileInfo{ QStringLiteral (" folder" ), { FileInfo{ QStringLiteral (" folderA" ), { { QStringLiteral (" file.txt" ), 400 } } }, QStringLiteral (" folderB" ) } } } } };
@@ -1032,7 +1023,7 @@ private Q_SLOTS:
10321023
10331024
10341025 fakeFolder.serverErrorPaths ().append (src, 403 );
1035- fakeFolder.localModifier ().rename (getName ( src), getName ( dest) );
1026+ fakeFolder.localModifier ().rename (src, dest);
10361027 QVERIFY (fakeFolder.currentRemoteState ().find (src));
10371028 QVERIFY (!fakeFolder.currentRemoteState ().find (dest));
10381029
@@ -1049,12 +1040,7 @@ private Q_SLOTS:
10491040 }
10501041
10511042 QVERIFY (!fakeFolder.currentLocalState ().find (src));
1052- QVERIFY (fakeFolder.currentLocalState ().find (getName (dest)));
1053- if (vfsMode == Vfs::WithSuffix)
1054- {
1055- // the placeholder was not restored as it is still in error state
1056- QVERIFY (!fakeFolder.currentLocalState ().find (dest));
1057- }
1043+ QVERIFY (fakeFolder.currentLocalState ().find (dest));
10581044 QVERIFY (fakeFolder.currentRemoteState ().find (src));
10591045 QVERIFY (!fakeFolder.currentRemoteState ().find (dest));
10601046 }
0 commit comments