tests/auto/gui: 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: I624deb320c378c18a29b3707f48583d53bfd5186
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

7 files changed, 50 insertions, 50 deletions

diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
index 4f58178f2c..30982f1e24 100644
--- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
+++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
@@ -461,8 +461,8 @@ void tst_QBrush::textureBrushComparison()
     imageBrush1.setTextureImage(image1);
     imageBrush2.setTextureImage(image2);
 
-    QVERIFY(imageBrush1 == imageBrush2);
-    QVERIFY(pixmapBrush == imageBrush1);
+    QCOMPARE(imageBrush1, imageBrush2);
+    QCOMPARE(pixmapBrush, imageBrush1);
 }
 
 QTEST_MAIN(tst_QBrush)
diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index cf0d82f3f7..b9d17bae62 100644
--- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -253,7 +253,7 @@ void tst_QColor::isValid()
 {
     QFETCH(QColor, color);
     QFETCH(bool, isValid);
-    QVERIFY(color.isValid() == isValid);
+    QCOMPARE(color.isValid(), isValid);
 }
 
 Q_DECLARE_METATYPE(QColor::NameFormat);
@@ -1325,19 +1325,19 @@ void tst_QColor::convertTo()
     QColor color(Qt::black);
 
     QColor rgb = color.convertTo(QColor::Rgb);
-    QVERIFY(rgb.spec() == QColor::Rgb);
+    QCOMPARE(rgb.spec(), QColor::Rgb);
 
     QColor hsv = color.convertTo(QColor::Hsv);
-    QVERIFY(hsv.spec() == QColor::Hsv);
+    QCOMPARE(hsv.spec(), QColor::Hsv);
 
     QColor cmyk = color.convertTo(QColor::Cmyk);
-    QVERIFY(cmyk.spec() == QColor::Cmyk);
+    QCOMPARE(cmyk.spec(), QColor::Cmyk);
 
     QColor hsl = color.convertTo(QColor::Hsl);
-    QVERIFY(hsl.spec() == QColor::Hsl);
+    QCOMPARE(hsl.spec(), QColor::Hsl);
 
     QColor invalid = color.convertTo(QColor::Invalid);
-    QVERIFY(invalid.spec() == QColor::Invalid);
+    QCOMPARE(invalid.spec(), QColor::Invalid);
 }
 
 void tst_QColor::light()
diff --git a/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp b/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp
index 964487f566..0f2f51d9b6 100644
--- a/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp
+++ b/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp
@@ -76,7 +76,7 @@ void tst_QPageLayout::basics()
     QCOMPARE(simple.paintRectPixels(72), QRect(0, 0, 595, 842));
 
     const QPageLayout a4portrait = simple;
-    QVERIFY(a4portrait == simple);
+    QCOMPARE(a4portrait, simple);
 
     // Change orientation
     simple.setOrientation(QPageLayout::Landscape);
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 55b869d424..3e98e630c2 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -799,7 +799,7 @@ void tst_QPainter::drawPixmapFragments()
     QImage origImage = origPixmap.toImage().convertToFormat(QImage::Format_ARGB32);
     QImage resImage = resPixmap.toImage().convertToFormat(QImage::Format_ARGB32);
 
-    QVERIFY(resImage.size() == resPixmap.size());
+    QCOMPARE(resImage.size(), resPixmap.size());
     QVERIFY(resImage.pixel(5, 5) == origImage.pixel(15, 15));
     QVERIFY(resImage.pixel(5, 15) == origImage.pixel(15, 5));
     QVERIFY(resImage.pixel(15, 5) == origImage.pixel(5, 15));
@@ -807,16 +807,16 @@ void tst_QPainter::drawPixmapFragments()
 
 
     QPainter::PixmapFragment fragment = QPainter::PixmapFragment::create(QPointF(20, 20), QRectF(30, 30, 2, 2));
-    QVERIFY(fragment.x == 20);
-    QVERIFY(fragment.y == 20);
-    QVERIFY(fragment.sourceLeft == 30);
-    QVERIFY(fragment.sourceTop == 30);
-    QVERIFY(fragment.width == 2);
-    QVERIFY(fragment.height == 2);
-    QVERIFY(fragment.scaleX == 1);
-    QVERIFY(fragment.scaleY == 1);
-    QVERIFY(fragment.rotation == 0);
-    QVERIFY(fragment.opacity == 1);
+    QCOMPARE(fragment.x, qreal(20));
+    QCOMPARE(fragment.y, qreal(20));
+    QCOMPARE(fragment.sourceLeft, qreal(30));
+    QCOMPARE(fragment.sourceTop, qreal(30));
+    QCOMPARE(fragment.width, qreal(2));
+    QCOMPARE(fragment.height, qreal(2));
+    QCOMPARE(fragment.scaleX, qreal(1));
+    QCOMPARE(fragment.scaleY, qreal(1));
+    QCOMPARE(fragment.rotation, qreal(0));
+    QCOMPARE(fragment.opacity, qreal(1));
 }
 
 void tst_QPainter::drawPixmapNegativeScale()
