diff options
Diffstat (limited to 'tests/auto/corelib')
14 files changed, 86 insertions, 71 deletions
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 5ee469b50b..df7b397481 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -2914,7 +2914,7 @@ void tst_QFile::map() QVERIFY(file.unmap(memory)); QCOMPARE(file.error(), QFile::NoError); - // hpux wont let you map multiple times. + // hpux won't let you map multiple times. #if !defined(Q_OS_HPUX) && !defined(Q_USE_DEPRECATED_MAP_API) && !defined(Q_OS_WINCE) // exotic test to make sure that multiple maps work diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp b/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp index bc8517fe40..e3d5db47dc 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp @@ -47,7 +47,7 @@ struct Foo int main() { - *(char*)0 = 0; + *(volatile char*)0 = 0; Foo *f = 0; return f->i; } diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index 3208e6a1e5..cdd631b437 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -227,14 +227,14 @@ void tst_QUrl::constructing() QVERIFY(url == url); QVERIFY(!(url < url)); - QUrl justHost("qt.nokia.com"); + QUrl justHost("qt-project.org"); QVERIFY(!justHost.isEmpty()); QVERIFY(justHost.host().isEmpty()); - QCOMPARE(justHost.path(), QString::fromLatin1("qt.nokia.com")); + QCOMPARE(justHost.path(), QString::fromLatin1("qt-project.org")); - QUrl hostWithSlashes("//qt.nokia.com"); + QUrl hostWithSlashes("//qt-project.org"); QVERIFY(hostWithSlashes.path().isEmpty()); - QCOMPARE(hostWithSlashes.host(), QString::fromLatin1("qt.nokia.com")); + QCOMPARE(hostWithSlashes.host(), QString::fromLatin1("qt-project.org")); } void tst_QUrl::hashInPath() @@ -271,7 +271,7 @@ void tst_QUrl::unc() void tst_QUrl::assignment() { - QUrl url("http://qt.nokia.com/"); + QUrl url("http://qt-project.org/"); QVERIFY(url.isValid()); QUrl copy; @@ -282,10 +282,10 @@ void tst_QUrl::assignment() void tst_QUrl::comparison() { - QUrl url1("http://qt.nokia.com/"); + QUrl url1("http://qt-project.org/"); QVERIFY(url1.isValid()); - QUrl url2("http://qt.nokia.com/"); + QUrl url2("http://qt-project.org/"); QVERIFY(url2.isValid()); QVERIFY(url1 == url2); @@ -369,7 +369,7 @@ void tst_QUrl::comparison2() void tst_QUrl::copying() { - QUrl url("http://qt.nokia.com/"); + QUrl url("http://qt-project.org/"); QVERIFY(url.isValid()); QUrl copy(url); @@ -689,6 +689,13 @@ void tst_QUrl::setUrl() QCOMPARE(url.encodedPath().constData(), "text/javascript,d5%20=%20'five%5Cu0027s';"); } + { + // invalid port number + QUrl url; + url.setEncodedUrl("foo://tel:2147483648"); + QVERIFY(!url.isValid()); + } + { //check it calls detach QUrl u1("http://aaa.com"); QUrl u2 = u1; @@ -997,9 +1004,9 @@ void tst_QUrl::toString_constructed_data() QString n(""); - QTest::newRow("data1") << n << n << n << QString::fromLatin1("qt.nokia.com") << -1 << QString::fromLatin1("/index.html") - << QByteArray() << n << QString::fromLatin1("//qt.nokia.com/index.html") - << QByteArray("//qt.nokia.com/index.html") << 0u; + QTest::newRow("data1") << n << n << n << QString::fromLatin1("qt-project.org") << -1 << QString::fromLatin1("/index.html") + << QByteArray() << n << QString::fromLatin1("//qt-project.org/index.html") + << QByteArray("//qt-project.org/index.html") << 0u; QTest::newRow("data2") << QString::fromLatin1("file") << n << n << n << -1 << QString::fromLatin1("/root") << QByteArray() << n << QString::fromLatin1("file:///root") << QByteArray("file:///root") << 0u; QTest::newRow("userAndPass") << QString::fromLatin1("http") << QString::fromLatin1("dfaure") << QString::fromLatin1("kde") @@ -1157,22 +1164,22 @@ void tst_QUrl::compat_legacy() /* others */ { - QUrl u( "http://qt.nokia.com/images/ban/pgs_front.jpg" ); + QUrl u( "http://qt-project.org/images/ban/pgs_front.jpg" ); QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") ); } { - QUrl tmp( "http://qt.nokia.com/images/ban/" ); + QUrl tmp( "http://qt-project.org/images/ban/" ); QUrl u = tmp.resolved(QString("pgs_front.jpg")); QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") ); } { QUrl tmp; - QUrl u = tmp.resolved(QString("http://qt.nokia.com/images/ban/pgs_front.jpg")); + QUrl u = tmp.resolved(QString("http://qt-project.org/images/ban/pgs_front.jpg")); QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") ); } { QUrl tmp; - QUrl u = tmp.resolved(QString("http://qt.nokia.com/images/ban/pgs_front.jpg")); + QUrl u = tmp.resolved(QString("http://qt-project.org/images/ban/pgs_front.jpg")); QFileInfo fi(u.path()); u.setPath(fi.path()); QCOMPARE( u.path(), QString("/images/ban") ); @@ -1254,11 +1261,11 @@ void tst_QUrl::compat_constructor_03_data() QTest::addColumn<QString>("res"); //next we fill it with data - QTest::newRow( "protocol00" ) << QString( "http://qt.nokia.com/index.html" ) << QString( "http://qt.nokia.com/index.html" ); - QTest::newRow( "protocol01" ) << QString( "http://qt.nokia.com" ) << QString( "http://qt.nokia.com" ); - QTest::newRow( "protocol02" ) << QString( "http://qt.nokia.com/" ) << QString( "http://qt.nokia.com/" ); - QTest::newRow( "protocol03" ) << QString( "http://qt.nokia.com/foo" ) << QString( "http://qt.nokia.com/foo" ); - QTest::newRow( "protocol04" ) << QString( "http://qt.nokia.com/foo/" ) << QString( "http://qt.nokia.com/foo/" ); + QTest::newRow( "protocol00" ) << QString( "http://qt-project.org/index.html" ) << QString( "http://qt-project.org/index.html" ); + QTest::newRow( "protocol01" ) << QString( "http://qt-project.org" ) << QString( "http://qt-project.org" ); + QTest::newRow( "protocol02" ) << QString( "http://qt-project.org/" ) << QString( "http://qt-project.org/" ); + QTest::newRow( "protocol03" ) << QString( "http://qt-project.org/foo" ) << QString( "http://qt-project.org/foo" ); + QTest::newRow( "protocol04" ) << QString( "http://qt-project.org/foo/" ) << QString( "http://qt-project.org/foo/" ); QTest::newRow( "protocol05" ) << QString( "ftp://ftp.qt-project.org/foo/index.txt" ) << QString( "ftp://ftp.qt-project.org/foo/index.txt" ); QTest::newRow( "local00" ) << QString( "/foo" ) << QString( "/foo" ); @@ -1385,7 +1392,7 @@ void tst_QUrl::compat_path_data() QTest::addColumn<QString>("url"); QTest::addColumn<QString>("res"); - QTest::newRow( "protocol00" ) << "http://qt.nokia.com/images/ban/pgs_front.jpg" << "/images/ban/pgs_front.jpg"; + QTest::newRow( "protocol00" ) << "http://qt-project.org/images/ban/pgs_front.jpg" << "/images/ban/pgs_front.jpg"; #if defined( Q_OS_WIN32 ) QTest::newRow( "winShare00" ) << "//Anarki/homes" << "/homes"; @@ -1435,8 +1442,8 @@ void tst_QUrl::compat_decode_data() QTest::newRow("NormalString") << QByteArray("filename") << QString("filename"); QTest::newRow("NormalStringEncoded") << QByteArray("file%20name") << QString("file name"); QTest::newRow("JustEncoded") << QByteArray("%20") << QString(" "); - QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QString("http://qt.nokia.com"); - QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt%20nokia%20com") << QString("http://qt nokia com"); + QTest::newRow("HTTPUrl") << QByteArray("http://qt-project.org") << QString("http://qt-project.org"); + QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt-project%20org") << QString("http://qt-project org"); QTest::newRow("EmptyString") << QByteArray("") << QString(""); QTest::newRow("NulByte") << QByteArray("C%00%0A") << QString::fromLatin1("C\0\n", 3); QTest::newRow("Task27166") << QByteArray("Fran%C3%A7aise") << QString::fromUtf8("Française"); @@ -1458,8 +1465,8 @@ void tst_QUrl::compat_encode_data() QTest::newRow("NormalString") << QString("filename") << QByteArray("filename"); QTest::newRow("NormalStringEncoded") << QString("file name") << QByteArray("file%20name"); QTest::newRow("JustEncoded") << QString(" ") << QByteArray("%20"); - QTest::newRow("HTTPUrl") << QString("http://qt.nokia.com") << QByteArray("http%3A//qt.nokia.com"); - QTest::newRow("HTTPUrlEncoded") << QString("http://qt nokia com") << QByteArray("http%3A//qt%20nokia%20com"); + QTest::newRow("HTTPUrl") << QString("http://qt-project.org") << QByteArray("http%3A//qt-project.org"); + QTest::newRow("HTTPUrlEncoded") << QString("http://qt-project org") << QByteArray("http%3A//qt-project%20org"); QTest::newRow("EmptyString") << QString("") << QByteArray(""); QTest::newRow("NulByte") << QString::fromLatin1("C\0\n", 3) << QByteArray("C%00%0A"); QTest::newRow("Task27166") << QString::fromUtf8("Française") << QByteArray("Fran%C3%A7aise"); @@ -1555,9 +1562,9 @@ void tst_QUrl::toPercentEncoding() void tst_QUrl::swap() { - QUrl u1(QLatin1String("http://qt.nokia.com")), u2(QLatin1String("http://www.kdab.com")); + QUrl u1(QLatin1String("http://qt-project.org")), u2(QLatin1String("http://www.kdab.com")); u1.swap(u2); - QCOMPARE(u2.host(),QLatin1String("qt.nokia.com")); + QCOMPARE(u2.host(),QLatin1String("qt-project.org")); QCOMPARE(u1.host(),QLatin1String("www.kdab.com")); } @@ -1571,8 +1578,8 @@ void tst_QUrl::symmetry() QCOMPARE(url.encodedQuery().constData(), QString::fromLatin1("a=b&a=d%C3%B8&a=f").toLatin1().constData()); QCOMPARE(url.fragment(), QString::fromUtf8("vræl")); - QUrl onlyHost("//qt.nokia.com"); - QCOMPARE(onlyHost.toString(), QString::fromLatin1("//qt.nokia.com")); + QUrl onlyHost("//qt-project.org"); + QCOMPARE(onlyHost.toString(), QString::fromLatin1("//qt-project.org")); { QString urlString = QString::fromLatin1("http://desktop:33326/upnp/{32f525a6-6f31-426e-91ca-01c2e6c2c57e}"); @@ -1690,7 +1697,7 @@ void tst_QUrl::isRelative_data() QTest::addColumn<QString>("url"); QTest::addColumn<bool>("trueFalse"); - QTest::newRow("not") << QString::fromLatin1("http://qt.nokia.com") << false; + QTest::newRow("not") << QString::fromLatin1("http://qt-project.org") << false; QTest::newRow("55288") << QString::fromLatin1("node64.html#fig:form:ana") << true; // kde @@ -1874,26 +1881,26 @@ void tst_QUrl::invalidSchemeValidator() { // test that if scheme does not start with an ALPHA, QUrl::isValid() returns false { - QUrl url("1http://qt.nokia.com"); + QUrl url("1http://qt-project.org"); QVERIFY(url.scheme().isEmpty()); QVERIFY(url.path().startsWith("1http")); } { - QUrl url("http://qt.nokia.com"); - url.setScheme("111http://qt.nokia.com"); + QUrl url("http://qt-project.org"); + url.setScheme("111http://qt-project.org"); QCOMPARE(url.isValid(), false); QVERIFY(url.toString().isEmpty()); } // non-ALPHA character at other positions in the scheme are ok { - QUrl url("ht111tp://qt.nokia.com", QUrl::StrictMode); + QUrl url("ht111tp://qt-project.org", QUrl::StrictMode); QVERIFY(url.isValid()); QCOMPARE(url.scheme(), QString("ht111tp")); QVERIFY(!url.toString().isEmpty()); } { - QUrl url("http://qt.nokia.com"); - url.setScheme("ht123tp://qt.nokia.com"); + QUrl url("http://qt-project.org"); + url.setScheme("ht123tp://qt-project.org"); QVERIFY(!url.isValid()); QVERIFY(url.toString().isEmpty()); url.setScheme("http"); @@ -1901,7 +1908,7 @@ void tst_QUrl::invalidSchemeValidator() QVERIFY(!url.toString().isEmpty()); } { - QUrl url = QUrl::fromEncoded("ht321tp://qt.nokia.com", QUrl::StrictMode); + QUrl url = QUrl::fromEncoded("ht321tp://qt-project.org", QUrl::StrictMode); QVERIFY(url.isValid()); QVERIFY(!url.toString().isEmpty()); } @@ -2445,7 +2452,7 @@ void tst_QUrl::hosts_data() // normal hostnames QTest::newRow("normal") << QString("http://intern") << QString("intern"); - QTest::newRow("normal2") << QString("http://qt.nokia.com") << QString("qt.nokia.com"); + QTest::newRow("normal2") << QString("http://qt-project.org") << QString("qt-project.org"); // IDN hostnames QTest::newRow("idn") << QString(QLatin1String("http://\345r.no")) << QString(QLatin1String("\345r.no")); @@ -2665,6 +2672,7 @@ void tst_QUrl::fromUserInput_data() QTest::newRow("trash-0") << "example.org/test?someData=42%&someOtherData=abcde#anchor" << QUrl::fromEncoded("http://example.org/test?someData=42%25&someOtherData=abcde#anchor"); QTest::newRow("other-scheme-0") << "spotify:track:0hO542doVbfGDAGQULMORT" << QUrl("spotify:track:0hO542doVbfGDAGQULMORT"); QTest::newRow("other-scheme-1") << "weirdscheme:80:otherstuff" << QUrl("weirdscheme:80:otherstuff"); + QTest::newRow("number-path-0") << "tel:2147483648" << QUrl("tel:2147483648"); // FYI: The scheme in the resulting url user QUrl authUrl("user:pass@domain.com"); diff --git a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp index 75c1563fd4..5f2d3d9d46 100644 --- a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp +++ b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp @@ -795,12 +795,12 @@ void tst_QUrl::removeAllEncodedQueryItems_data() QTest::addColumn<QByteArray>("key"); QTest::addColumn<QUrl>("result"); - QTest::newRow("test1") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&ccc=c"); - QTest::newRow("test2") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("aaa") << QUrl::fromEncoded("http://qt.nokia.com/foo?bbb=b&ccc=c"); -// QTest::newRow("test3") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("ccc") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b"); - QTest::newRow("test4") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c"); - QTest::newRow("test5") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&ccc=c"); - QTest::newRow("test6") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&b%62b=b&ccc=c"); + QTest::newRow("test1") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&ccc=c"); + QTest::newRow("test2") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("aaa") << QUrl::fromEncoded("http://qt-project.org/foo?bbb=b&ccc=c"); +// QTest::newRow("test3") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("ccc") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b"); + QTest::newRow("test4") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c"); + QTest::newRow("test5") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&ccc=c"); + QTest::newRow("test6") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&b%62b=b&ccc=c"); } void tst_QUrl::removeAllEncodedQueryItems() diff --git a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp index ef4983fb72..02bdb9775a 100644 --- a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp +++ b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp @@ -67,7 +67,7 @@ public: void cleanupTestArea(QAbstractItemModel *model); enum Read { - ReadOnly, // wont perform remove(), insert(), and setData() + ReadOnly, // won't perform remove(), insert(), and setData() ReadWrite }; enum Contains { diff --git a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp index b5e75601a8..30434bfd56 100644 --- a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp @@ -478,7 +478,7 @@ void tst_QItemModel::parent() currentModel = testModels->createModel(modelType); QVERIFY(currentModel); - // Make sure the model wont crash and will return an invalid QModelIndex + // Make sure the model won't crash and will return an invalid QModelIndex // when asked for the parent of an invalid index. QCOMPARE(currentModel->parent(QModelIndex()), QModelIndex()); diff --git a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp index 310df58813..e1574c313a 100644 --- a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp +++ b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp @@ -312,7 +312,7 @@ void tst_QMimeData::setUrls() const QList<QUrl> longUrlList; // set up - shortUrlList += QUrl("http://qt.nokia.com"); + shortUrlList += QUrl("http://qt-project.org"); longUrlList = shortUrlList; longUrlList += QUrl("http://www.google.com"); @@ -322,12 +322,12 @@ void tst_QMimeData::setUrls() const // set a few, verify mimeData.setUrls(shortUrlList); QCOMPARE(mimeData.urls(), shortUrlList); - QCOMPARE(mimeData.text(), QString("http://qt.nokia.com")); + QCOMPARE(mimeData.text(), QString("http://qt-project.org")); // change them, verify mimeData.setUrls(longUrlList); QCOMPARE(mimeData.urls(), longUrlList); - QCOMPARE(mimeData.text(), QString("http://qt.nokia.com\nhttp://www.google.com\n")); + QCOMPARE(mimeData.text(), QString("http://qt-project.org\nhttp://www.google.com\n")); // clear, verify mimeData.clear(); diff --git a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp index 02f99b08d3..3583c1cab3 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp @@ -491,7 +491,7 @@ void tst_QSharedMemory::useTooMuchMemory() QVERIFY(sm->data() == 0); if (sm->error() != QSharedMemory::OutOfResources) qDebug() << sm->error() << sm->errorString(); - // ### Linux wont return OutOfResources if there are not enough semaphores to use. + // ### Linux won't return OutOfResources if there are not enough semaphores to use. QVERIFY(sm->error() == QSharedMemory::OutOfResources || sm->error() == QSharedMemory::LockError); QVERIFY(sm->errorString() != QString()); diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index d130159b4a..62b894178e 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -2029,7 +2029,7 @@ void tst_QVariant::saveLoadCustomTypes() void tst_QVariant::url() { - QString str("http://qt.nokia.com"); + QString str("http://qt-project.org"); QUrl url(str); QVariant v(url); //built with a QUrl diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index e97a388b52..933807c525 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -1458,8 +1458,8 @@ void tst_QByteArray::fromPercentEncoding_data() QTest::newRow("NormalString") << QByteArray("filename") << QByteArray("filename"); QTest::newRow("NormalStringEncoded") << QByteArray("file%20name") << QByteArray("file name"); QTest::newRow("JustEncoded") << QByteArray("%20") << QByteArray(" "); - QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QByteArray("http://qt.nokia.com"); - QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt%20nokia%20com") << QByteArray("http://qt nokia com"); + QTest::newRow("HTTPUrl") << QByteArray("http://qt-project.org") << QByteArray("http://qt-project.org"); + QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt-project%20org") << QByteArray("http://qt-project org"); QTest::newRow("EmptyString") << QByteArray("") << QByteArray(""); QTest::newRow("Task27166") << QByteArray("Fran%C3%A7aise") << QByteArray("Française"); } @@ -1480,8 +1480,8 @@ void tst_QByteArray::toPercentEncoding_data() QTest::newRow("NormalString") << QByteArray("filename") << QByteArray("filename"); QTest::newRow("NormalStringEncoded") << QByteArray("file name") << QByteArray("file%20name"); QTest::newRow("JustEncoded") << QByteArray(" ") << QByteArray("%20"); - QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QByteArray("http%3A//qt.nokia.com"); - QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt nokia com") << QByteArray("http%3A//qt%20nokia%20com"); + QTest::newRow("HTTPUrl") << QByteArray("http://qt-project.org") << QByteArray("http%3A//qt-project.org"); + QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt-project org") << QByteArray("http%3A//qt-project%20org"); QTest::newRow("EmptyString") << QByteArray("") << QByteArray(""); QTest::newRow("Task27166") << QByteArray("Française") << QByteArray("Fran%C3%A7aise"); } diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 419b21c9e1..4138795973 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1673,6 +1673,9 @@ void tst_QLocale::dateFormat() const QLocale ca("en_CA"); QCOMPARE(ca.dateFormat(QLocale::ShortFormat), QLatin1String("M/d/yy")); QCOMPARE(ca.dateFormat(QLocale::LongFormat), QLatin1String("dddd, MMMM d, yyyy")); + + const QLocale ja("ja_JP"); + QCOMPARE(ja.dateFormat(QLocale::ShortFormat), QLatin1String("yyyy/MM/dd")); } void tst_QLocale::timeFormat() @@ -1739,6 +1742,10 @@ void tst_QLocale::monthName() QLocale ir("ga_IE"); QCOMPARE(ir.monthName(1, QLocale::ShortFormat), QLatin1String("Ean")); QCOMPARE(ir.monthName(12, QLocale::ShortFormat), QLatin1String("Noll")); + + QLocale cz("cs_CZ"); + QCOMPARE(cz.monthName(1, QLocale::ShortFormat), QLatin1String("led")); + QCOMPARE(cz.monthName(12, QLocale::ShortFormat), QLatin1String("pro")); } void tst_QLocale::standaloneMonthName() diff --git a/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.ref b/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.ref index 9734d22276..132875f4bb 100644 --- a/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.ref +++ b/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.ref @@ -1,21 +1,21 @@ StartDocument( ) DTD( text="<!DOCTYPE footype [ - <!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com"> - <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com"> + <!ATTLIST foo xmlns CDATA #FIXED "http://qt-project.org"> + <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt-project.org"> ]>" dtdName="footype" ) StartElement( name="body" qualifiedName="body" ) Characters( whitespace text=" " ) -StartElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo" - NamespaceDeclaration( namespaceUri="http://qt.nokia.com" ) +StartElement( name="foo" namespaceUri="http://qt-project.org" qualifiedName="foo" + NamespaceDeclaration( namespaceUri="http://qt-project.org" ) ) -EndElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo" ) +EndElement( name="foo" namespaceUri="http://qt-project.org" qualifiedName="foo" ) Characters( whitespace text=" " ) -StartElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" prefix="pre" - NamespaceDeclaration( prefix="pre" namespaceUri="http://qt.nokia.com" ) +StartElement( name="bar" namespaceUri="http://qt-project.org" qualifiedName="pre:bar" prefix="pre" + NamespaceDeclaration( prefix="pre" namespaceUri="http://qt-project.org" ) ) -EndElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" ) +EndElement( name="bar" namespaceUri="http://qt-project.org" qualifiedName="pre:bar" ) Characters( whitespace text=" " ) EndElement( name="body" qualifiedName="body" ) diff --git a/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.xml b/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.xml index 6475dbcdca..9b78623a6c 100644 --- a/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.xml +++ b/tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.xml @@ -1,6 +1,6 @@ <!DOCTYPE footype [ - <!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com"> - <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com"> + <!ATTLIST foo xmlns CDATA #FIXED "http://qt-project.org"> + <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt-project.org"> ]> <body> <foo/> diff --git a/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp index 73f89115af..d2e090bf53 100644 --- a/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp @@ -224,7 +224,7 @@ static QString documentElement(const QByteArray &document) * Since this suite is fairly large, it runs the tests sequentially in order to not * have them all loaded into memory at once. In this way, the maximum memory usage stays * low, which means one can run valgrind on this test. However, the drawback is that - * QTestLib's usual error reporting and testing mechanisms are slightly bypassed. + * Qt Test's usual error reporting and testing mechanisms are slightly bypassed. * * Part of this code is a manual, ad-hoc implementation of xml:base. * @@ -611,11 +611,11 @@ void tst_QXmlStream::reportFailures_data() QTest::addColumn<QString>("description"); /* We loop over all our failures(if any!), and output them such - * that they appear in the QTestLib log. */ + * that they appear in the Qt Test log. */ for(int i = 0; i < len; ++i) QTest::newRow(m_handler.failures.at(i).first.toLatin1().constData()) << true << m_handler.failures.at(i).second; - /* We need to add at least one column of test data, otherwise QTestLib complains. */ + /* We need to add at least one column of test data, otherwise Qt Test complains. */ if(len == 0) QTest::newRow("Whole test suite passed") << false << QString(); @@ -1140,7 +1140,7 @@ void tst_QXmlStream::crashInUTF16Codec() const } /* - In addition to QTestLib's flags, one can specify "-c <filename>" and have that file output in its canonical form. + In addition to Qt Test's flags, one can specify "-c <filename>" and have that file output in its canonical form. */ int main(int argc, char *argv[]) { |