summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-18 19:46:53 +0200
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-18 20:18:42 +0200
commit9e075992bae92366c80764cc26702b7abc1a5977 (patch)
tree6ad0c0c8689fe3b4e1143b7e9382d1a2bd509f5e
parentde1005fab824b134f36ea2b957f1ae219c2de6a5 (diff)
Autotest: Revert 96b6a3c9cd8 in tst_qnetworkcookiejar
The change of URLs in Qt broke the tests that operated on URLs. This wasn't properly done, so revert to the last working values.
-rw-r--r--tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 92b7ae5b1f..9bf43eae05 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -227,17 +227,17 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
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://trolltech.com" << result;
- QTest::newRow("no-match-5") << allCookies << "http://qt.nokia.com" << result;
+ QTest::newRow("no-match-5") << allCookies << "http://www.trolltech.com" << result;
QTest::newRow("no-match-6") << allCookies << "http://trolltech.com/webinar" << result;
- QTest::newRow("no-match-7") << allCookies << "http://qt.nokia.com/webinar" << result;
+ QTest::newRow("no-match-7") << allCookies << "http://www.trolltech.com/webinar" << result;
result = allCookies;
QTest::newRow("match-1") << allCookies << "http://trolltech.com/web" << result;
QTest::newRow("match-2") << allCookies << "http://trolltech.com/web/" << result;
QTest::newRow("match-3") << allCookies << "http://trolltech.com/web/content" << result;
- QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web" << result;
- QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web/" << result;
- QTest::newRow("match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+ QTest::newRow("match-4") << allCookies << "http://www.trolltech.com/web" << result;
+ QTest::newRow("match-4") << allCookies << "http://www.trolltech.com/web/" << result;
+ QTest::newRow("match-6") << allCookies << "http://www.trolltech.com/web/content" << result;
cookie.setPath("/web/wiki");
allCookies += cookie;
@@ -246,19 +246,19 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QTest::newRow("one-match-1") << allCookies << "http://trolltech.com/web" << result;
QTest::newRow("one-match-2") << allCookies << "http://trolltech.com/web/" << result;
QTest::newRow("one-match-3") << allCookies << "http://trolltech.com/web/content" << result;
- QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web" << result;
- QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web/" << result;
- QTest::newRow("one-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+ QTest::newRow("one-match-4") << allCookies << "http://www.trolltech.com/web" << result;
+ QTest::newRow("one-match-4") << allCookies << "http://www.trolltech.com/web/" << result;
+ QTest::newRow("one-match-6") << allCookies << "http://www.trolltech.com/web/content" << result;
result.prepend(cookie); // longer path, it must match first
QTest::newRow("two-matches-1") << allCookies << "http://trolltech.com/web/wiki" << result;
- QTest::newRow("two-matches-2") << allCookies << "http://qt.nokia.com/web/wiki" << result;
+ QTest::newRow("two-matches-2") << allCookies << "http://www.trolltech.com/web/wiki" << result;
// invert the order;
allCookies.clear();
allCookies << result.at(1) << result.at(0);
QTest::newRow("two-matches-3") << allCookies << "http://trolltech.com/web/wiki" << result;
- QTest::newRow("two-matches-4") << allCookies << "http://qt.nokia.com/web/wiki" << result;
+ QTest::newRow("two-matches-4") << allCookies << "http://www.trolltech.com/web/wiki" << result;
// expired cookie
allCookies.clear();
@@ -268,9 +268,9 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QTest::newRow("exp-match-1") << allCookies << "http://trolltech.com/web" << result;
QTest::newRow("exp-match-2") << allCookies << "http://trolltech.com/web/" << result;
QTest::newRow("exp-match-3") << allCookies << "http://trolltech.com/web/content" << result;
- QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web" << result;
- QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web/" << result;
- QTest::newRow("exp-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
+ QTest::newRow("exp-match-4") << allCookies << "http://www.trolltech.com/web" << result;
+ QTest::newRow("exp-match-4") << allCookies << "http://www.trolltech.com/web/" << result;
+ QTest::newRow("exp-match-6") << allCookies << "http://www.trolltech.com/web/content" << result;
}
void tst_QNetworkCookieJar::cookiesForUrl()