diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-24 15:48:21 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-29 11:35:53 +0000 |
commit | 0167ace5f0a7e5ad80ce95efc99c86235bcf8c0d (patch) | |
tree | 8e627da0f4ac2ac09169eedc7c9b390800e7e4ee /tests/auto/sql/models/qsqltablemodel | |
parent | e948f97814175d2e28ac4dba37f8e49b8775b2cf (diff) |
tests/auto/sql: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).
- Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer).
- Replace Q[TRY]_VERIFY(smartPointer == 0) by
Q[TRY]_VERIFY(smartPointer.isNull()).
- Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and
add casts where necessary. The values will then be logged
should a test fail.
Change-Id: I4e4a319c5918d697a33f6d6032c36b8c9660ca05
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Diffstat (limited to 'tests/auto/sql/models/qsqltablemodel')
-rw-r--r-- | tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index 9c351f4657..2ace79973b 100644 --- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -533,7 +533,7 @@ void tst_QSqlTableModel::setData() idx = model.index(0, 0); QVERIFY_SQL(model, setData(idx, QVariant(QVariant::Int))); val = model.data(idx); - QVERIFY(val == QVariant(QVariant::Int)); + QCOMPARE(val, QVariant(QVariant::Int)); QVERIFY(val.isNull()); QVERIFY_SQL(model, isDirty(idx)); QVERIFY_SQL(model, submitAll()); @@ -560,13 +560,13 @@ void tst_QSqlTableModel::setData() // initial state idx = model.index(0, 0); QSqlRecord rec = model.record(0); - QVERIFY(rec.value(0) == QVariant(QVariant::Int)); + QCOMPARE(rec.value(0), QVariant(QVariant::Int)); QVERIFY(rec.isNull(0)); QVERIFY(!rec.isGenerated(0)); // unchanged value, but causes column to be included in INSERT QVERIFY_SQL(model, setData(idx, QVariant(QVariant::Int))); rec = model.record(0); - QVERIFY(rec.value(0) == QVariant(QVariant::Int)); + QCOMPARE(rec.value(0), QVariant(QVariant::Int)); QVERIFY(rec.isNull(0)); QVERIFY(rec.isGenerated(0)); QVERIFY_SQL(model, submitAll()); @@ -1136,8 +1136,8 @@ void tst_QSqlTableModel::removeRows() QVERIFY_SQL(model, removeRows(0, 1)); QVERIFY_SQL(model, removeRows(1, 1)); QCOMPARE(beforeDeleteSpy.count(), 2); - QVERIFY(beforeDeleteSpy.at(0).at(0).toInt() == 0); - QVERIFY(beforeDeleteSpy.at(1).at(0).toInt() == 1); + QCOMPARE(beforeDeleteSpy.at(0).at(0).toInt(), 0); + QCOMPARE(beforeDeleteSpy.at(1).at(0).toInt(), 1); // deleted rows shown as empty until select QCOMPARE(model.rowCount(), 3); QCOMPARE(model.data(model.index(0, 1)).toString(), QString("")); @@ -1172,11 +1172,11 @@ void tst_QSqlTableModel::removeRows() QCOMPARE(headerDataChangedSpy.at(1).at(1).toInt(), 0); QCOMPARE(headerDataChangedSpy.at(1).at(2).toInt(), 0); QCOMPARE(model.rowCount(), 3); - QVERIFY(beforeDeleteSpy.count() == 0); + QCOMPARE(beforeDeleteSpy.count(), 0); QVERIFY(model.submitAll()); - QVERIFY(beforeDeleteSpy.count() == 2); - QVERIFY(beforeDeleteSpy.at(0).at(0).toInt() == 0); - QVERIFY(beforeDeleteSpy.at(1).at(0).toInt() == 1); + QCOMPARE(beforeDeleteSpy.count(), 2); + QCOMPARE(beforeDeleteSpy.at(0).at(0).toInt(), 0); + QCOMPARE(beforeDeleteSpy.at(1).at(0).toInt(), 1); QCOMPARE(model.rowCount(), 1); QCOMPARE(model.data(model.index(0, 1)).toString(), QString("vohi")); } |