Skip to content

Commit

Permalink
tests changed to QDate ctor instead of fromString
Browse files Browse the repository at this point in the history
  • Loading branch information
@silverqx
silverqx committed Nov 19, 2022
1 parent 04679ec commit f115c99
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 48 deletions.
28 changes: 14 additions & 14 deletions tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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());

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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
{
Expand All @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -1670,7 +1670,7 @@ void tst_MySql_QDateTime::insert_QString_DateColumn_UtcOnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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
{
Expand All @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -1734,7 +1734,7 @@ void tst_MySql_QDateTime::insert_QString_DateColumn_0200OnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down
28 changes: 14 additions & 14 deletions tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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());

Expand Down Expand Up @@ -1536,7 +1536,7 @@ insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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
{
Expand All @@ -1627,7 +1627,7 @@ void tst_PostgreSQL_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer()
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -1656,7 +1656,7 @@ void tst_PostgreSQL_QDateTime::insert_QString_DateColumn_UtcOnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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
{
Expand All @@ -1690,7 +1690,7 @@ insert_QDate_UtcTimezone_DateColumn_0200OnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -1721,7 +1721,7 @@ void tst_PostgreSQL_QDateTime::insert_QString_DateColumn_0200OnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down
22 changes: 11 additions & 11 deletions tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -1052,7 +1052,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DateColumn() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QString);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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
{
Expand All @@ -1084,7 +1084,7 @@ tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OnReturnQDateTime() co
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -1111,7 +1111,7 @@ void tst_SQLite_QDateTime::insert_QString_DateColumn_OnReturnQDateTime() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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
{
Expand All @@ -1143,7 +1143,7 @@ tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OffReturnQDateTime() c
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QString);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -1173,7 +1173,7 @@ void tst_SQLite_QDateTime::insert_QString_DateColumn_OffReturnQDateTime() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QString);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down
6 changes: 3 additions & 3 deletions tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ void tst_CastAttributes::defaultCast_date() const

QCOMPARE(typeId, QMetaType::QDate);

QCOMPARE(attribute.value<QDate>(), QDate::fromString("2022-09-11", Qt::ISODate));
QCOMPARE(attribute.value<QDate>(), QDate(2022, 9, 11));
}

void tst_CastAttributes::defaultCast_timestamp_QSQLITE_OffReturnQDateTime() const
Expand Down Expand Up @@ -1103,7 +1103,7 @@ void tst_CastAttributes::defaultCast_date_QSQLITE_OffReturnQDateTime() const

QCOMPARE(typeId, QMetaType::QString);

QCOMPARE(attribute.value<QDate>(), QDate::fromString("2022-09-11", Qt::ISODate));
QCOMPARE(attribute.value<QDate>(), QDate(2022, 9, 11));

// Restore
enableReturnQDateTime(connection);
Expand Down Expand Up @@ -2529,7 +2529,7 @@ void tst_CastAttributes::cast_date_to_QDate() const

QCOMPARE(attribute.value<QDate>(),
// 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
Expand Down
12 changes: 6 additions & 6 deletions tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -894,7 +894,7 @@ void tst_Model_QDateTime::create_QString_DateAttribute_UtcOnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand All @@ -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");
Expand All @@ -944,7 +944,7 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_0200OnServer()
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down Expand Up @@ -993,7 +993,7 @@ void tst_Model_QDateTime::create_QString_DateAttribute_0200OnServer() const
QCOMPARE(Helpers::qVariantTypeId(dateDbVariant), QMetaType::QDate);

const auto dateActual = dateDbVariant.value<QDate>();
const auto dateExpected = QDate::fromString("2022-08-28", Qt::ISODate);
const auto dateExpected = QDate(2022, 8, 28);
QCOMPARE(dateActual, dateExpected);
}

Expand Down

0 comments on commit f115c99

Please sign in to comment.