From 94a82cbb596edc2ae85198a111a4c08e8a1d2e3c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 3 Dec 2018 17:06:22 +0100 Subject: Test: fix compilaiton after merge --- test/testsyncconflict.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/testsyncconflict.cpp') diff --git a/test/testsyncconflict.cpp b/test/testsyncconflict.cpp index fe970d49e..fd750e641 100644 --- a/test/testsyncconflict.cpp +++ b/test/testsyncconflict.cpp @@ -114,7 +114,8 @@ private slots: conflictMap[baseFileId] = conflictFile; [&] { QVERIFY(!baseFileId.isEmpty()); - QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), Utility::conflictFileBaseName(conflictFile.toUtf8())); + QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), + Utility::conflictFileBaseNameFromPattern(conflictFile.toUtf8())); }(); } } @@ -164,7 +165,8 @@ private slots: conflictMap[baseFileId] = conflictFile; [&] { QVERIFY(!baseFileId.isEmpty()); - QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), Utility::conflictFileBaseName(conflictFile.toUtf8())); + QCOMPARE(request.rawHeader("OC-ConflictInitialBasePath"), + Utility::conflictFileBaseNameFromPattern(conflictFile.toUtf8())); }(); } } -- cgit v1.2.3