diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-08 21:52:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-08 21:52:13 (GMT) |
| commit | 3f45860bfddc886a2f0985faf1a42b921d275caf (patch) | |
| tree | c87df8c81d70010f26e8a1534866a391cd7fdf43 /tests | |
| parent | 23f3c92081a8afd6ff4be352fee407817950e72f (diff) | |
| parent | 75f0c1f0f0496ae22ed89b996dfb0050defd0f3e (diff) | |
| download | Qt-3f45860bfddc886a2f0985faf1a42b921d275caf.zip Qt-3f45860bfddc886a2f0985faf1a42b921d275caf.tar.gz Qt-3f45860bfddc886a2f0985faf1a42b921d275caf.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QUrl: fix parsing of IRIs with more than one IDN label
QUrl: update the whitelist of IDN domains
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qurl/tst_qurl.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 83109b5..8dffebb 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -3189,6 +3189,32 @@ void tst_QUrl::ace_testsuite_data() QTest::newRow("separator-3002") << QString::fromUtf8("example\343\200\202com") << "example.com" << "." << "example.com"; + + QString egyptianIDN = + QString::fromUtf8("\331\210\330\262\330\247\330\261\330\251\055\330\247\331\204\330" + "\243\330\252\330\265\330\247\331\204\330\247\330\252.\331\205" + "\330\265\330\261"); + QTest::newRow("egyptian-tld-ace") + << "xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c" + << "xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c" + << "." + << egyptianIDN; + QTest::newRow("egyptian-tld-unicode") + << egyptianIDN + << "xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c" + << "." + << egyptianIDN; + QTest::newRow("egyptian-tld-mix1") + << QString::fromUtf8("\331\210\330\262\330\247\330\261\330\251\055\330\247\331\204\330" + "\243\330\252\330\265\330\247\331\204\330\247\330\252.xn--wgbh1c") + << "xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c" + << "." + << egyptianIDN; + QTest::newRow("egyptian-tld-mix2") + << QString::fromUtf8("xn----rmckbbajlc6dj7bxne2c.\331\205\330\265\330\261") + << "xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c" + << "." + << egyptianIDN; } void tst_QUrl::ace_testsuite() |