tests/auto/widgets: 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: Ie29640451dddeb58342038a8cd5fac152cce39e5
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

5 files changed, 80 insertions, 74 deletions

diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
index 59227a6168..c5e31a4bd4 100644
--- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
+++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
@@ -98,7 +98,7 @@ void tst_QColorDialog::testNativeActiveModalWidget()
     TestNativeDialog d;
     QTimer::singleShot(1000, &d, SLOT(hide()));
     d.exec();
-    QVERIFY(&d == d.m_activeModalWidget);
+    QCOMPARE(&d, d.m_activeModalWidget);
 }
 
 void tst_QColorDialog::native_activeModalWidget()
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index ffc000a418..cc321bb137 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -677,7 +677,7 @@ void tst_QFiledialog::filters()
 
     // effects
     QList<QComboBox*> views = fd.findChildren<QComboBox*>("fileTypeCombo");
-    QVERIFY(views.count() == 1);
+    QCOMPARE(views.count(), 1);
     QCOMPARE(views.at(0)->isVisible(), false);
 
     QStringList filters;
@@ -1296,7 +1296,7 @@ void tst_QFiledialog::clearLineEdit()
 
     QLineEdit *lineEdit = fd.findChild<QLineEdit*>("fileNameEdit");
     QVERIFY(lineEdit);
-    QVERIFY(lineEdit->text() == "foo");
+    QCOMPARE(lineEdit->text(), QLatin1String("foo"));
     fd.setDirectory(QDir::home());
 
     QListView* list = fd.findChild<QListView*>("listView");
@@ -1393,12 +1393,12 @@ void tst_QFiledialog::trailingDotsAndSpaces()
     QTest::keyClick(lineEdit, Qt::Key_Space);
     QTest::keyClick(lineEdit, Qt::Key_Period);
     QTest::qWait(1000);
-    QVERIFY(currentChildrenCount == list->model()->rowCount(list->rootIndex()));
+    QCOMPARE(currentChildrenCount, list->model()->rowCount(list->rootIndex()));
     lineEdit->clear();
     QTest::keyClick(lineEdit, Qt::Key_Period);
     QTest::keyClick(lineEdit, Qt::Key_Space);
     QTest::qWait(1000);
-    QVERIFY(currentChildrenCount == list->model()->rowCount(list->rootIndex()));
+    QCOMPARE(currentChildrenCount, list->model()->rowCount(list->rootIndex()));
 }
 
 #ifdef Q_OS_UNIX
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 03f0d25375..0e7f760b4e 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -167,7 +167,7 @@ void tst_QFileSystemModel::cleanup()
                 QVERIFY(dir.rmdir(list.at(i)));
         }
         list = dir.entryList(QDir::AllEntries | QDir::System | QDir::Hidden | QDir::NoDotAndDotDot);
-        QVERIFY(list.count() == 0);
+        QCOMPARE(list.count(), 0);
     }
 }
 
@@ -523,8 +523,14 @@ void tst_QFileSystemModel::rowsInserted()
 
     QVERIFY(createFiles(tmp, QStringList(".hidden_file"), 5 + count));
 
-    if (count != 0) QTRY_VERIFY(spy0.count() >= 1); else QTRY_VERIFY(spy0.count() == 0);
-    if (count != 0) QTRY_VERIFY(spy1.count() >= 1); else QTRY_VERIFY(spy1.count() == 0);
+    if (count != 0)
+        QTRY_VERIFY(spy0.count() >= 1);
+    else
+        QTRY_COMPARE(spy0.count(), 0);
+    if (count != 0)
+        QTRY_VERIFY(spy1.count() >= 1);
+    else
+        QTRY_COMPARE(spy1.count(), 0);
 }
 
 void tst_QFileSystemModel::rowsRemoved_data()
@@ -563,8 +569,8 @@ void tst_QFileSystemModel::rowsRemoved()
             }
         } else {
             if (i == 10 || spy0.count() == 0) {
-                QVERIFY(spy0.count() == 0);
-                QVERIFY(spy1.count() == 0);
+                QCOMPARE(spy0.count(), 0);
+                QCOMPARE(spy1.count(), 0);
             }
         }
         QStringList lst;
