diff options
| author | Peter Hartmann <phartmann@rim.com> | 2013-02-06 15:26:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-02 10:13:27 +0100 |
| commit | b20d15b58b83e76144dbeac4dc9b83215cc91f6a (patch) | |
| tree | 4487dd66524756d2cf68cf1cc98a4348a9ae231f /tests | |
| parent | 658616b44e8d6ff860ab2f58ff6e51f89c212f95 (diff) | |
QUrl: update top level domains that may contain non-ASCII characters
Most notably, .com and .net now may contain non-ASCII characters.
list has been generated from
http://www.mozilla.org/projects/security/tld-idn-policy-list.html
Change-Id: Idc3191dc782bc4173ccb19b4bc81f4f061ca7999
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/io/qurl/tst_qurl.cpp | 21 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp | 14 |
2 files changed, 34 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index cdd631b437..898aefffd3 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -2184,33 +2184,52 @@ void tst_QUrl::tldRestrictions_data() // current whitelist QTest::newRow("ac") << QString("ac") << true; + QTest::newRow("ar") << QString("ar") << true; + QTest::newRow("asia") << QString("asia") << true; QTest::newRow("at") << QString("at") << true; + QTest::newRow("biz") << QString("biz") << true; QTest::newRow("br") << QString("br") << true; QTest::newRow("cat") << QString("cat") << true; QTest::newRow("ch") << QString("ch") << true; QTest::newRow("cl") << QString("cl") << true; QTest::newRow("cn") << QString("cn") << true; + QTest::newRow("com") << QString("com") << true; QTest::newRow("de") << QString("de") << true; QTest::newRow("dk") << QString("dk") << true; + QTest::newRow("es") << QString("es") << true; QTest::newRow("fi") << QString("fi") << true; + QTest::newRow("gr") << QString("gr") << true; QTest::newRow("hu") << QString("hu") << true; + QTest::newRow("il") << QString("il") << true; QTest::newRow("info") << QString("info") << true; QTest::newRow("io") << QString("io") << true; + QTest::newRow("is") << QString("is") << true; + QTest::newRow("ir") << QString("ir") << true; QTest::newRow("jp") << QString("jp") << true; QTest::newRow("kr") << QString("kr") << true; QTest::newRow("li") << QString("li") << true; QTest::newRow("lt") << QString("lt") << true; + QTest::newRow("lu") << QString("lu") << true; + QTest::newRow("lv") << QString("lv") << true; QTest::newRow("museum") << QString("museum") << true; + QTest::newRow("name") << QString("name") << true; + QTest::newRow("net") << QString("name") << true; QTest::newRow("no") << QString("no") << true; + QTest::newRow("nu") << QString("nu") << true; + QTest::newRow("nz") << QString("nz") << true; + QTest::newRow("org") << QString("org") << true; + QTest::newRow("pl") << QString("pl") << true; + QTest::newRow("pr") << QString("pr") << true; QTest::newRow("se") << QString("se") << true; QTest::newRow("sh") << QString("sh") << true; + QTest::newRow("tel") << QString("tel") << true; QTest::newRow("th") << QString("th") << true; QTest::newRow("tm") << QString("tm") << true; QTest::newRow("tw") << QString("tw") << true; + QTest::newRow("ua") << QString("ua") << true; QTest::newRow("vn") << QString("vn") << true; // known blacklists: - QTest::newRow("com") << QString("com") << false; QTest::newRow("foo") << QString("foo") << false; } diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp index 6ba659856c..fa3dec620a 100644 --- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp +++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp @@ -649,6 +649,20 @@ void tst_QUrlInternal::ace_testsuite_data() << "xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c" << "." << egyptianIDN; + + QString russianIDN = QString::fromUtf8("\321\217\320\275\320\264\320\265\320\272\321\201.\321\200\321\204"); + QTest::newRow("russian-tld-ace") + << "xn--d1acpjx3f.xn--p1ai" + << "xn--d1acpjx3f.xn--p1ai" + << "." + << russianIDN; + + QString taiwaneseIDN = QString::fromUtf8("\345\217\260\345\214\227\346\214\211\346\221\251.\345\217\260\347\201\243"); + QTest::newRow("taiwanese-tld-ace") + << "xn--djrptm67aikb.xn--kpry57d" + << "xn--djrptm67aikb.xn--kpry57d" + << "." + << taiwaneseIDN; } void tst_QUrlInternal::ace_testsuite() |