From 791fa550ab6fbd5e284179c97347ebe5fe7fef80 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 18 Jun 2022 00:27:07 +0300 Subject: [PATCH] adjust QDateTime, QLocale and QVariant tests Signed-off-by: Ivailo Monev --- tests/auto/qdatetime/tst_qdatetime.cpp | 10 +++++----- tests/auto/qlocale/tst_qlocale.cpp | 8 ++++---- tests/auto/qvariant/tst_qvariant.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp index 9226ef163..dacf18109 100644 --- a/tests/auto/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/qdatetime/tst_qdatetime.cpp @@ -1341,16 +1341,16 @@ void tst_QDateTime::fromStringStringFormatLocale_data() QTest::newRow("C:narrow") << "25 Feb 2017 17:21:25" << "d MMM yyyy HH:mm:ss" << c << dt; QLocale fr(QLocale::French); - QTest::newRow("fr:long") << "Samedi 25 février 2017 17:21:25" << "dddd d MMMM yyyy HH:mm:ss" << fr << dt; + QTest::newRow("fr:long") << QString::fromUtf8("Samedi 25 février 2017 17:21:25") << "dddd d MMMM yyyy HH:mm:ss" << fr << dt; QTest::newRow("fr:short") << "25/02/2017 17:21" << "dd/MM/yyyy HH:mm" << fr << dt.addSecs(-25); // In Turkish, the word for Friday ("Cuma") is a prefix for the word for // Saturday ("Cumartesi") QLocale tr(QLocale::Turkish); - QTest::newRow("tr:long") << "25 Şubat 2017 Cumartesi 17:21:25" << "d MMMM yyyy dddd HH:mm:ss" << tr << dt; - QTest::newRow("tr:long2") << "24 Şubat 2017 Cuma 17:21:25" << "d MMMM yyyy dddd HH:mm:ss" << tr << dt.addDays(-1); - QTest::newRow("tr:mashed") << "25 Şubat2017 Cumartesi17:21:25" << "d MMMMyyyy ddddHH:mm:ss" << tr << dt; - QTest::newRow("tr:mashed2") << "24 Şubat2017 Cuma17:21:25" << "d MMMMyyyy ddddHH:mm:ss" << tr << dt.addDays(-1); + QTest::newRow("tr:long") << QString::fromUtf8("25 Şubat 2017 Cumartesi 17:21:25") << "d MMMM yyyy dddd HH:mm:ss" << tr << dt; + QTest::newRow("tr:long2") << QString::fromUtf8("24 Şubat 2017 Cuma 17:21:25") << "d MMMM yyyy dddd HH:mm:ss" << tr << dt.addDays(-1); + QTest::newRow("tr:mashed") << QString::fromUtf8("25 Şubat2017 Cumartesi17:21:25") << "d MMMMyyyy ddddHH:mm:ss" << tr << dt; + QTest::newRow("tr:mashed2") << QString::fromUtf8("24 Şubat2017 Cuma17:21:25") << "d MMMMyyyy ddddHH:mm:ss" << tr << dt.addDays(-1); QTest::newRow("tr:short") << "25.02.2017 17:21" << "d.MM.yyyy HH:mm" << tr << dt.addSecs(-25); } diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 43491f77d..94d139443 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -957,11 +957,11 @@ void tst_QLocale::formatDateTime_data() QTest::newRow("5nn_NO") << "nn_NO" << QDateTime(QDate(1974, 1, 1), QTime(15, 14, 13)) << "dd/MM/yyy z" << "01/01/74y 0"; QTest::newRow("6nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13)) - << "ddd/MMM/yy AP" << "må./des./74 PM"; + << "ddd/MMM/yy AP" << QString::fromUtf8("må./des./74 PM"); QTest::newRow("7nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13)) - << "dddd/MMMM/y apa" << "måndag/M12/y pmpm"; + << "dddd/MMMM/y apa" << QString::fromUtf8("måndag/M12/y pmpm"); QTest::newRow("8nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 2), QTime(15, 14, 13)) - << "ddddd/MMMMM/yy ss" << "måndag2/M1212/74 13"; + << "ddddd/MMMMM/yy ss" << QString::fromUtf8("måndag2/M1212/74 13"); QTest::newRow("9nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13)) << "'dddd'/MMMM/yy s" << "dddd/M12/74 13"; QTest::newRow("10nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 1), QTime(15, 4, 13)) @@ -1038,7 +1038,7 @@ void tst_QLocale::toDateTime_data() QTest::newRow("5nn_NO") << "nn_NO" << QDateTime(QDate(1974, 1, 1), QTime(0, 0, 0)) << "dd/MM/yyy z" << "01/01/74y 0"; QTest::newRow("8nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 2), QTime(0, 0, 13)) - << "ddddd/MMMMM/yy ss" << "måndag2/M1212/74 13"; + << "ddddd/MMMMM/yy ss" << QString::fromUtf8("måndag2/M1212/74 13"); QTest::newRow("9nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 1), QTime(0, 0, 13)) << "'dddd'/MMMM/yy s" << "dddd/M12/74 13"; QTest::newRow("10nn_NO") << "nn_NO" << QDateTime(QDate(1974, 12, 1), QTime(0, 4, 0)) diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index e95a5c6e5..c115dc65a 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -3162,15 +3162,15 @@ void tst_QVariant::moreCustomTypes() playWithVariant(12.12f, false, "12.12", 12.12f, true); playWithVariant('a', false, "a", 'a', true); playWithVariant((unsigned char)('a'), false, "a", 'a', true); - playWithVariant( quint8(12), false, "\xc", 12, true); - playWithVariant( qint8(13), false, "\xd", 13, true); + playWithVariant( quint8(12), false, QString::fromLatin1("\xc"), 12, true); + playWithVariant( qint8(13), false, QString::fromLatin1("\xd"), 13, true); playWithVariant(quint16(14), false, "14", 14, true); playWithVariant( qint16(15), false, "15", 15, true); playWithVariant(quint32(16), false, "16", 16, true); playWithVariant( qint32(17), false, "17", 17, true); playWithVariant(quint64(18), false, "18", 18, true); playWithVariant( qint64(19), false, "19", 19, true); - playWithVariant( qint8(-12), false, "\xf4", -12, true); + playWithVariant( qint8(-12), false, QString::fromLatin1("\xf4"), -12, true); playWithVariant( qint16(-13), false, "-13", -13, true); playWithVariant( qint32(-14), false, "-14", -14, true); playWithVariant( qint64(-15), false, "-15", -15, true);