diff options
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 7 |
2 files changed, 11 insertions, 4 deletions
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() |