@@ -583,8 +589,8 @@ void tst_QFileSystemModel::rowsRemoved()
     QVERIFY(QFile::remove(tmp + '/' + QString(".c")));
     QTest::qWait(WAITTIME);
 
-    if (count != 0) QVERIFY(spy0.count() >= 1); else QVERIFY(spy0.count() == 0);
-    if (count != 0) QVERIFY(spy1.count() >= 1); else QVERIFY(spy1.count() == 0);
+    if (count != 0) QVERIFY(spy0.count() >= 1); else QCOMPARE(spy0.count(), 0);
+    if (count != 0) QVERIFY(spy1.count() >= 1); else QCOMPARE(spy1.count(), 0);
 }
 
 void tst_QFileSystemModel::dataChanged_data()
@@ -614,7 +620,7 @@ void tst_QFileSystemModel::dataChanged()
 
     QTest::qWait(WAITTIME);
 
-    if (count != 0) QVERIFY(spy.count() >= 1); else QVERIFY(spy.count() == 0);
+    if (count != 0) QVERIFY(spy.count() >= 1); else QCOMPARE(spy.count(), 0);
     */
 }
 
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index cb816a7e85..97cfec8171 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -216,7 +216,7 @@ void tst_QMessageBox::button()
 
     // remove the cancel, should not exist anymore
     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-    QVERIFY(msgBox.button(QMessageBox::Cancel) == 0);
+    QVERIFY(!msgBox.button(QMessageBox::Cancel));
     QVERIFY(msgBox.button(QMessageBox::Yes) != 0);
 
     // should not crash
@@ -228,10 +228,10 @@ void tst_QMessageBox::button()
 void tst_QMessageBox::defaultButton()
 {
     QMessageBox msgBox;
-    QVERIFY(msgBox.defaultButton() == 0);
+    QVERIFY(!msgBox.defaultButton());
     msgBox.addButton(QMessageBox::Ok);
     msgBox.addButton(QMessageBox::Cancel);
-    QVERIFY(msgBox.defaultButton() == 0);
+    QVERIFY(!msgBox.defaultButton());
     QPushButton pushButton;
     msgBox.setDefaultButton(&pushButton);
     QVERIFY(msgBox.defaultButton() == 0); // we have not added it yet
@@ -250,27 +250,27 @@ void tst_QMessageBox::defaultButton()
     exec(&msgBox, Qt::Key_Enter);
     QCOMPARE(msgBox.clickedButton(), okButton);
     msgBox.setDefaultButton(QMessageBox::Yes); // its not in there!
-    QVERIFY(msgBox.defaultButton() == okButton);
+    QCOMPARE(msgBox.defaultButton(), okButton);
     msgBox.removeButton(okButton);
     delete okButton;
     okButton = 0;
-    QVERIFY(msgBox.defaultButton() == 0);
+    QVERIFY(!msgBox.defaultButton());
     msgBox.setDefaultButton(QMessageBox::Ok);
-    QVERIFY(msgBox.defaultButton() == 0);
+    QVERIFY(!msgBox.defaultButton());
 }
 
 void tst_QMessageBox::escapeButton()
 {
     QMessageBox msgBox;
-    QVERIFY(msgBox.escapeButton() == 0);
+    QVERIFY(!msgBox.escapeButton());
     msgBox.addButton(QMessageBox::Ok);
     exec(&msgBox);
     QVERIFY(msgBox.clickedButton() == msgBox.button(QMessageBox::Ok)); // auto detected (one button only)
     msgBox.addButton(QMessageBox::Cancel);
-    QVERIFY(msgBox.escapeButton() == 0);
+    QVERIFY(!msgBox.escapeButton());
     QPushButton invalidButton;
     msgBox.setEscapeButton(&invalidButton);
-    QVERIFY(msgBox.escapeButton() == 0);
+    QVERIFY(!msgBox.escapeButton());
     QAbstractButton *retryButton = msgBox.addButton(QMessageBox::Retry);
 
     exec(&msgBox);
@@ -293,13 +293,13 @@ void tst_QMessageBox::escapeButton()
     exec(&msgBox, Qt::Key_Escape);
     QCOMPARE(msgBox.clickedButton(), okButton);
     msgBox.setEscapeButton(QMessageBox::Yes); // its not in there!
-    QVERIFY(msgBox.escapeButton() == okButton);
+    QCOMPARE(msgBox.escapeButton(), okButton);
     msgBox.removeButton(okButton);
     delete okButton;
     okButton = 0;
-    QVERIFY(msgBox.escapeButton() == 0);
+    QVERIFY(!msgBox.escapeButton());
     msgBox.setEscapeButton(QMessageBox::Ok);
-    QVERIFY(msgBox.escapeButton() == 0);
+    QVERIFY(!msgBox.escapeButton());
 
     QMessageBox msgBox2;
     msgBox2.addButton(QMessageBox::Yes);
@@ -527,13 +527,13 @@ void tst_QMessageBox::testSymbols()
     QCOMPARE(mb1.text(), text);
 
     icon = mb1.icon();
-    QVERIFY(icon == QMessageBox::NoIcon);
+    QCOMPARE(icon, QMessageBox::NoIcon);
     mb1.setIcon(QMessageBox::Question);
-    QVERIFY(mb1.icon() == QMessageBox::Question);
+    QCOMPARE(mb1.icon(), QMessageBox::Question);
 
     QPixmap iconPixmap = mb1.iconPixmap();
     mb1.setIconPixmap(iconPixmap);
-    QVERIFY(mb1.icon() == QMessageBox::NoIcon);
+    QCOMPARE(mb1.icon(), QMessageBox::NoIcon);
 
     QCOMPARE(mb1.buttonText(QMessageBox::Ok), QLatin1String("OK"));
     QCOMPARE(mb1.buttonText(QMessageBox::Cancel), QString());
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index de361c20fb..b2bdbac79a 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -400,7 +400,7 @@ void tst_QWizard::setButton()
 
     // revert to default button
     wizard.setButton(QWizard::NextButton, 0);
-    QVERIFY(toolButton == 0);
+    QVERIFY(toolButton.isNull());
     QVERIFY(qobject_cast<QPushButton *>(wizard.button(QWizard::NextButton)));
     QVERIFY(wizard.button(QWizard::NextButton)->text().contains("Next"));
 }
