AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QDateTime::operator_insert_extract() Correct handling of 4.0's spec

Browse Source 
The spec deseralized isn't a Qt::TimeSpec; handle it correctly instead
of taking for granted that QDateTimePrivate::Spec's values happen to
match.

Change-Id: I67f3c960f3a3b90cdad3c1eca673f7ec8fd10b82
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2022-12-01 19:01:40 +01:00
parent 49af4d48d1
commit 0522443f4b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
View File

@ -2297,8 +2297,15 @@ void tst_QDateTime::operator_insert_extract()
dataStream >> deserialisedSpec;
deserialised = QDateTime(deserialisedDate, deserialisedTime, Qt::UTC);
QCOMPARE(deserialised.toLocalTime(), deserialised);
if (dataStreamVersion >= QDataStream::Qt_4_0)
deserialised = deserialised.toTimeSpec(static_cast<Qt::TimeSpec>(deserialisedSpec));
const auto isLocalTime = [](qint8 spec) -> bool {
// The spec is in fact a QDateTimePrivate::Spec, not Qt::TimeSpec;
// and no offset or zone is stored, so only UTC and LocalTime are
// really supported. Fortunately this test only uses those.
const auto decoded = static_cast<QDateTimePrivate::Spec>(spec);
return decoded != QDateTimePrivate::UTC && decoded != QDateTimePrivate::OffsetFromUTC;
};
if (dataStreamVersion >= QDataStream::Qt_4_0 && isLocalTime(deserialisedSpec))
deserialised = deserialised.toLocalTime();
// Ensure local time is still correct.
QCOMPARE(deserialised, expectedLocalTime);
// Sanity check UTC times.