diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-09-09 18:50:03 +0200 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2020-09-11 06:12:04 +0200 |
| commit | 1ab2d8f5ebd1127f151f5ba6538e259b94431826 (patch) | |
| tree | df1436558e8f24a27116e993f20a21579d9e0ec9 /tests/auto | |
| parent | 7ddb4dcad52888ca3e5d62fd1c94ebf547df2127 (diff) | |
[QtCore] Adapt QDateTime unit tests to use QByteArray
To not have to bother with encodings, a few QStrings are changed
to QByteArrays. This way, a few calls to QString::fromLatin1 and
to QString::toLocal8Bit can be removed
Change-Id: Ia0cf27fc2a86f9842ed0f3ebe47b050bb8a3f4e6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index c2c0fbd7d5..ccb74f9e2d 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -2002,15 +2002,15 @@ Q_DECLARE_METATYPE(QDataStream::Version) void tst_QDateTime::operator_insert_extract_data() { QTest::addColumn<QDateTime>("dateTime"); - QTest::addColumn<QString>("serialiseAs"); - QTest::addColumn<QString>("deserialiseAs"); + QTest::addColumn<QByteArray>("serialiseAs"); + QTest::addColumn<QByteArray>("deserialiseAs"); QTest::addColumn<QDataStream::Version>("dataStreamVersion"); const QDateTime positiveYear(QDateTime(QDate(2012, 8, 14), QTime(8, 0, 0), Qt::LocalTime)); const QDateTime negativeYear(QDateTime(QDate(-2012, 8, 14), QTime(8, 0, 0), Qt::LocalTime)); - const QString westernAustralia(QString::fromLatin1("AWST-8AWDT-9,M10.5.0,M3.5.0/03:00:00")); - const QString hawaii(QString::fromLatin1("HAW10")); + const QByteArray westernAustralia("AWST-8AWDT-9,M10.5.0,M3.5.0/03:00:00"); + const QByteArray hawaii("HAW10"); const QDataStream tmpDataStream; const int thisVersion = tmpDataStream.version(); @@ -2032,12 +2032,12 @@ void tst_QDateTime::operator_insert_extract_data() void tst_QDateTime::operator_insert_extract() { QFETCH(QDateTime, dateTime); - QFETCH(QString, serialiseAs); - QFETCH(QString, deserialiseAs); + QFETCH(QByteArray, serialiseAs); + QFETCH(QByteArray, deserialiseAs); QFETCH(QDataStream::Version, dataStreamVersion); // Start off in a certain timezone. - TimeZoneRollback useZone(serialiseAs.toLocal8Bit()); + TimeZoneRollback useZone(serialiseAs); QDateTime dateTimeAsUTC(dateTime.toUTC()); QByteArray byteArray; @@ -2062,7 +2062,7 @@ void tst_QDateTime::operator_insert_extract() // Ensure that a change in timezone between serialisation and deserialisation // still results in identical UTC-converted datetimes. - useZone.reset(deserialiseAs.toLocal8Bit()); + useZone.reset(deserialiseAs); QDateTime expectedLocalTime(dateTimeAsUTC.toLocalTime()); { // Deserialise whole QDateTime at once. |