From 5ab700f63993d616c37e0470c4aaeb80e7472cd9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 7 May 2012 01:00:16 +0200 Subject: Restore QUrl::setEncodedQuery(QByteArray()) to the Qt4 behavior. Null bytearray means no query, and QString::fromLatin1(QByteArray()) doesn't give a null string, but an empty string. Same for setEncodedFragment(QByteArray()). Change-Id: I992e9253e35941d66886456872ea06aa2ae92450 Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qurl/tst_qurl.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index 63f9cd06dc..38b9dc3198 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -2167,19 +2167,25 @@ void tst_QUrl::emptyQueryOrFragment() QVERIFY(url.hasQuery()); QCOMPARE(url.query(), QString(QLatin1String("abc=def"))); QCOMPARE(url.toString(), QString(QLatin1String("http://www.foo.bar/baz?abc=def"))); + url.setEncodedQuery("abc=def"); + QCOMPARE(url.toString(), QString(QLatin1String("http://www.foo.bar/baz?abc=def"))); // remove encodedQuery url.setQuery(QString()); QVERIFY(!url.hasQuery()); QVERIFY(url.encodedQuery().isNull()); QCOMPARE(url.toString(), QString(QLatin1String("http://www.foo.bar/baz"))); + url.setEncodedQuery(QByteArray()); + QCOMPARE(url.toString(), QString(QLatin1String("http://www.foo.bar/baz"))); // add empty encodedQuery - url.setEncodedQuery(""); + url.setQuery(""); QVERIFY(url.hasQuery()); QVERIFY(url.encodedQuery().isEmpty()); QVERIFY(!url.encodedQuery().isNull()); QCOMPARE(url.toString(), QString(QLatin1String("http://www.foo.bar/baz?"))); + url.setEncodedQuery(""); + QCOMPARE(url.toString(), QString(QLatin1String("http://www.foo.bar/baz?"))); } } @@ -2217,6 +2223,7 @@ void tst_QUrl::setEncodedFragment_data() QTest::addColumn("expected"); typedef QByteArray BA; + QTest::newRow("null") << BA("http://www.kde.org") << BA() << BA("http://www.kde.org"); QTest::newRow("empty") << BA("http://www.kde.org") << BA("") << BA("http://www.kde.org#"); QTest::newRow("basic test") << BA("http://www.kde.org") << BA("abc") << BA("http://www.kde.org#abc"); QTest::newRow("initial url has fragment") << BA("http://www.kde.org#old") << BA("new") << BA("http://www.kde.org#new"); @@ -2234,7 +2241,7 @@ void tst_QUrl::setEncodedFragment() QVERIFY(u.isValid()); u.setEncodedFragment(fragment); QVERIFY(u.isValid()); - QVERIFY(u.hasFragment()); + QCOMPARE(!fragment.isNull(), u.hasFragment()); QCOMPARE(QString::fromLatin1(u.toEncoded()), QString::fromLatin1(expected)); } -- cgit v1.2.3