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>

11 files changed, 54 insertions, 54 deletions

diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index eed38752d9..fac3f5857b 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -1036,7 +1036,7 @@ void tst_QAbstractItemView::dragAndDropOnChild()
             ++successes;
     }
 
-    QVERIFY(successes == 0);
+    QCOMPARE(successes, 0);
 }
 
 #endif // 0
@@ -1214,7 +1214,7 @@ void tst_QAbstractItemView::setCurrentIndex()
     view->setModel(model);
 
     view->setCurrentIndex(model->index(0,0));
-    QVERIFY(view->currentIndex() == model->index(0,0));
+    QCOMPARE(view->currentIndex(), model->index(0,0));
     view->setCurrentIndex(model->index(1,0));
     QVERIFY(view->currentIndex() == model->index(result ? 1 : 0,0));
 }
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index f5e6facaad..6645da727c 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -292,7 +292,7 @@ void tst_QColumnView::grips()
         for (int i = 0 ; i < list.count(); ++i) {
             if (QAbstractItemView *view = qobject_cast<QAbstractItemView*>(list.at(i))) {
                 if (view->isVisible())
-                    QVERIFY(view->cornerWidget() == 0);
+                    QVERIFY(!view->cornerWidget());
             }
         }
     }
@@ -587,7 +587,7 @@ void tst_QColumnView::selectAll()
     QVERIFY(view.selectionModel()->selectedIndexes().count() > 0);
 
     view.setCurrentIndex(QModelIndex());
-    QVERIFY(view.selectionModel()->selectedIndexes().count() == 0);
+    QCOMPARE(view.selectionModel()->selectedIndexes().count(), 0);
 }
 
 void tst_QColumnView::clicked()
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index 21e4b82366..7e73c19539 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -403,7 +403,7 @@ void tst_QHeaderView::init()
     view = new QHeaderView(Qt::Vertical,topLevel);
     // Some initial value tests before a model is added
     QCOMPARE(view->length(), 0);