@@ -1481,7 +1481,7 @@ void tst_QPainter::drawPath3()
     p.drawPath(path);
     p.end();
 
-    QVERIFY(imgA == imgB);
+    QCOMPARE(imgA, imgB);
 
     imgA.invertPixels();
     imgB.fill(0xffffff);
@@ -1495,7 +1495,7 @@ void tst_QPainter::drawPath3()
     p.drawPath(path);
     p.end();
 
-    QVERIFY(imgA == imgB);
+    QCOMPARE(imgA, imgB);
 
     path.setFillRule(Qt::WindingFill);
     imgB.fill(0xffffff);
diff --git a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
index 0a073f5c84..ae30719ee7 100644
--- a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
@@ -602,16 +602,16 @@ void tst_QPainterPath::testOperatorEquals()
 {
     QPainterPath empty1;
     QPainterPath empty2;
-    QVERIFY(empty1 == empty2);
+    QCOMPARE(empty1, empty2);
 
     QPainterPath rect1;
     rect1.addRect(100, 100, 100, 100);
-    QVERIFY(rect1 == rect1);
+    QCOMPARE(rect1, rect1);
     QVERIFY(rect1 != empty1);
 
     QPainterPath rect2;
     rect2.addRect(100, 100, 100, 100);
-    QVERIFY(rect1 == rect2);
+    QCOMPARE(rect1, rect2);
 
     rect2.setFillRule(Qt::WindingFill);
     QVERIFY(rect1 != rect2);
@@ -622,7 +622,7 @@ void tst_QPainterPath::testOperatorEquals()
 
     QPainterPath ellipse2;
     ellipse2.addEllipse(50, 50, 100, 100);
-    QVERIFY(ellipse1 == ellipse2);
+    QCOMPARE(ellipse1, ellipse2);
 }
 
 void tst_QPainterPath::testOperatorEquals_fuzzy()
@@ -638,12 +638,12 @@ void tst_QPainterPath::testOperatorEquals_fuzzy()
         QPainterPath pb;
         pb.addRect(b);
 
-        QVERIFY(pa == pb);
+        QCOMPARE(pa, pb);
 
         QTransform transform;
         transform.translate(-100, -100);
 
-        QVERIFY(transform.map(pa) == transform.map(pb));
+        QCOMPARE(transform.map(pa), transform.map(pb));
     }
 
     // higher tolerance for error when path's bounding rect is big
@@ -656,12 +656,12 @@ void tst_QPainterPath::testOperatorEquals_fuzzy()
         QPainterPath pb;
         pb.addRect(b);
 
-        QVERIFY(pa == pb);
+        QCOMPARE(pa, pb);
 
         QTransform transform;
         transform.translate(-1, -1);
 
-        QVERIFY(transform.map(pa) == transform.map(pb));
+        QCOMPARE(transform.map(pa), transform.map(pb));
     }
 
     // operator== should return true for a path that has
@@ -676,7 +676,7 @@ void tst_QPainterPath::testOperatorEquals_fuzzy()
 
         QPainterPath b = transform.inverted().map(transform.map(a));
 
-        QVERIFY(a == b);
+        QCOMPARE(a, b);
     }
 
     {
@@ -720,7 +720,7 @@ void tst_QPainterPath::testOperatorDatastream()
         stream >> other;
     }
 
-    QVERIFY(other == path);
+    QCOMPARE(other, path);
 }
 
 void tst_QPainterPath::closing()
@@ -1066,19 +1066,19 @@ void tst_QPainterPath::setElementPositionAt()
 {
     QPainterPath path(QPointF(42., 42.));
     QCOMPARE(path.elementCount(), 1);
-    QVERIFY(path.elementAt(0).type == QPainterPath::MoveToElement);
+    QCOMPARE(path.elementAt(0).type, QPainterPath::MoveToElement);
     QCOMPARE(path.elementAt(0).x, qreal(42.));
     QCOMPARE(path.elementAt(0).y, qreal(42.));
 
     QPainterPath copy = path;
     copy.setElementPositionAt(0, qreal(0), qreal(0));
     QCOMPARE(copy.elementCount(), 1);
-    QVERIFY(copy.elementAt(0).type == QPainterPath::MoveToElement);
+    QCOMPARE(copy.elementAt(0).type, QPainterPath::MoveToElement);
     QCOMPARE(copy.elementAt(0).x, qreal(0));
     QCOMPARE(copy.elementAt(0).y, qreal(0));
 
     QCOMPARE(path.elementCount(), 1);
-    QVERIFY(path.elementAt(0).type == QPainterPath::MoveToElement);
+    QCOMPARE(path.elementAt(0).type, QPainterPath::MoveToElement);
     QCOMPARE(path.elementAt(0).x, qreal(42.));
     QCOMPARE(path.elementAt(0).y, qreal(42.));
 }
