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/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp | |
parent | e948f97814175d2e28ac4dba37f8e49b8775b2cf (diff) | |
download | qtbase-0167ace5f0a7e5ad80ce95efc99c86235bcf8c0d.tar.gz |
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/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp')
-rw-r--r-- | tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 598d63f342..3702631275 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -858,7 +858,7 @@ static void testRevert(QSqlRelationalTableModel &model) /* Now revert the newly inserted rows */ model.revertAll(); - QVERIFY(model.rowCount() == initialRowCount); + QCOMPARE(model.rowCount(), initialRowCount); /* Insert rows again */ QVERIFY(model.insertRows(4, 4)); @@ -1051,20 +1051,20 @@ void tst_QSqlRelationalTableModel::relationModel() model.setRelation(2, QSqlRelation(reltest2, "tid", "title")); QVERIFY_SQL(model, select()); - QVERIFY(model.relationModel(0) == NULL); - QVERIFY(model.relationModel(1) == NULL); + QVERIFY(!model.relationModel(0)); + QVERIFY(!model.relationModel(1)); QVERIFY(model.relationModel(2) != NULL); - QVERIFY(model.relationModel(3) == NULL); - QVERIFY(model.relationModel(4) == NULL); + QVERIFY(!model.relationModel(3)); + QVERIFY(!model.relationModel(4)); model.setRelation(3, QSqlRelation(reltest4, "id", "name")); QVERIFY_SQL(model, select()); - QVERIFY(model.relationModel(0) == NULL); - QVERIFY(model.relationModel(1) == NULL); + QVERIFY(!model.relationModel(0)); + QVERIFY(!model.relationModel(1)); QVERIFY(model.relationModel(2) != NULL); QVERIFY(model.relationModel(3) != NULL); - QVERIFY(model.relationModel(4) == NULL); + QVERIFY(!model.relationModel(4)); QSqlTableModel *rel_model = model.relationModel(2); QCOMPARE(rel_model->data(rel_model->index(0,1)).toString(), QString("herr")); @@ -1073,11 +1073,11 @@ void tst_QSqlRelationalTableModel::relationModel() model.setJoinMode(QSqlRelationalTableModel::LeftJoin); QVERIFY_SQL(model, select()); - QVERIFY(model.relationModel(0) == NULL); - QVERIFY(model.relationModel(1) == NULL); + QVERIFY(!model.relationModel(0)); + QVERIFY(!model.relationModel(1)); QVERIFY(model.relationModel(2) != NULL); QVERIFY(model.relationModel(3) != NULL); - QVERIFY(model.relationModel(4) == NULL); + QVERIFY(!model.relationModel(4)); QSqlTableModel *rel_model2 = model.relationModel(2); QCOMPARE(rel_model2->data(rel_model->index(0,1)).toString(), QString("herr")); @@ -1487,13 +1487,13 @@ void tst_QSqlRelationalTableModel::selectAfterUpdate() model.setTable(reltest1); model.setRelation(2, QSqlRelation(reltest2, "tid", "title")); QVERIFY_SQL(model, select()); - QVERIFY(model.relationModel(2)->rowCount() == 2); + QCOMPARE(model.relationModel(2)->rowCount(), 2); { QSqlQuery q(db); QVERIFY_SQL(q, exec("insert into " + reltest2 + " values(3, 'mrs')")); model.relationModel(2)->select(); } - QVERIFY(model.relationModel(2)->rowCount() == 3); + QCOMPARE(model.relationModel(2)->rowCount(), 3); QVERIFY(model.setData(model.index(0,2), 3)); QVERIFY(model.submitAll()); QCOMPARE(model.data(model.index(0,2)), QVariant("mrs")); |