FCL/sf/mw/qt: comparison tests/auto/qurl/tst

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
 void binaryData();
 void fromUserInput_data();
 void fromUserInput();
 void task_199967();
 void task_240612();
+void taskQTBUG_6962();
 #ifdef QT3_SUPPORT
 void dirPath();
 #endif
 };
 }
 void tst_QUrl::i18n_data()
 {
 QTest::addColumn<QString>("input");
 QTest::addColumn<QByteArray>("punyOutput");
 QTest::newRow("øl") << QString::fromLatin1("http://ole:passord@www.øl.no/index.html?ole=æsemann&ilder gud=hei#top")
 <<          QByteArray("http://ole:passord@www.xn--l-4ga.no/index.html?ole=%C3%A6semann&ilder%20gud=hei#top");
 QTest::newRow("räksmörgås") << QString::fromLatin1("http://www.räksmörgås.no/")
 << QByteArray("http://www.xn--rksmrgs-5wao1o.no/");
 */
 QTest::newRow("nopath_task31320") << QString::fromLatin1("host://protocol")
 << uint(QUrl::None)
 << QString::fromLatin1("host://protocol");
+QTest::newRow("underscore_QTBUG-7434") << QString::fromLatin1("http://foo_bar.host.com/rss.php")
+<< uint(QUrl::None)
+<< QString::fromLatin1("http://foo_bar.host.com/rss.php");
 }
 void tst_QUrl::toString()
 {
 QFETCH(QString, urlString);
 QTest::addColumn<QByteArray>("encoded");
 QTest::addColumn<QByteArray>("excludeInEncoding");
 QTest::addColumn<QByteArray>("includeInEncoding");
 QTest::newRow("test_01") << QString::fromLatin1("abcdevghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ012345678-._~")
 << QByteArray("abcdevghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ012345678-._~")
 << QByteArray("")
 << QByteArray("");
 QTest::newRow("test_02") << QString::fromLatin1("{\t\n\r^\"abc}")
 << QByteArray("%7B%09%0A%0D%5E%22abc%7D")
 << QByteArray("")
 << QByteArray("");
 QTest::newRow("test_03") << QString::fromLatin1("://?#[]@!$&'()*+,;=")
 << QByteArray("%3A%2F%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D")
 << QByteArray("")
 << QByteArray("");
 QTest::newRow("test_04") << QString::fromLatin1("://?#[]@!$&'()*+,;=")
 << QByteArray("%3A%2F%2F%3F%23%5B%5D%40!$&'()*+,;=")
 << QByteArray("!$&'()*+,;=")
 << QByteArray("");
 QTest::newRow("test_05") << QString::fromLatin1("abcd")
 << QByteArray("a%62%63d")
 << QByteArray("")
 << QByteArray("bc");
 }
 void tst_QUrl::toPercentEncoding()
 {
 QFETCH(QString, original);
 QFETCH(QByteArray, encoded);
 QFETCH(QByteArray, excludeInEncoding);
 QFETCH(QByteArray, includeInEncoding);
 QByteArray encodedUrl = QUrl::toPercentEncoding(original, excludeInEncoding, includeInEncoding);
 QCOMPARE(encodedUrl.constData(), encoded.constData());
 QCOMPARE(original, QUrl::fromPercentEncoding(encodedUrl));
 }
 void tst_QUrl::symmetry()
 }
 {
 QUrl url = QUrl::fromEncoded("http://strange<username>@ok-hostname/", QUrl::StrictMode);
 QVERIFY(!url.isValid());
 // < and > are not allowed in userinfo in strict mode
+url.setUserName("normal_username");
+QVERIFY(url.isValid());
 }
 {
 QUrl url = QUrl::fromEncoded("http://strange<username>@ok-hostname/");
 QVERIFY(url.isValid());
 // < and > are allowed in tolerant mode
 }
 {
 QUrl url = QUrl::fromEncoded("http://strange;hostname/here");
 QVERIFY(!url.isValid());
 QCOMPARE(url.path(), QString("/here"));
-}
+url.setAuthority("foobar@bar");
+QVERIFY(url.isValid());
+}
+{
+QUrl url = QUrl::fromEncoded("foo://stuff;1/g");
+QVERIFY(!url.isValid());
+QCOMPARE(url.path(), QString("/g"));
+url.setHost("stuff-1");
+QVERIFY(url.isValid());
+}
 }
 void tst_QUrl::schemeValidator_data()
 {
 QTest::addColumn<QByteArray>("encodedUrl");
 << QString::fromLatin1("alqualond\353")
 << QString::fromLatin1("alqualond\353");
 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()
 {
 static const char canonsuffix[] = ".troll.no";
 QTest::newRow("slash") << "foo/bar" << true;
 QTest::newRow("colon") << "foo:80" << true;
 QTest::newRow("question") << "foo?bar" << true;
 QTest::newRow("at") << "foo@bar" << true;
 QTest::newRow("backslash") << "foo\\bar" << false;
-QTest::newRow("underline") << "foo_bar" << false;
 // these characters are transformed by NFKC to non-LDH characters
 QTest::newRow("dot-like") << QString::fromUtf8("foo\342\200\244bar") << false;  // U+2024 ONE DOT LEADER
 QTest::newRow("slash-like") << QString::fromUtf8("foo\357\274\217bar") << false;    // U+FF0F FULLWIDTH SOLIDUS
 {
 QTest::addColumn<QString>("source");
 QTest::newRow("ending-dot") << "example.com.";
 QTest::newRow("ending-dot3002") << QString("example.com") + QChar(0x3002);
+QTest::newRow("underline") << "foo_bar";  //QTBUG-7434
 }
 void tst_QUrl::std3deviations()
 {
 QFETCH(QString, source);
 << QUrl::fromEncoded("http://www.foo.com:8080/")
 << QUrl::fromEncoded("newfile.html")
 << QUrl::fromEncoded("http://www.foo.com:8080/newfile.html");
 }
+void tst_QUrl::taskQTBUG_6962()
+{
+//bug 6962: empty authority ignored by setAuthority
+QUrl url("http://example.com/something");
+url.setAuthority(QString());
+QCOMPARE(url.authority(), QString());
+}
 QTEST_MAIN(tst_QUrl)
 #include "tst_qurl.moc"

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f
child 37	758a864f9613