From f115c992724fe31e98e9952cfb595d690f04a04b Mon Sep 17 00:00:00 2001 From: silverqx Date: Sat, 19 Nov 2022 11:07:16 +0100 Subject: [PATCH] tests changed to QDate ctor instead of fromString --- .../mysql_qdatetime/tst_mysql_qdatetime.cpp | 28 +++++++++---------- .../tst_postgresql_qdatetime.cpp | 28 +++++++++---------- .../sqlite_qdatetime/tst_sqlite_qdatetime.cpp | 22 +++++++-------- .../castattributes/tst_castattributes.cpp | 6 ++-- .../model_qdatetime/tst_model_qdatetime.cpp | 12 ++++---- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp b/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp index 7503b95a0..d5cb1c731 100644 --- a/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp +++ b/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp @@ -1396,7 +1396,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(QDate::fromString("2022-08-28", Qt::ISODate)); + qtQuery.addBindValue(QDate(2022, 8, 28)); QVERIFY(qtQuery.exec()); @@ -1434,7 +1434,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1490,7 +1490,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1512,7 +1512,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(QDate::fromString("2022-08-28", Qt::ISODate)); + qtQuery.addBindValue(QDate(2022, 8, 28)); QVERIFY(qtQuery.exec()); @@ -1550,7 +1550,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1608,7 +1608,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1623,8 +1623,8 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const void tst_MySql_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate::fromString("2022-08-28", Qt::ISODate)}}); + quint64 lastId = createQuery()->from("datetimes") + .insertGetId({{"date", QDate(2022, 8, 28)}}); // Verify { @@ -1641,7 +1641,7 @@ void tst_MySql_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() cons QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1670,7 +1670,7 @@ void tst_MySql_QDateTime::insert_QString_DateColumn_UtcOnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1685,8 +1685,8 @@ void tst_MySql_QDateTime::insert_QDate_UtcTimezone_DateColumn_0200OnServer() con set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate::fromString("2022-08-28", Qt::ISODate)}}); + quint64 lastId = createQuery()->from("datetimes") + .insertGetId({{"date", QDate(2022, 8, 28)}}); // Verify { @@ -1703,7 +1703,7 @@ void tst_MySql_QDateTime::insert_QDate_UtcTimezone_DateColumn_0200OnServer() con QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1734,7 +1734,7 @@ void tst_MySql_QDateTime::insert_QString_DateColumn_0200OnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } diff --git a/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp b/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp index 3c6076ba2..48a5c05eb 100644 --- a/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp +++ b/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp @@ -1381,7 +1381,7 @@ tst_PostgreSQL_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QDate::fromString("2022-08-28", Qt::ISODate)); + qtQuery.addBindValue(QDate(2022, 8, 28)); QVERIFY(qtQuery.exec()); @@ -1419,7 +1419,7 @@ tst_PostgreSQL_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1475,7 +1475,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1498,7 +1498,7 @@ insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() const QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QDate::fromString("2022-08-28", Qt::ISODate)); + qtQuery.addBindValue(QDate(2022, 8, 28)); QVERIFY(qtQuery.exec()); @@ -1536,7 +1536,7 @@ insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1594,7 +1594,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1609,8 +1609,8 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const void tst_PostgreSQL_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate::fromString("2022-08-28", Qt::ISODate)}}); + quint64 lastId = createQuery()->from("datetimes") + .insertGetId({{"date", QDate(2022, 8, 28)}}); // Verify { @@ -1627,7 +1627,7 @@ void tst_PostgreSQL_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1656,7 +1656,7 @@ void tst_PostgreSQL_QDateTime::insert_QString_DateColumn_UtcOnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1672,8 +1672,8 @@ insert_QDate_UtcTimezone_DateColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate::fromString("2022-08-28", Qt::ISODate)}}); + quint64 lastId = createQuery()->from("datetimes") + .insertGetId({{"date", QDate(2022, 8, 28)}}); // Verify { @@ -1690,7 +1690,7 @@ insert_QDate_UtcTimezone_DateColumn_0200OnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1721,7 +1721,7 @@ void tst_PostgreSQL_QDateTime::insert_QString_DateColumn_0200OnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } diff --git a/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp b/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp index ba063b282..bed9de3f4 100644 --- a/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp +++ b/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp @@ -960,7 +960,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn() const QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QDate::fromString("2022-08-28", Qt::ISODate)); + qtQuery.addBindValue(QDate(2022, 8, 28)); QVERIFY(qtQuery.exec()); @@ -997,7 +997,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QString); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1052,7 +1052,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DateColumn() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QString); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1068,8 +1068,8 @@ void tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate::fromString("2022-08-28", Qt::ISODate)}}); + quint64 lastId = createQuery()->from("datetimes") + .insertGetId({{"date", QDate(2022, 8, 28)}}); // Verify { @@ -1084,7 +1084,7 @@ tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OnReturnQDateTime() co QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1111,7 +1111,7 @@ void tst_SQLite_QDateTime::insert_QString_DateColumn_OnReturnQDateTime() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1127,8 +1127,8 @@ tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OffReturnQDateTime() c disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate::fromString("2022-08-28", Qt::ISODate)}}); + quint64 lastId = createQuery()->from("datetimes") + .insertGetId({{"date", QDate(2022, 8, 28)}}); // Verify { @@ -1143,7 +1143,7 @@ tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OffReturnQDateTime() c QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QString); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -1173,7 +1173,7 @@ void tst_SQLite_QDateTime::insert_QString_DateColumn_OffReturnQDateTime() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QString); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } diff --git a/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp b/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp index 36a89cafd..70141f67a 100644 --- a/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp +++ b/tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp @@ -1020,7 +1020,7 @@ void tst_CastAttributes::defaultCast_date() const QCOMPARE(typeId, QMetaType::QDate); - QCOMPARE(attribute.value(), QDate::fromString("2022-09-11", Qt::ISODate)); + QCOMPARE(attribute.value(), QDate(2022, 9, 11)); } void tst_CastAttributes::defaultCast_timestamp_QSQLITE_OffReturnQDateTime() const @@ -1103,7 +1103,7 @@ void tst_CastAttributes::defaultCast_date_QSQLITE_OffReturnQDateTime() const QCOMPARE(typeId, QMetaType::QString); - QCOMPARE(attribute.value(), QDate::fromString("2022-09-11", Qt::ISODate)); + QCOMPARE(attribute.value(), QDate(2022, 9, 11)); // Restore enableReturnQDateTime(connection); @@ -2529,7 +2529,7 @@ void tst_CastAttributes::cast_date_to_QDate() const QCOMPARE(attribute.value(), // QDate doesn't have a time zone - QDate::fromString("2022-09-11", Qt::ISODate)); + QDate(2022, 9, 11)); } void tst_CastAttributes::cast_date_to_QString() const diff --git a/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp b/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp index 9f7aca01f..c69514376 100644 --- a/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp +++ b/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp @@ -820,7 +820,7 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_UtcOnServer() c // Insert { Datetime datetime; - datetime["date"] = QDate::fromString("2022-08-28", Qt::ISODate); + datetime["date"] = QDate(2022, 8, 28); // Check whether a stored value and type are correct const auto attribute = datetime.getAttributeFromArray("date"); @@ -847,7 +847,7 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_UtcOnServer() c QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -894,7 +894,7 @@ void tst_Model_QDateTime::create_QString_DateAttribute_UtcOnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -917,7 +917,7 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_0200OnServer() // Insert { Datetime datetime; - datetime["date"] = QDate::fromString("2022-08-28", Qt::ISODate); + datetime["date"] = QDate(2022, 8, 28); // Check whether a stored value and type are correct const auto attribute = datetime.getAttributeFromArray("date"); @@ -944,7 +944,7 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_0200OnServer() QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); } @@ -993,7 +993,7 @@ void tst_Model_QDateTime::create_QString_DateAttribute_0200OnServer() const QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate); const auto dateActual = dateDbVariant.value(); - const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate); + const auto dateExpected = QDate(2022, 8, 28); QCOMPARE(dateActual, dateExpected); }