diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-30 15:16:36 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-31 11:50:10 +0000 |
commit | 7b72cc205ccd3e568b59a32a5cd751bd62b42e94 (patch) | |
tree | b6ef774e09a1101c3e9a5cbf18323c369e98a6f6 /tests/auto/widgets/util/qcompleter | |
parent | 3859b304e846b4ee8e77350945b6c63bbb487e13 (diff) |
tests/auto/widgets: 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: Ie29640451dddeb58342038a8cd5fac152cce39e5
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/widgets/util/qcompleter')
-rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index dbfeda8104..e8ac9aa5d2 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -1043,9 +1043,9 @@ void tst_QCompleter::setters() QAbstractItemModel *oldModel = completer->model(); completer->setModel(dirModel); QVERIFY(completer->popup()->model() != oldModel); - QVERIFY(completer->popup()->model() == completer->completionModel()); + QCOMPARE(completer->popup()->model(), completer->completionModel()); completer->setPopup(new QListView); - QVERIFY(completer->popup()->model() == completer->completionModel()); + QCOMPARE(completer->popup()->model(), completer->completionModel()); completer->setModel(new QStringListModel(completer)); QVERIFY(dirModel == 0); // must have been deleted @@ -1062,7 +1062,7 @@ void tst_QCompleter::modelDeletion() QStringListModel *listModel = new QStringListModel(list); completer->setCompletionPrefix("i"); completer->setModel(listModel); - QVERIFY(completer->completionCount() == 3); + QCOMPARE(completer->completionCount(), 3); QScopedPointer<QListView> view(new QListView); view->setModel(completer->completionModel()); delete listModel; @@ -1070,8 +1070,8 @@ void tst_QCompleter::modelDeletion() view->show(); qApp->processEvents(); view.reset(); - QVERIFY(completer->completionCount() == 0); - QVERIFY(completer->currentRow() == -1); + QCOMPARE(completer->completionCount(), 0); + QCOMPARE(completer->currentRow(), -1); } void tst_QCompleter::multipleWidgets() @@ -1098,7 +1098,7 @@ void tst_QCompleter::multipleWidgets() window.activateWindow(); QApplication::setActiveWindow(&window); QTest::qWait(50); - QTRY_VERIFY(qApp->focusWidget() == comboBox); + QTRY_COMPARE(QApplication::focusWidget(), comboBox); comboBox->lineEdit()->setText("it"); QCOMPARE(comboBox->currentText(), QString("it")); // should not complete with setText QTest::keyPress(comboBox, 'e'); @@ -1111,7 +1111,7 @@ void tst_QCompleter::multipleWidgets() lineEdit->show(); lineEdit->setFocus(); QTest::qWait(50); - QTRY_VERIFY(qApp->focusWidget() == lineEdit); + QTRY_COMPARE(QApplication::focusWidget(), lineEdit); lineEdit->setText("it"); QCOMPARE(lineEdit->text(), QString("it")); // should not completer with setText QCOMPARE(comboBox->currentText(), QString("")); // combo box text must not change! @@ -1148,13 +1148,13 @@ void tst_QCompleter::focusIn() lineEdit2->show(); comboBox->setFocus(); - QTRY_VERIFY(completer.widget() == comboBox); + QTRY_COMPARE(completer.widget(), comboBox); lineEdit->setFocus(); - QTRY_VERIFY(completer.widget() == lineEdit); + QTRY_COMPARE(completer.widget(), lineEdit); comboBox->setFocus(); - QTRY_VERIFY(completer.widget() == comboBox); + QTRY_COMPARE(completer.widget(), comboBox); lineEdit2->setFocus(); - QTRY_VERIFY(completer.widget() == comboBox); + QTRY_COMPARE(completer.widget(), comboBox); } void tst_QCompleter::dynamicSortOrder() |