-    QVERIFY(view->sizeHint() == QSize(0,0));
+    QCOMPARE(view->sizeHint(), QSize(0,0));
     QCOMPARE(view->sectionSizeHint(0), -1);
 
     /*
@@ -925,9 +925,9 @@ void tst_QHeaderView::moveSection()
     QFETCH(QList<int>, logical);
     QFETCH(int, count);
 
-    QVERIFY(from.count() == to.count());
-    QVERIFY(from.count() == moved.count());
-    QVERIFY(view->count() == logical.count());
+    QCOMPARE(from.count(), to.count());
+    QCOMPARE(from.count(), moved.count());
+    QCOMPARE(view->count(), logical.count());
 
     QSignalSpy spy1(view, SIGNAL(sectionMoved(int,int,int)));
     QCOMPARE(view->sectionsMoved(), false);
@@ -1370,15 +1370,15 @@ void tst_QHeaderView::unhideSection()
     QCOMPARE(view->sectionsHidden(), false);
     view->setSectionHidden(0, true);
     QCOMPARE(view->sectionsHidden(), true);
-    QVERIFY(view->sectionSize(0) == 0);
+    QCOMPARE(view->sectionSize(0), 0);
     view->setSectionResizeMode(QHeaderView::Interactive);
     view->setSectionHidden(0, false);
     QVERIFY(view->sectionSize(0) > 0);
 
     view->setSectionHidden(0, true);
-    QVERIFY(view->sectionSize(0) == 0);
+    QCOMPARE(view->sectionSize(0), 0);
     view->setSectionHidden(0, true);
-    QVERIFY(view->sectionSize(0) == 0);
+    QCOMPARE(view->sectionSize(0), 0);
     view->setSectionResizeMode(QHeaderView::Stretch);
     view->setSectionHidden(0, false);
     QVERIFY(view->sectionSize(0) > 0);
@@ -1645,7 +1645,7 @@ void tst_QHeaderView::saveRestore()
 
     QByteArray s2 = h2.saveState();
 
-    QVERIFY(s1 == s2);
+    QCOMPARE(s1, s2);
     QVERIFY(!h2.restoreState(QByteArrayLiteral("Garbage")));
 
     // QTBUG-40462
@@ -1659,7 +1659,7 @@ void tst_QHeaderView::saveRestore()
     int sectionItemsLengthTotal = 0;
     for (int i = 0; i < h2.count(); ++i)
         sectionItemsLengthTotal += h2.sectionSize(i);
-    QVERIFY(sectionItemsLengthTotal == h2.length());
+    QCOMPARE(sectionItemsLengthTotal, h2.length());
 
     // Buggy setting where sum(sectionItems) != length. Check false is returned and this corrupted
     // state isn't restored
@@ -1676,8 +1676,8 @@ void tst_QHeaderView::saveRestore()
     // Check setting is correctly recognized as corrupted
     QVERIFY(!h2.restoreState(settings_buggy_length));
     // Check nothing has been actually restored
-    QVERIFY(h2.length() == old_length);
-    QVERIFY(h2.saveState() == old_state);
+    QCOMPARE(h2.length(), old_length);
+    QCOMPARE(h2.saveState(), old_state);
 }
 
 void tst_QHeaderView::defaultSectionSizeTest()
@@ -1699,7 +1699,7 @@ void tst_QHeaderView::defaultSectionSizeTest()
     // no hidden Sections
     hv->resizeSection(1, 0);
     hv->setDefaultSectionSize(defaultSize);
-    QVERIFY(hv->sectionSize(1) == defaultSize);
+    QCOMPARE(hv->sectionSize(1), defaultSize);
 
     // with hidden sections
     hv->resizeSection(1, 0);
@@ -2277,7 +2277,7 @@ void tst_QHeaderView::QTBUG14242_hideSectionAutoSize()
     for (int u = 0; u < hv->count(); ++u)
         calced_length += hv->sectionSize(u);
 
-    QVERIFY(calced_length == afterlength);
+    QCOMPARE(calced_length, afterlength);
 }
 
 void tst_QHeaderView::ensureNoIndexAtLength()
@@ -2286,9 +2286,9 @@ void tst_QHeaderView::ensureNoIndexAtLength()
     QStandardItemModel amodel(4, 4);
     qtv.setModel(&amodel);
     QHeaderView *hv = qtv.verticalHeader();
-    QVERIFY(hv->visualIndexAt(hv->length()) == -1);
+    QCOMPARE(hv->visualIndexAt(hv->length()), -1);
     hv->resizeSection(hv->count() - 1, 0);
-    QVERIFY(hv->visualIndexAt(hv->length()) == -1);
+    QCOMPARE(hv->visualIndexAt(hv->length()), -1);
 }
 
 void tst_QHeaderView::offsetConsistent()
@@ -2307,7 +2307,7 @@ void tst_QHeaderView::offsetConsistent()
     hv->hideSection(sectionToHide);
     hv->setOffsetToSectionPosition(150);
     int offset2 = hv->offset();
-    QVERIFY(offset1 == offset2);
+    QCOMPARE(offset1, offset2);
     // Ensure that hidden indexes (still) is considered.
     hv->resizeSection(sectionToHide, hv->sectionSize(200) * 2);
     hv->setOffsetToSectionPosition(800);
@@ -2600,8 +2600,8 @@ void tst_QHeaderView::logicalIndexAtTest()
     //qDebug() << "logicalIndexAtTest" << check1 << check2;
     const int precalced_check1 = 106327;
     const int precalced_check2 = 29856418;
-    QVERIFY(precalced_check1 == check1);
-    QVERIFY(precalced_check2 == check2);
+    QCOMPARE(precalced_check1, check1);
+    QCOMPARE(precalced_check2, check2);
 
     const int precalced_results[] = { 1145298384, -1710423344, -650981936, 372919464, -1544372176, -426463328, 12124 };
     calculateAndCheck(__LINE__, precalced_results);
@@ -2628,8 +2628,8 @@ void tst_QHeaderView::visualIndexAtTest()
     //qDebug() << "visualIndexAtTest" << check1 << check2;
     const int precalced_check1 = 72665;
     const int precalced_check2 = 14015890;
-    QVERIFY(precalced_check1 == check1);
-    QVERIFY(precalced_check2 == check2);
+    QCOMPARE(precalced_check1, check1);
+    QCOMPARE(precalced_check2, check2);
 
     const int precalced_results[] = { 1145298384, -1710423344, -1457520212, 169223959, 557466160, -324939600, 5453 };
     calculateAndCheck(__LINE__, precalced_results);
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 3bd4112122..25f27cb0c7 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -804,9 +804,9 @@ void tst_QItemDelegate::dateTimeEditor()
     dateTimeEditor->setTime(time.addSecs(600));
     widget.clearFocus();
 
-    QVERIFY(item1->data(Qt::EditRole).userType() == QMetaType::QTime);
-    QVERIFY(item2->data(Qt::EditRole).userType() == QMetaType::QDate);
-    QVERIFY(item3->data(Qt::EditRole).userType() == QMetaType::QDateTime);
+    QCOMPARE(item1->data(Qt::EditRole).userType(), int(QMetaType::QTime));
+    QCOMPARE(item2->data(Qt::EditRole).userType(), int(QMetaType::QDate));
+    QCOMPARE(item3->data(Qt::EditRole).userType(), int(QMetaType::QDateTime));
 }
 
 // A delegate where we can either enforce a certain widget or use the standard widget.
@@ -901,9 +901,9 @@ void tst_QItemDelegate::dateAndTimeEditorTest2()
     s.setData(i1, datetime2);
     editor = w.fastEdit(i1);
     timeEdit = qobject_cast<QTimeEdit*>(editor);
-    QVERIFY(timeEdit == 0);
+    QVERIFY(!timeEdit);
     dateEdit = qobject_cast<QDateEdit*>(editor);
-    QVERIFY(dateEdit == 0);
+    QVERIFY(!dateEdit);
     dateTimeEdit =  qobject_cast<QDateTimeEdit*>(editor);
     QVERIFY(dateTimeEdit);
     QCOMPARE(dateTimeEdit->dateTime(), datetime2);
diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
index f92eb7c8f9..8fd86ea467 100644
--- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
@@ -552,7 +552,7 @@ void tst_QItemView::visualRect()
 
     QFETCH(bool, displays);
     if (!displays){
-        QVERIFY(view->visualRect(topIndex) == QRect());
+        QCOMPARE(view->visualRect(topIndex), QRect());
         return;
     }
 
@@ -560,15 +560,15 @@ void tst_QItemView::visualRect()
     view->show();
     QVERIFY(view->visualRect(topIndex) != QRect());
 
-    QVERIFY(topIndex == view->indexAt(view->visualRect(topIndex).center()));
-    QVERIFY(topIndex == view->indexAt(view->visualRect(topIndex).bottomLeft()));
-    QVERIFY(topIndex == view->indexAt(view->visualRect(topIndex).bottomRight()));
-    QVERIFY(topIndex == view->indexAt(view->visualRect(topIndex).topLeft()));
-    QVERIFY(topIndex == view->indexAt(view->visualRect(topIndex).topRight()));
+    QCOMPARE(topIndex, view->indexAt(view->visualRect(topIndex).center()));
+    QCOMPARE(topIndex, view->indexAt(view->visualRect(topIndex).bottomLeft()));
+    QCOMPARE(topIndex, view->indexAt(view->visualRect(topIndex).bottomRight()));
+    QCOMPARE(topIndex, view->indexAt(view->visualRect(topIndex).topLeft()));
+    QCOMPARE(topIndex, view->indexAt(view->visualRect(topIndex).topRight()));
 
     testViews->hideIndexes(view);
     QModelIndex hiddenIndex = treeModel->index(1, 0);
-    QVERIFY(view->visualRect(hiddenIndex) == QRect());
+    QCOMPARE(view->visualRect(hiddenIndex), QRect());
 }
 
 void tst_QItemView::walkScreen(QAbstractItemView *view)
@@ -616,7 +616,7 @@ void walkIndex(QModelIndex index, QAbstractItemView *view)
             if (view->indexAt(point) != index) {
                 qDebug() << "index" << index << "visualRect" << visualRect << point << view->indexAt(point);
             }
-            QVERIFY(view->indexAt(point) == index);
+            QCOMPARE(view->indexAt(point), index);
         }
     }
 
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 507a41f3c6..fc671fdc9f 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -2456,10 +2456,10 @@ void tst_QListView::horizontalScrollingByVerticalWheelEvents()
     QVERIFY(lv.horizontalScrollBar()->value() > hValue);
 
     QApplication::sendEvent(lv.viewport(), &wheelUpEvent);
-    QVERIFY(lv.horizontalScrollBar()->value() == hValue);
+    QCOMPARE(lv.horizontalScrollBar()->value(), hValue);
 
     QApplication::sendEvent(lv.viewport(), &wheelLeftDownEvent);
-    QVERIFY(lv.horizontalScrollBar()->value() == hValue);
+    QCOMPARE(lv.horizontalScrollBar()->value(), hValue);
 
     // ensure that vertical wheel events are not converted when vertical
     // scroll bar is not visible but vertical scrolling is possible
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index dcbdbe824a..ecf72613da 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -427,9 +427,9 @@ void tst_QListWidget::currentItem()
     // actual test
     QModelIndex currentIndex = testWidget->selectionModel()->currentIndex();
     if (currentIndex.isValid())
-        QVERIFY(testWidget->currentItem() == testWidget->item(currentIndex.row()));
+        QCOMPARE(testWidget->currentItem(), testWidget->item(currentIndex.row()));
     else
-        QVERIFY(testWidget->currentItem() == (QListWidgetItem*)0);
+        QCOMPARE(testWidget->currentItem(), (QListWidgetItem*)0);
 }
 
 void tst_QListWidget::currentRow()
@@ -742,7 +742,7 @@ void tst_QListWidget::selectedItems()
     QFETCH(IntList, selectedRows);
     QFETCH(IntList, expectedRows);
 
-    QVERIFY(testWidget->count() == 0);
+    QCOMPARE(testWidget->count(), 0);
 
     //insert items
     for (int i=0; i<itemCount; ++i)
@@ -1159,7 +1159,7 @@ void tst_QListWidget::setData()
     QFETCH(int, expectedSignalCount);
     qRegisterMetaType<QListWidgetItem *>("QListWidgetItem*");
 
-    QVERIFY(roles.count() == values.count());
+    QCOMPARE(roles.count(), values.count());
 
     for (int manipulateModel=0; manipulateModel<2; ++manipulateModel) {
         testWidget->clear();
@@ -1711,7 +1711,7 @@ void tst_QListWidget::mimeData()
 
     QVERIFY(data->hasFormat(format));
     QVERIFY(data2->hasFormat(format));
-    QVERIFY(data->data(format) == data2->data(format));
+    QCOMPARE(data->data(format), data2->data(format));
 
     delete data;
     delete data2;
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index 36bc23910c..6d2b2ea964 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -196,9 +196,9 @@ void tst_QTableWidget::clearContents()
 {
     QTableWidgetItem *item = new QTableWidgetItem("test");
     testWidget->setHorizontalHeaderItem(0, item);
-    QVERIFY(testWidget->horizontalHeaderItem(0) == item);
+    QCOMPARE(testWidget->horizontalHeaderItem(0), item);
     testWidget->clearContents();
-    QVERIFY(testWidget->horizontalHeaderItem(0) == item);
+    QCOMPARE(testWidget->horizontalHeaderItem(0), item);
 }
 
 void tst_QTableWidget::clear()
@@ -1559,7 +1559,7 @@ void tst_QTableWidget::mimeData()
 
     QVERIFY(data->hasFormat(format));
     QVERIFY(data2->hasFormat(format));
-    QVERIFY(data->data(format) == data2->data(format));
+    QCOMPARE(data->data(format), data2->data(format));
 
     delete data;
     delete data2;
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 340637513c..4edf5d1a3b 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -3657,7 +3657,7 @@ void tst_QTreeView::task202039_closePersistentEditor()
     QVERIFY(view.indexWidget(current));
 
     view.closePersistentEditor(current);
-    QVERIFY(view.indexWidget(current) == 0);
+    QVERIFY(!view.indexWidget(current));
 
     //here was the bug: closing the persistent editor would not reset the state
     //and it was impossible to go into editinon again
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index b63d6b5b89..727bc41478 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -1586,7 +1586,7 @@ void tst_QTreeWidget::scrollToItem()
 
     testWidget->setHeaderLabels(QStringList() << "foo");
     testWidget->scrollToItem(search);
-    QVERIFY(search->text(0) == "111");
+    QCOMPARE(search->text(0), QLatin1String("111"));
 
     bar = search->parent();
     QVERIFY(testWidget->isItemExpanded(bar));
@@ -2287,7 +2287,7 @@ void tst_QTreeWidget::insertExpandedItemsWithSorting()
         QCOMPARE(parent->childCount(), childText.count());
         QVERIFY(parent->isExpanded());
     }
-    QVERIFY(tree.model()->rowCount() == parentText.count());
+    QCOMPARE(tree.model()->rowCount(), parentText.count());
 
     // verify that the items are still expanded
     foreach (QTreeWidgetItem *item, items) {
@@ -2659,7 +2659,7 @@ void tst_QTreeWidget::sortedIndexOfChild()
     tw.sortItems(0, (Qt::SortOrder)sortOrder);
     tw.expandAll();
 
-    QVERIFY(itms.count() == expectedIndexes.count());
+    QCOMPARE(itms.count(), expectedIndexes.count());
     for (int j = 0; j < expectedIndexes.count(); ++j)
         QCOMPARE(top->indexOfChild(itms.at(j)), expectedIndexes.at(j));
 }
@@ -3235,7 +3235,7 @@ void tst_QTreeWidget::setCurrentItemExpandsParent()
     QTreeWidgetItem *i1 = new QTreeWidgetItem(&w, QStringList() << "parent");
     QTreeWidgetItem *i2 = new QTreeWidgetItem(i1, QStringList() << "child");
     QVERIFY(!i2->isExpanded());
-    QVERIFY(w.currentItem() == 0);
+    QVERIFY(!w.currentItem());
     w.setCurrentItem(i2);
     QVERIFY(!i2->isExpanded());
     QCOMPARE(w.currentItem(), i2);
diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
index 490f87a7ef..c52198fa2c 100644
--- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
@@ -1112,13 +1112,13 @@ void tst_QTreeWidgetItemIterator::updateIfModifiedFromWidget()
     delete item;
     item = *it;
     if (expecteditemIsNull) {
-        QVERIFY(item == 0);
+        QVERIFY(!item);
     } else {
         QVERIFY(item);
         QCOMPARE(item->text(0), expecteditemvalue);
         item = *itRemove;
         if (expectedUpdatedCurrent.isNull()) {
-            QVERIFY(item == 0);
+            QVERIFY(!item);
         } else {
             QCOMPARE(item->text(0), expectedUpdatedCurrent);
         }