@@ -408,16 +408,16 @@ void tst_QWizard::setButton()
 void tst_QWizard::setTitleFormatEtc()
 {
     QWizard wizard;
-    QVERIFY(wizard.titleFormat() == Qt::AutoText);
-    QVERIFY(wizard.subTitleFormat() == Qt::AutoText);
+    QCOMPARE(wizard.titleFormat(), Qt::AutoText);
+    QCOMPARE(wizard.subTitleFormat(), Qt::AutoText);
 
     wizard.setTitleFormat(Qt::RichText);
-    QVERIFY(wizard.titleFormat() == Qt::RichText);
-    QVERIFY(wizard.subTitleFormat() == Qt::AutoText);
+    QCOMPARE(wizard.titleFormat(), Qt::RichText);
+    QCOMPARE(wizard.subTitleFormat(), Qt::AutoText);
 
     wizard.setSubTitleFormat(Qt::PlainText);
-    QVERIFY(wizard.titleFormat() == Qt::RichText);
-    QVERIFY(wizard.subTitleFormat() == Qt::PlainText);
+    QCOMPARE(wizard.titleFormat(), Qt::RichText);
+    QCOMPARE(wizard.subTitleFormat(), Qt::PlainText);
 }
 
 void tst_QWizard::setPixmap()
@@ -459,20 +459,20 @@ void tst_QWizard::setPixmap()
 
     page->setPixmap(QWizard::LogoPixmap, p5);
 
-    QVERIFY(wizard.pixmap(QWizard::BannerPixmap).size() == p1.size());
-    QVERIFY(wizard.pixmap(QWizard::LogoPixmap).size() == p2.size());
-    QVERIFY(wizard.pixmap(QWizard::WatermarkPixmap).size() == p3.size());
-    QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).size() == p4.size());
+    QCOMPARE(wizard.pixmap(QWizard::BannerPixmap).size(), p1.size());
+    QCOMPARE(wizard.pixmap(QWizard::LogoPixmap).size(), p2.size());
+    QCOMPARE(wizard.pixmap(QWizard::WatermarkPixmap).size(), p3.size());
+    QCOMPARE(wizard.pixmap(QWizard::BackgroundPixmap).size(), p4.size());
 
