diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-24 15:39:39 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-19 19:06:33 +0000 |
| commit | 752c0d7de0fb92124e2251a19841e308c6874159 (patch) | |
| tree | db5562776e8de271508a4825ad71492b9de67bd9 /tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | |
| parent | 933745f36b0b21e0107553f2d056af32e643b7d7 (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/qfuture/tst_qfuture.cpp')
| -rw-r--r-- | tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index 56d559394b..e9db99f3cd 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -84,9 +84,9 @@ void tst_QFuture::resultStore() { QtPrivate::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()); } @@ -118,7 +118,7 @@ void tst_QFuture::resultStore() store.addResults(-1, &vec1, 2, 2); QtPrivate::ResultIteratorBase it = store.begin(); QCOMPARE(it.resultIndex(), 0); - QVERIFY(it == store.begin()); + QCOMPARE(it, store.begin()); QVERIFY(it != store.end()); ++it; @@ -133,7 +133,7 @@ void tst_QFuture::resultStore() QCOMPARE(it.resultIndex(), 3); ++it; - QVERIFY(it == store.end()); + QCOMPARE(it, store.end()); } { QtPrivate::ResultStoreBase store; @@ -1012,14 +1012,14 @@ void tst_QFuture::iterators() QFuture<int>::const_iterator i1 = f.begin(), i2 = i1 + 1; QFuture<int>::const_iterator c1 = i1, c2 = c1 + 1; - QVERIFY(i1 == i1); - QVERIFY(i1 == c1); - QVERIFY(c1 == i1); - QVERIFY(c1 == c1); - QVERIFY(i2 == i2); - QVERIFY(i2 == c2); - QVERIFY(c2 == i2); - QVERIFY(c2 == c2); + QCOMPARE(i1, i1); + QCOMPARE(i1, c1); + QCOMPARE(c1, i1); + QCOMPARE(c1, c1); + QCOMPARE(i2, i2); + QCOMPARE(i2, c2); + QCOMPARE(c2, i2); + QCOMPARE(c2, c2); QVERIFY(i1 != i2); QVERIFY(i1 != c2); @@ -1061,14 +1061,14 @@ void tst_QFuture::iterators() QFuture<QString>::const_iterator i1 = f.begin(), i2 = i1 + 1; QFuture<QString>::const_iterator c1 = i1, c2 = c1 + 1; - QVERIFY(i1 == i1); - QVERIFY(i1 == c1); - QVERIFY(c1 == i1); - QVERIFY(c1 == c1); - QVERIFY(i2 == i2); - QVERIFY(i2 == c2); - QVERIFY(c2 == i2); - QVERIFY(c2 == c2); + QCOMPARE(i1, i1); + QCOMPARE(i1, c1); + QCOMPARE(c1, i1); + QCOMPARE(c1, c1); + QCOMPARE(i2, i2); + QCOMPARE(i2, c2); + QCOMPARE(c2, i2); + QCOMPARE(c2, c2); QVERIFY(i1 != i2); QVERIFY(i1 != c2); |