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>

1 files changed, 23 insertions, 23 deletions

diff --git a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
index c57123af61..03e557d8dd 100644
--- a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
@@ -113,11 +113,11 @@ void tst_QTextList::autoNumbering()
     for (int i = 0; i < 27; ++i)
         cursor.insertBlock();
 
-    QVERIFY(list->count() == 28);
+    QCOMPARE(list->count(), 28);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 27);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "ab.");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 27);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("ab."));
 }
 
 void tst_QTextList::autoNumberingPrefixAndSuffix()
@@ -132,11 +132,11 @@ void tst_QTextList::autoNumberingPrefixAndSuffix()
     for (int i = 0; i < 27; ++i)
         cursor.insertBlock();
 
-    QVERIFY(list->count() == 28);
+    QCOMPARE(list->count(), 28);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 27);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "-ab)");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 27);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("-ab)"));
 }
 
 void tst_QTextList::autoNumberingPrefixAndSuffixRTL()
@@ -154,9 +154,9 @@ void tst_QTextList::autoNumberingPrefixAndSuffixRTL()
 
     cursor.insertBlock();
 
-    QVERIFY(list->count() == 2);
+    QCOMPARE(list->count(), 2);
 
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "*B-");
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("*B-"));
 }
 
 void tst_QTextList::autoNumberingPrefixAndSuffixHtmlExportImport()
@@ -174,7 +174,7 @@ void tst_QTextList::autoNumberingPrefixAndSuffixHtmlExportImport()
     for (int i = 0; i < 27; ++i)
         cursor.insertBlock();
 
-    QVERIFY(list->count() == 28);
+    QCOMPARE(list->count(), 28);
 
     QString htmlExport = doc->toHtml();
     QTextDocument importDoc;
@@ -185,9 +185,9 @@ void tst_QTextList::autoNumberingPrefixAndSuffixHtmlExportImport()
         importCursor.movePosition(QTextCursor::NextBlock);
 
     QVERIFY(importCursor.currentList());
-    QVERIFY(importCursor.currentList()->itemNumber(importCursor.block()) == 27);
-    QVERIFY(importCursor.currentList()->itemText(importCursor.block()) == "\"ab#");
-    QVERIFY(importCursor.currentList()->format().indent() == 10);
+    QCOMPARE(importCursor.currentList()->itemNumber(importCursor.block()), 27);
+    QCOMPARE(importCursor.currentList()->itemText(importCursor.block()), QLatin1String("\"ab#"));
+    QCOMPARE(importCursor.currentList()->format().indent(), 10);
 }
 
 void tst_QTextList::autoNumberingRTL()
@@ -203,9 +203,9 @@ void tst_QTextList::autoNumberingRTL()
 
     cursor.insertBlock();
 
-    QVERIFY(list->count() == 2);
+    QCOMPARE(list->count(), 2);
 
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == ".B");
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String(".B"));
 }
 
 void tst_QTextList::romanNumbering()
@@ -218,11 +218,11 @@ void tst_QTextList::romanNumbering()
     for (int i = 0; i < 4998; ++i)
       cursor.insertBlock();
 
-    QVERIFY(list->count() == 4999);
+    QCOMPARE(list->count(), 4999);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 4998);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "MMMMCMXCIX.");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 4998);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("MMMMCMXCIX."));
 }
 
 void tst_QTextList::romanNumberingLimit()
@@ -235,11 +235,11 @@ void tst_QTextList::romanNumberingLimit()
     for (int i = 0; i < 4999; ++i)
       cursor.insertBlock();
 
-    QVERIFY(list->count() == 5000);
+    QCOMPARE(list->count(), 5000);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 4999);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "?.");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 4999);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("?."));
 }
 
 void tst_QTextList::formatChange()
@@ -257,12 +257,12 @@ void tst_QTextList::formatChange()
     QVERIFY(list && list->count() == 2);
 
     QTextBlockFormat bfmt = cursor.blockFormat();
-//     QVERIFY(bfmt.object() == list);
+//     QCOMPARE(bfmt.object(), list);
 
     bfmt.setObjectIndex(-1);
     cursor.setBlockFormat(bfmt);
 
-    QVERIFY(firstList->count() == 1);
+    QCOMPARE(firstList->count(), 1);
 }
 
 void tst_QTextList::cursorNavigation()
@@ -282,7 +282,7 @@ void tst_QTextList::cursorNavigation()
     QVERIFY(cursor.currentList());
     cursor.movePosition(QTextCursor::PreviousBlock);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 0);
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 0);
 }
 
 void tst_QTextList::partialRemoval()