summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-24 15:39:39 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-19 19:06:33 +0000
commit752c0d7de0fb92124e2251a19841e308c6874159 (patch)
treedb5562776e8de271508a4825ad71492b9de67bd9 /tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
parent933745f36b0b21e0107553f2d056af32e643b7d7 (diff)
tests/corelib: 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. Tests from corelib/tools were omitted in this change. Change-Id: I4c8786d33fcf429d11b2b624c7cd89c28cadb518 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp')
-rw-r--r--tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
index ff850683ac..821077de18 100644
--- a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
+++ b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
@@ -80,9 +80,9 @@ void tst_QtConcurrentResultStore::iterators()
{
{
ResultStore<int> store;
- QVERIFY(store.begin() == store.end());
- QVERIFY(store.resultAt(0) == store.end());
- QVERIFY(store.resultAt(1) == store.end());
+ QCOMPARE(store.begin(), store.end());
+ QCOMPARE(store.resultAt(0), store.end());
+ QCOMPARE(store.resultAt(1), store.end());
}
{
ResultStoreBase storebase;
@@ -90,7 +90,7 @@ void tst_QtConcurrentResultStore::iterators()
storebase.addResult(1, &int1); // ResultStoreBase does not take ownership, only ResultStore<> does.
ResultIteratorBase it = storebase.begin();
QCOMPARE(it.resultIndex(), 0);
- QVERIFY(it == storebase.begin());
+ QCOMPARE(it, storebase.begin());
QVERIFY(it != storebase.end());
++it;
@@ -100,7 +100,7 @@ void tst_QtConcurrentResultStore::iterators()
++it;
QVERIFY(it != storebase.begin());
- QVERIFY(it == storebase.end());
+ QCOMPARE(it, storebase.end());
}
}
@@ -160,7 +160,7 @@ void tst_QtConcurrentResultStore::addResults()
store.addResults(-1, &vec1, 2, 2);
ResultIteratorBase it = store.begin();
QCOMPARE(it.resultIndex(), 0);
- QVERIFY(it == store.begin());
+ QCOMPARE(it, store.begin());
QVERIFY(it != store.end());
++it;
@@ -175,7 +175,7 @@ void tst_QtConcurrentResultStore::addResults()
QCOMPARE(it.resultIndex(), 3);
++it;
- QVERIFY(it == store.end());
+ QCOMPARE(it, store.end());
}
void tst_QtConcurrentResultStore::resultIndex()