summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-13 11:58:07 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-14 14:24:57 +0100
commite65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch)
tree8965835c375422d63b2ccfa927b31a56e64bda1d /tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
parentd1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff)
parente95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp')
-rw-r--r--tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp80
1 files changed, 40 insertions, 40 deletions
diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 821c633179..4ee4b67ec0 100644
--- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -275,74 +275,74 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QNetworkCookie cookie;
cookie.setName("a");
cookie.setPath("/web");
- cookie.setDomain(".nokia.com");
+ cookie.setDomain(".qt-project.org");
allCookies += cookie;
QTest::newRow("no-match-1") << allCookies << "http://foo.bar/" << result;
QTest::newRow("no-match-2") << allCookies << "http://foo.bar/web" << result;
QTest::newRow("no-match-3") << allCookies << "http://foo.bar/web/wiki" << result;
- QTest::newRow("no-match-4") << allCookies << "http://nokia.com" << result;
- QTest::newRow("no-match-5") << allCookies << "http://qt.nokia.com" << result;
- QTest::newRow("no-match-6") << allCookies << "http://nokia.com/webinar" << result;
- QTest::newRow("no-match-7") << allCookies << "http://qt.nokia.com/webinar" << result;
- QTest::newRow("no-match-8") << allCookies << "http://qt.nokia.com./web" << result;
- QTest::newRow("no-match-9") << allCookies << "http://nokia.com./web" << result;
+ QTest::newRow("no-match-4") << allCookies << "http://qt-project.org" << result;
+ QTest::newRow("no-match-5") << allCookies << "http://qt-project.org" << result;
+ QTest::newRow("no-match-6") << allCookies << "http://qt-project.org/webinar" << result;
+ QTest::newRow("no-match-7") << allCookies << "http://qt-project.org/webinar" << result;
+ QTest::newRow("no-match-8") << allCookies << "http://qt-project.org./web" << result;
+ QTest::newRow("no-match-9") << allCookies << "http://qt-project.org./web" << result;
result = allCookies;
- QTest::newRow("match-1") << allCookies << "http://nokia.com/web" << result;
- QTest::newRow("match-2") << allCookies << "http://nokia.com/web/" << result;
- QTest::newRow("match-3") << allCookies << "http://nokia.com/web/content" << result;
- QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web" << result;
- QTest::newRow("match-5") << allCookies << "http://qt.nokia.com/web/" << result;
- QTest::newRow("match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+ QTest::newRow("match-1") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("match-2") << allCookies << "http://qt-project.org/web/" << result;
+ QTest::newRow("match-3") << allCookies << "http://qt-project.org/web/content" << result;
+ QTest::newRow("match-4") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("match-5") << allCookies << "http://qt-project.org/web/" << result;
+ QTest::newRow("match-6") << allCookies << "http://qt-project.org/web/content" << result;
cookie.setPath("/web/wiki");
allCookies += cookie;
// exact same results as before:
- QTest::newRow("one-match-1") << allCookies << "http://nokia.com/web" << result;
- QTest::newRow("one-match-2") << allCookies << "http://nokia.com/web/" << result;
- QTest::newRow("one-match-3") << allCookies << "http://nokia.com/web/content" << result;
- QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web" << result;
- QTest::newRow("one-match-5") << allCookies << "http://qt.nokia.com/web/" << result;
- QTest::newRow("one-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+ QTest::newRow("one-match-1") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("one-match-2") << allCookies << "http://qt-project.org/web/" << result;
+ QTest::newRow("one-match-3") << allCookies << "http://qt-project.org/web/content" << result;
+ QTest::newRow("one-match-4") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("one-match-5") << allCookies << "http://qt-project.org/web/" << result;
+ QTest::newRow("one-match-6") << allCookies << "http://qt-project.org/web/content" << result;
result.prepend(cookie); // longer path, it must match first
- QTest::newRow("two-matches-1") << allCookies << "http://nokia.com/web/wiki" << result;
- QTest::newRow("two-matches-2") << allCookies << "http://qt.nokia.com/web/wiki" << result;
+ QTest::newRow("two-matches-1") << allCookies << "http://qt-project.org/web/wiki" << result;
+ QTest::newRow("two-matches-2") << allCookies << "http://qt-project.org/web/wiki" << result;
// invert the order;
allCookies.clear();
allCookies << result.at(1) << result.at(0);
- QTest::newRow("two-matches-3") << allCookies << "http://nokia.com/web/wiki" << result;
- QTest::newRow("two-matches-4") << allCookies << "http://qt.nokia.com/web/wiki" << result;
+ QTest::newRow("two-matches-3") << allCookies << "http://qt-project.org/web/wiki" << result;
+ QTest::newRow("two-matches-4") << allCookies << "http://qt-project.org/web/wiki" << result;
// expired cookie
allCookies.clear();
cookie.setExpirationDate(QDateTime::fromString("09-Nov-1999", "dd-MMM-yyyy"));
allCookies += cookie;
result.clear();
- QTest::newRow("exp-match-1") << allCookies << "http://nokia.com/web" << result;
- QTest::newRow("exp-match-2") << allCookies << "http://nokia.com/web/" << result;
- QTest::newRow("exp-match-3") << allCookies << "http://nokia.com/web/content" << result;
- QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web" << result;
- QTest::newRow("exp-match-5") << allCookies << "http://qt.nokia.com/web/" << result;
- QTest::newRow("exp-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+ QTest::newRow("exp-match-1") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("exp-match-2") << allCookies << "http://qt-project.org/web/" << result;
+ QTest::newRow("exp-match-3") << allCookies << "http://qt-project.org/web/content" << result;
+ QTest::newRow("exp-match-4") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("exp-match-5") << allCookies << "http://qt-project.org/web/" << result;
+ QTest::newRow("exp-match-6") << allCookies << "http://qt-project.org/web/content" << result;
// path matching
allCookies.clear();
QNetworkCookie anotherCookie;
anotherCookie.setName("a");
anotherCookie.setPath("/web");
- anotherCookie.setDomain(".nokia.com");
+ anotherCookie.setDomain(".qt-project.org");
allCookies += anotherCookie;
result.clear();
- QTest::newRow("path-unmatch-1") << allCookies << "http://nokia.com/" << result;
- QTest::newRow("path-unmatch-2") << allCookies << "http://nokia.com/something/else" << result;
+ QTest::newRow("path-unmatch-1") << allCookies << "http://qt-project.org/" << result;
+ QTest::newRow("path-unmatch-2") << allCookies << "http://qt-project.org/something/else" << result;
result += anotherCookie;
- QTest::newRow("path-match-1") << allCookies << "http://nokia.com/web" << result;
- QTest::newRow("path-match-2") << allCookies << "http://nokia.com/web/" << result;
- QTest::newRow("path-match-3") << allCookies << "http://nokia.com/web/content" << result;
+ QTest::newRow("path-match-1") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("path-match-2") << allCookies << "http://qt-project.org/web/" << result;
+ QTest::newRow("path-match-3") << allCookies << "http://qt-project.org/web/content" << result;
// secure cookies
allCookies.clear();
@@ -350,14 +350,14 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QNetworkCookie secureCookie;
secureCookie.setName("a");
secureCookie.setPath("/web");
- secureCookie.setDomain(".nokia.com");
+ secureCookie.setDomain(".qt-project.org");
secureCookie.setSecure(true);
allCookies += secureCookie;
- QTest::newRow("no-match-secure-1") << allCookies << "http://nokia.com/web" << result;
- QTest::newRow("no-match-secure-2") << allCookies << "http://qt.nokia.com/web" << result;
+ QTest::newRow("no-match-secure-1") << allCookies << "http://qt-project.org/web" << result;
+ QTest::newRow("no-match-secure-2") << allCookies << "http://qt-project.org/web" << result;
result += secureCookie;
- QTest::newRow("match-secure-1") << allCookies << "https://nokia.com/web" << result;
- QTest::newRow("match-secure-2") << allCookies << "https://qt.nokia.com/web" << result;
+ QTest::newRow("match-secure-1") << allCookies << "https://qt-project.org/web" << result;
+ QTest::newRow("match-secure-2") << allCookies << "https://qt-project.org/web" << result;
// domain ending in .
allCookies.clear();