From 26e47c0353cb7340488a60fa08bc72b4b6b8fe3c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 4 May 2012 12:40:28 +0200 Subject: Slightly improve the query encode/decode test in QUrl Show that nothing is changed either way, regardless of the encoding flags used. Change-Id: I31fba5f87eae777d4b708ab789b32169004bcbcc Reviewed-by: Lars Knoll --- tests/auto/corelib/io/qurl/tst_qurl.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index dc799b47e5..92717e96f9 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -2782,18 +2782,19 @@ void tst_QUrl::componentEncodings_data() // test the query // since QUrl doesn't know what chars the user wants to use for the pair and value delimiters, // it keeps the delimiters alone except for "#", which must always be encoded. - QTest::newRow("unencoded-delims-query") << QUrl("?!$()*+,;=:/?[]@") + // In the following test, all delimiter characters appear both as encoded and as decoded (except for "#") + QTest::newRow("unencoded-delims-query") << QUrl("?!$()*+,;=:/?[]@%21%24%26%27%28%29%2a%2b%2c%2f%3a%3b%3d%3f%40%5b%5d") << int(QUrl::FullyEncoded) << QString() << QString() << QString() << QString() << QString() - << QString() << "!$()*+,;=:/?[]@" << QString() - << "?!$()*+,;=:/?[]@"; - QTest::newRow("undecoded-delims-query") << QUrl("?%21%24%26%27%28%29%2a%2b%2c%2f%3a%3b%3d%3f%40%5b%5d") + << QString() << "!$()*+,;=:/?[]@%21%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D" << QString() + << "?!$()*+,;=:/?[]@%21%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D"; + QTest::newRow("undecoded-delims-query") << QUrl("?!$()*+,;=:/?[]@%21%24%26%27%28%29%2a%2b%2c%2f%3a%3b%3d%3f%40%5b%5d") << int(QUrl::MostDecoded) << QString() << QString() << QString() << QString() << QString() - << QString() << "%21%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D" << QString() - << "?%21%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D"; + << QString() << "!$()*+,;=:/?[]@%21%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D" << QString() + << "?!$()*+,;=:/?[]@%21%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D"; // reserved characters: '"' / "<" / ">" / "^" / "\" / "{" / "|" "}" // the RFC does not allow them undecoded anywhere, but we do -- cgit v1.2.3