aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/geometry
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-24 15:32:22 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-27 18:45:21 +0000
commite6846850a51cbe2a8cc8b9398430d1dd4f6ac7b3 (patch)
treeee08e04b3f0eca16f7f12f2c2392eee9dbae41d8 /tests/auto/quick/geometry
parent0959281be22c2d3317f010ac117010fdf990df7a (diff)
tests/quick: 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: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/geometry')
-rw-r--r--tests/auto/quick/geometry/tst_geometry.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/geometry/tst_geometry.cpp b/tests/auto/quick/geometry/tst_geometry.cpp
index 1cc9b112cc..bdd6f1a394 100644
--- a/tests/auto/quick/geometry/tst_geometry.cpp
+++ b/tests/auto/quick/geometry/tst_geometry.cpp
@@ -58,7 +58,7 @@ void GeometryTest::testPoint2D()
QCOMPARE(geometry.sizeOfVertex(), (int) sizeof(float) * 2);
QCOMPARE(geometry.vertexCount(), 4);
QCOMPARE(geometry.indexCount(), 0);
- QVERIFY(geometry.indexData() == 0);
+ QVERIFY(!geometry.indexData());
QSGGeometry::updateRectGeometry(&geometry, QRectF(1, 2, 3, 4));
@@ -91,7 +91,7 @@ void GeometryTest::testTexturedPoint2D()
QCOMPARE(geometry.sizeOfVertex(), (int) sizeof(float) * 4);
QCOMPARE(geometry.vertexCount(), 4);
QCOMPARE(geometry.indexCount(), 0);
- QVERIFY(geometry.indexData() == 0);
+ QVERIFY(!geometry.indexData());
QSGGeometry::updateTexturedRectGeometry(&geometry, QRectF(1, 2, 3, 4), QRectF(5, 6, 7, 8));
@@ -163,7 +163,7 @@ void GeometryTest::testCustomGeometry()
for (int i=0; i<4000; ++i)
QCOMPARE(ii[i], (quint16) i);
for (int i=0; i<1000; ++i)
- QVERIFY(v[i].v1 == 6);
+ QCOMPARE(v[i].v1, float(6));
}