diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-23 13:26:28 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-27 12:09:19 +0000 |
| commit | c067c012dc3a54173c99e2a23ea2d04578bfab26 (patch) | |
| tree | 5d92c9f46eb15206a79d37bf333719dd7b8cb133 /tests/auto/other | |
| parent | 4c3c6bab302b610ce0457f96fd0a04842d25b692 (diff) | |
Tests: Replace Q[TRY]_VERIFY(v == true|false) by QVERIFY(v)|QVERIFY(!v).
Preparing the replacement of Q[TRY]_VERIFY(a == b) by
Q[TRY]_COMPARE(a, b) for non-boolean types.
Change-Id: Iab6ec2f0a89a3adc79e18304573994965013dab5
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/compiler/tst_compiler.cpp | 12 | ||||
| -rw-r--r-- | tests/auto/other/macgui/tst_macgui.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp index 8f7dcdb3c5..705149bd6b 100644 --- a/tests/auto/other/compiler/tst_compiler.cpp +++ b/tests/auto/other/compiler/tst_compiler.cpp @@ -336,17 +336,17 @@ struct Qxxx {}; void tst_Compiler::detectDataStream() { - QVERIFY(QtTestInternal::DataStreamChecker<int>::HasDataStream == true); - QVERIFY(QtTestInternal::DataStreamChecker<uint>::HasDataStream == true); + QVERIFY(QtTestInternal::DataStreamChecker<int>::HasDataStream); + QVERIFY(QtTestInternal::DataStreamChecker<uint>::HasDataStream); QVERIFY(QtTestInternal::DataStreamChecker<char *>::HasDataStream == true); QVERIFY(QtTestInternal::DataStreamChecker<const int>::HasInDataStream == true); QVERIFY(QtTestInternal::DataStreamChecker<const int>::HasOutDataStream == false); QVERIFY(QtTestInternal::DataStreamChecker<const int>::HasDataStream == false); - QVERIFY(QtTestInternal::DataStreamChecker<double>::HasDataStream == true); + QVERIFY(QtTestInternal::DataStreamChecker<double>::HasDataStream); - QVERIFY(QtTestInternal::DataStreamChecker<QString>::HasDataStream == true); - QVERIFY(QtTestInternal::DataStreamChecker<MyString>::HasDataStream == true); - QVERIFY(QtTestInternal::DataStreamChecker<Qxxx>::HasDataStream == false); + QVERIFY(QtTestInternal::DataStreamChecker<QString>::HasDataStream); + QVERIFY(QtTestInternal::DataStreamChecker<MyString>::HasDataStream); + QVERIFY(!QtTestInternal::DataStreamChecker<Qxxx>::HasDataStream); QVERIFY(QtTestInternal::getSaveOperator<int>() != 0); QVERIFY(QtTestInternal::getSaveOperator<uint>() != 0); diff --git a/tests/auto/other/macgui/tst_macgui.cpp b/tests/auto/other/macgui/tst_macgui.cpp index 56035f4be4..1dee259f1d 100644 --- a/tests/auto/other/macgui/tst_macgui.cpp +++ b/tests/auto/other/macgui/tst_macgui.cpp @@ -146,7 +146,7 @@ void tst_MacGui::splashScreenModality() connect(wn.getWidget(interface), SIGNAL(clicked()), SLOT(exitLoopSlot())); const int timeout = 4; QTestEventLoop::instance().enterLoop(timeout); - QVERIFY(QTestEventLoop::instance().timeout() == false); + QVERIFY(!QTestEventLoop::instance().timeout()); } class PrimaryWindowDialog : public QDialog diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 0fc44febd3..4a8709f709 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -1303,7 +1303,7 @@ void tst_QAccessibility::tabTest() QCOMPARE(child1->text(QAccessible::Description), QLatin1String("Cool tool tip")); QCOMPARE(child1->text(QAccessible::Help), QLatin1String("I don't know")); - QVERIFY((child1->state().invisible) == false); + QVERIFY(!(child1->state().invisible)); tabBar->hide(); QCoreApplication::processEvents(); |