-    QVERIFY(page->pixmap(QWizard::BannerPixmap).size() == p1.size());
-    QVERIFY(page->pixmap(QWizard::LogoPixmap).size() == p5.size());
-    QVERIFY(page->pixmap(QWizard::WatermarkPixmap).size() == p3.size());
-    QVERIFY(page->pixmap(QWizard::BackgroundPixmap).size() == p4.size());
+    QCOMPARE(page->pixmap(QWizard::BannerPixmap).size(), p1.size());
+    QCOMPARE(page->pixmap(QWizard::LogoPixmap).size(), p5.size());
+    QCOMPARE(page->pixmap(QWizard::WatermarkPixmap).size(), p3.size());
+    QCOMPARE(page->pixmap(QWizard::BackgroundPixmap).size(), p4.size());
 
-    QVERIFY(page2->pixmap(QWizard::BannerPixmap).size() == p1.size());
-    QVERIFY(page2->pixmap(QWizard::LogoPixmap).size() == p2.size());
-    QVERIFY(page2->pixmap(QWizard::WatermarkPixmap).size() == p3.size());
-    QVERIFY(page2->pixmap(QWizard::BackgroundPixmap).size() == p4.size());
+    QCOMPARE(page2->pixmap(QWizard::BannerPixmap).size(), p1.size());
+    QCOMPARE(page2->pixmap(QWizard::LogoPixmap).size(), p2.size());
+    QCOMPARE(page2->pixmap(QWizard::WatermarkPixmap).size(), p3.size());
+    QCOMPARE(page2->pixmap(QWizard::BackgroundPixmap).size(), p4.size());
 }
 
 class MyPage1 : public QWizardPage
@@ -571,7 +571,7 @@ void tst_QWizard::addPage()
     }
 
     for (int i = 0; i < N; ++i) {
-        QVERIFY(pages[i] == wizard.page(i));
+        QCOMPARE(pages[i], wizard.page(i));
     }
     QVERIFY(!wizard.page(-1));
     QVERIFY(!wizard.page(N));
@@ -667,7 +667,7 @@ void tst_QWizard::setPage()
     QCOMPARE(wizard.page(-2), page);
     QCOMPARE(wizard.startId(), -2);
     QCOMPARE(wizard.currentId(), -2);
-    QVERIFY(wizard.currentPage() == page);
+    QCOMPARE(wizard.currentPage(), page);
     QCOMPARE(wizard.nextId(), 0);
     CHECK_VISITED(wizard, QList<int>() << -2);
 
@@ -679,14 +679,14 @@ void tst_QWizard::setPage()
     QCOMPARE(wizard.page(2), page);
     QCOMPARE(wizard.startId(), -2);
     QCOMPARE(wizard.currentId(), -2);
-    QVERIFY(wizard.currentPage() == wizard.page(-2));
+    QCOMPARE(wizard.currentPage(), wizard.page(-2));
     QCOMPARE(wizard.nextId(), 0);
     CHECK_VISITED(wizard, QList<int>() << -2);
 
     wizard.restart();
     QCOMPARE(wizard.startId(), -2);
     QCOMPARE(wizard.currentId(), -2);
-    QVERIFY(wizard.currentPage() == wizard.page(-2));
+    QCOMPARE(wizard.currentPage(), wizard.page(-2));
     QCOMPARE(wizard.nextId(), 0);
     CHECK_VISITED(wizard, QList<int>() << -2);
 
@@ -698,28 +698,28 @@ void tst_QWizard::setPage()
     QCOMPARE(wizard.page(-3), page);
     QCOMPARE(wizard.startId(), -3);
     QCOMPARE(wizard.currentId(), -2);
-    QVERIFY(wizard.currentPage() == wizard.page(-2));
+    QCOMPARE(wizard.currentPage(), wizard.page(-2));
     QCOMPARE(wizard.nextId(), 0);
     CHECK_VISITED(wizard, QList<int>() << -2);
 
     wizard.restart();
     QCOMPARE(wizard.startId(), -3);
     QCOMPARE(wizard.currentId(), -3);
