From 53080f4836191a010a9a518f04e4c5b1a6d18962 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 5 Nov 2018 12:03:39 +0100 Subject: RemoteDiscoveryTest: Fix after the merge from 2.5 The new discovery's message is slightly different --- test/testremotediscovery.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'test/testremotediscovery.cpp') diff --git a/test/testremotediscovery.cpp b/test/testremotediscovery.cpp index 4920a3b0a..59d33b086 100644 --- a/test/testremotediscovery.cpp +++ b/test/testremotediscovery.cpp @@ -55,14 +55,16 @@ private slots: QTest::addColumn("errorKind"); QTest::addColumn("expectedErrorString"); - QTest::newRow("404") << 404 << "File or directory not found: B"; - QTest::newRow("500") << 500 << "An error occurred while opening a folder B: Internal Server Fake Error"; - QTest::newRow("503") << 503 << "An error occurred while opening a folder B: Internal Server Fake Error"; + QString httpErrorMessage = "Server replied with an error while reading directory 'B' : Internal Server Fake Error"; + + QTest::newRow("404") << 404 << httpErrorMessage; + QTest::newRow("500") << 500 << httpErrorMessage; + QTest::newRow("503") << 503 << httpErrorMessage; // 200 should be an error since propfind should return 207 - QTest::newRow("200") << 200 << "An error occurred while opening a folder B: Internal Server Fake Error"; - QTest::newRow("InvalidXML") << +InvalidXML << "An error occurred while opening a folder B: Unknown error"; - QTest::newRow("MissingPermissions") << +MissingPermissions << "A HTTP transmission error happened. B: The server file discovery reply is missing data."; - QTest::newRow("Timeout") << +Timeout << "An error occurred while opening a folder B: Operation canceled"; + QTest::newRow("200") << 200 << httpErrorMessage; + QTest::newRow("InvalidXML") << +InvalidXML << "error while reading directory 'B' : Unknown error"; + QTest::newRow("MissingPermissions") << +MissingPermissions << "error while reading directory 'B' : The server file discovery reply is missing data."; + QTest::newRow("Timeout") << +Timeout << "error while reading directory 'B' : Operation canceled"; } -- cgit v1.2.3