@@ -1253,10 +1253,10 @@ void tst_QPainterPath::connectPathMoveTo()
 
     path1.connectPath(path2);
 
-    QVERIFY(path1.elementAt(0).type == QPainterPath::MoveToElement);
-    QVERIFY(path2.elementAt(0).type == QPainterPath::MoveToElement);
-    QVERIFY(path3.elementAt(0).type == QPainterPath::MoveToElement);
-    QVERIFY(path4.elementAt(0).type == QPainterPath::MoveToElement);
+    QCOMPARE(path1.elementAt(0).type, QPainterPath::MoveToElement);
+    QCOMPARE(path2.elementAt(0).type, QPainterPath::MoveToElement);
+    QCOMPARE(path3.elementAt(0).type, QPainterPath::MoveToElement);
+    QCOMPARE(path4.elementAt(0).type, QPainterPath::MoveToElement);
 }
 
 void tst_QPainterPath::translate()
diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp
index c0e3c6d187..33f81cc10e 100644
--- a/tests/auto/gui/painting/qregion/tst_qregion.cpp
+++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp
@@ -173,7 +173,7 @@ void tst_QRegion::setRects()
         QRect rect;
         region.setRects(&rect, 0);
         QVERIFY(region.isEmpty());
-        QVERIFY(region == QRegion());
+        QCOMPARE(region, QRegion());
         QVERIFY(!region.boundingRect().isValid());
         QVERIFY(region.rects().isEmpty());
     }
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index 1327cff1bd..60b89aa6ab 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
@@ -428,14 +428,14 @@ void tst_QTransform::matrix()
                     mat1.m21(), mat1.m22(), 0,
                     mat1.dx(), mat1.dy(), 1);
 
-    QVERIFY(tran1 == dummy);
-    QVERIFY(tran1.inverted() == dummy.inverted());
-    QVERIFY(tran1.inverted() == QTransform(mat1.inverted()));
-    QVERIFY(tran2.inverted() == QTransform(mat2.inverted()));
+    QCOMPARE(tran1, dummy);
+    QCOMPARE(tran1.inverted(), dummy.inverted());
+    QCOMPARE(tran1.inverted(), QTransform(mat1.inverted()));
+    QCOMPARE(tran2.inverted(), QTransform(mat2.inverted()));
 
     QMatrix mat3 = mat1 * mat2;
     QTransform tran3 = tran1 * tran2;
-    QVERIFY(QTransform(mat3) == tran3);
+    QCOMPARE(QTransform(mat3), tran3);
 
     /* QMatrix::operator==() doesn't use qFuzzyCompare(), which
      * on win32-g++ results in a failure. So we work around it by
@@ -447,15 +447,15 @@ void tst_QTransform::matrix()
 
     QRect rect(43, 70, 200, 200);
     QPoint pt(43, 66);
-    QVERIFY(tranInv.map(pt) == matInv.map(pt));
-    QVERIFY(tranInv.map(pt) == matInv.map(pt));
+    QCOMPARE(tranInv.map(pt), matInv.map(pt));
+    QCOMPARE(tranInv.map(pt), matInv.map(pt));
 
     QPainterPath path;
     path.moveTo(55, 60);
     path.lineTo(110, 110);
     path.quadTo(220, 50, 10, 20);
     path.closeSubpath();
-    QVERIFY(tranInv.map(path) == matInv.map(path));
+    QCOMPARE(tranInv.map(path), matInv.map(path));
 }
 
 void tst_QTransform::testOffset()
@@ -741,8 +741,8 @@ void tst_QTransform::inverted()
 
     const QTransform inverted = matrix.inverted();
 
-    QVERIFY(matrix.isIdentity() == inverted.isIdentity());
-    QVERIFY(matrix.type() == inverted.type());
+    QCOMPARE(matrix.isIdentity(), inverted.isIdentity());
+    QCOMPARE(matrix.type(), inverted.type());
 
     QVERIFY((matrix * inverted).isIdentity());
     QVERIFY((inverted * matrix).isIdentity());