-    QVERIFY(wizard.currentPage() == wizard.page(-3));
+    QCOMPARE(wizard.currentPage(), wizard.page(-3));
     QCOMPARE(wizard.nextId(), -2);
     CHECK_VISITED(wizard, QList<int>() << -3);
 
     wizard.next();
     QCOMPARE(wizard.startId(), -3);
     QCOMPARE(wizard.currentId(), -2);
-    QVERIFY(wizard.currentPage() == wizard.page(-2));
+    QCOMPARE(wizard.currentPage(), wizard.page(-2));
     QCOMPARE(wizard.nextId(), 0);
     CHECK_VISITED(wizard, QList<int>() << -3 << -2);
 
     wizard.next();
     QCOMPARE(wizard.startId(), -3);
     QCOMPARE(wizard.currentId(), 0);
-    QVERIFY(wizard.currentPage() == wizard.page(0));
+    QCOMPARE(wizard.currentPage(), wizard.page(0));
     QCOMPARE(wizard.nextId(), 2);
     CHECK_VISITED(wizard, QList<int>() << -3 << -2 << 0);
 
@@ -727,7 +727,7 @@ void tst_QWizard::setPage()
         wizard.next();
         QCOMPARE(wizard.startId(), -3);
         QCOMPARE(wizard.currentId(), 2);
-        QVERIFY(wizard.currentPage() == wizard.page(2));
+        QCOMPARE(wizard.currentPage(), wizard.page(2));
         QCOMPARE(wizard.nextId(), -1);
         CHECK_VISITED(wizard, QList<int>() << -3 << -2 << 0 << 2);
     }
@@ -735,14 +735,14 @@ void tst_QWizard::setPage()
     wizard.back();
     QCOMPARE(wizard.startId(), -3);
     QCOMPARE(wizard.currentId(), 0);
-    QVERIFY(wizard.currentPage() == wizard.page(0));
+    QCOMPARE(wizard.currentPage(), wizard.page(0));
     QCOMPARE(wizard.nextId(), 2);
     CHECK_VISITED(wizard, QList<int>() << -3 << -2 << 0);
 
     wizard.back();
     QCOMPARE(wizard.startId(), -3);
     QCOMPARE(wizard.currentId(), -2);
-    QVERIFY(wizard.currentPage() == wizard.page(-2));
+    QCOMPARE(wizard.currentPage(), wizard.page(-2));
     QCOMPARE(wizard.nextId(), 0);
     CHECK_VISITED(wizard, QList<int>() << -3 << -2);
 
@@ -750,7 +750,7 @@ void tst_QWizard::setPage()
         wizard.back();
         QCOMPARE(wizard.startId(), -3);
         QCOMPARE(wizard.currentId(), -3);
-        QVERIFY(wizard.currentPage() == wizard.page(-3));
+        QCOMPARE(wizard.currentPage(), wizard.page(-3));
         QCOMPARE(wizard.nextId(), -2);
         CHECK_VISITED(wizard, QList<int>() << -3);
     }
@@ -759,7 +759,7 @@ void tst_QWizard::setPage()
         wizard.restart();
         QCOMPARE(wizard.startId(), -3);
         QCOMPARE(wizard.currentId(), -3);
-        QVERIFY(wizard.currentPage() == wizard.page(-3));
+        QCOMPARE(wizard.currentPage(), wizard.page(-3));
         QCOMPARE(wizard.nextId(), -2);
         CHECK_VISITED(wizard, QList<int>() << -3);
     }
@@ -808,31 +808,31 @@ void tst_QWizard::setStartId()
     wizard.restart();
     QCOMPARE(wizard.startId(), -2);
     QCOMPARE(wizard.currentId(), -2);
-    QVERIFY(wizard.currentPage() == wizard.page(-2));
+    QCOMPARE(wizard.currentPage(), wizard.page(-2));
     QCOMPARE(wizard.nextId(), 0);
 
     wizard.next();
     QCOMPARE(wizard.startId(), -2);
     QCOMPARE(wizard.currentId(), 0);
-    QVERIFY(wizard.currentPage() == wizard.page(0));
+    QCOMPARE(wizard.currentPage(), wizard.page(0));
     QCOMPARE(wizard.nextId(), 1);
 
     wizard.setStartId(INT_MIN);
     QCOMPARE(wizard.startId(), INT_MIN);
     QCOMPARE(wizard.currentId(), 0);
