From 8cfc16c16c57b373f6b3a8fe62dd84db6276e514 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Mon, 21 May 2018 15:23:54 +0200 Subject: SocketAPI: Introduce conflict resolution actions #6252 For conflicts generally as well as new files in read-only directories the context menu will now present delete and move options. --- test/testsyncconflict.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/testsyncconflict.cpp') diff --git a/test/testsyncconflict.cpp b/test/testsyncconflict.cpp index 8703ccc41..92d330ac1 100644 --- a/test/testsyncconflict.cpp +++ b/test/testsyncconflict.cpp @@ -125,7 +125,7 @@ private slots: QVERIFY(conflictMap.contains(a1FileId)); QVERIFY(conflictMap.contains(a2FileId)); QCOMPARE(conflictMap.size(), 2); - QCOMPARE(Utility::conflictFileBaseName(conflictMap[a1FileId].toUtf8()), QByteArray("A/a1")); + QCOMPARE(Utility::conflictFileBaseNameFromPattern(conflictMap[a1FileId].toUtf8()), QByteArray("A/a1")); // Check that the conflict file contains the username QVERIFY(conflictMap[a1FileId].contains(QString("(conflicted copy %1 ").arg(fakeFolder.syncEngine().account()->davDisplayName()))); @@ -384,7 +384,7 @@ private slots: { QFETCH(QString, input); QFETCH(QString, output); - QCOMPARE(Utility::conflictFileBaseName(input.toUtf8()), output.toUtf8()); + QCOMPARE(Utility::conflictFileBaseNameFromPattern(input.toUtf8()), output.toUtf8()); } void testLocalDirRemoteFileConflict() -- cgit v1.2.3