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/concurrent | |
| 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/concurrent')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 28 | ||||
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 24 |
2 files changed, 26 insertions, 26 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index b5e3dee9a6..cadd4e82cd 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -1443,45 +1443,45 @@ void tst_QtConcurrentFilter::noDetach() QVERIFY(l.isDetached()); QList<int> ll = l; - QVERIFY(l.isDetached() == false); + QVERIFY(!l.isDetached()); QtConcurrent::filtered(l, waitFilterfn).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); QtConcurrent::blockingFiltered(l, waitFilterfn); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); QtConcurrent::filteredReduced(l, waitFilterfn, intSumReduce).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); QtConcurrent::filter(l, waitFilterfn).waitForFinished(); if (!l.isDetached()) QEXPECT_FAIL("", "QTBUG-20688: Known unstable failure", Abort); - QVERIFY(l.isDetached() == true); - QVERIFY(ll.isDetached() == true); + QVERIFY(l.isDetached()); + QVERIFY(ll.isDetached()); } { const QList<int> l = QList<int>() << 1; QVERIFY(l.isDetached()); const QList<int> ll = l; - QVERIFY(l.isDetached() == false); + QVERIFY(!l.isDetached()); QtConcurrent::filtered(l, waitFilterfn).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); QtConcurrent::filteredReduced(l, waitFilterfn, intSumReduce).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); } } diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index 4e19124ca8..33941d8e90 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -2250,38 +2250,38 @@ void tst_QtConcurrentMap::noDetach() QVERIFY(l.isDetached()); QList<int> ll = l; - QVERIFY(l.isDetached() == false); + QVERIFY(!l.isDetached()); QtConcurrent::mapped(l, mapper).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); QtConcurrent::mappedReduced(l, mapper, intSumReduce).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); QtConcurrent::map(l, multiplyBy2Immutable).waitForFinished(); - QVERIFY(l.isDetached() == true); - QVERIFY(ll.isDetached() == true); + QVERIFY(l.isDetached()); + QVERIFY(ll.isDetached()); } { const QList<int> l = QList<int>() << 1; QVERIFY(l.isDetached()); const QList<int> ll = l; - QVERIFY(l.isDetached() == false); + QVERIFY(!l.isDetached()); QtConcurrent::mapped(l, mapper).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); QtConcurrent::mappedReduced(l, mapper, intSumReduce).waitForFinished(); - QVERIFY(l.isDetached() == false); - QVERIFY(ll.isDetached() == false); + QVERIFY(!l.isDetached()); + QVERIFY(!ll.isDetached()); } } |