-    QVERIFY(wizard.currentPage() == wizard.page(0));
+    QCOMPARE(wizard.currentPage(), wizard.page(0));
     QCOMPARE(wizard.nextId(), 1);
 
     wizard.next();
     QCOMPARE(wizard.startId(), INT_MIN);
     QCOMPARE(wizard.currentId(), 1);
-    QVERIFY(wizard.currentPage() == wizard.page(1));
+    QCOMPARE(wizard.currentPage(), wizard.page(1));
     QCOMPARE(wizard.nextId(), INT_MAX);
 
     wizard.next();
     QCOMPARE(wizard.startId(), INT_MIN);
     QCOMPARE(wizard.currentId(), INT_MAX);
-    QVERIFY(wizard.currentPage() == wizard.page(INT_MAX));
+    QCOMPARE(wizard.currentPage(), wizard.page(INT_MAX));
     QCOMPARE(wizard.nextId(), -1);
     CHECK_VISITED(wizard, QList<int>() << -2 << 0 << 1 << INT_MAX);
 }
@@ -1143,12 +1143,12 @@ void tst_QWizard::setOption_ExtendedWatermarkPixmap()
         }
 
         if (wizard1.wizardStyle() == QWizard::MacStyle) {
-            QVERIFY(i1[0] == i1[1]);
-            QVERIFY(i2[0] == i2[1]);
-            QVERIFY(i1[0] == i2[0]);
+            QCOMPARE(i1[0], i1[1]);
+            QCOMPARE(i2[0], i2[1]);
+            QCOMPARE(i1[0], i2[0]);
         } else {
             QVERIFY(i1[0] != i1[1]);
-            QVERIFY(i2[0] == i2[1]);
+            QCOMPARE(i2[0], i2[1]);
             QVERIFY(i1[0] != i2[0]);
             QVERIFY(i1[1] != i2[1]);
         }
@@ -2425,19 +2425,19 @@ void tst_QWizard::sideWidget()
     QWizard wizard;
 
     wizard.setSideWidget(0);
-    QVERIFY(wizard.sideWidget() == 0);
+    QVERIFY(!wizard.sideWidget());
     QScopedPointer<QWidget> w1(new QWidget(&wizard));
     wizard.setSideWidget(w1.data());
     QCOMPARE(wizard.sideWidget(), w1.data());
     QWidget *w2 = new QWidget(&wizard);
     wizard.setSideWidget(w2);
-    QVERIFY(wizard.sideWidget() == w2);
+    QCOMPARE(wizard.sideWidget(), w2);
     QVERIFY(w1->parent() != 0);
     QCOMPARE(w1->window(), static_cast<QWidget *>(&wizard));
     QCOMPARE(w2->window(), static_cast<QWidget *>(&wizard));
     w1->setParent(0);
     wizard.setSideWidget(0);
-    QVERIFY(wizard.sideWidget() == 0);
+    QVERIFY(!wizard.sideWidget());
 }
 
 void tst_QWizard::objectNames_data()
@@ -2558,7 +2558,7 @@ void tst_QWizard::task183550_stretchFactor()
     page2->disableVerticalExpansion();
     wizard.next();
     QCOMPARE(wizard.currentPage(), static_cast<QWizardPage*>(page2));
-    QVERIFY(page2->treeWidgetHeight() == page2->treeWidgetSizeHintHeight());
+    QCOMPARE(page2->treeWidgetHeight(), page2->treeWidgetSizeHintHeight());
 
     wizard.back();
     QCOMPARE(wizard.currentPage(), static_cast<QWizardPage*>(page1));
@@ -2576,7 +2576,7 @@ void tst_QWizard::task183550_stretchFactor()
     page2->disableVerticalExpansion();
     wizard.next();
     QCOMPARE(wizard.currentPage(), static_cast<QWizardPage*>(page2));
-    QVERIFY(page2->treeWidgetHeight() == page2->treeWidgetSizeHintHeight());
+    QCOMPARE(page2->treeWidgetHeight(), page2->treeWidgetSizeHintHeight());
 }
 
 void tst_QWizard::task161658_alignments()