From 3859b304e846b4ee8e77350945b6c63bbb487e13 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Thu, 30 Jul 2015 15:15:12 +0200
Subject: 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>
---
 .../text/qtextpiecetable/tst_qtextpiecetable.cpp   | 336 ++++++++++-----------
 1 file changed, 168 insertions(+), 168 deletions(-)

(limited to 'tests/auto/gui/text/qtextpiecetable')

diff --git a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
index ae8948a61f..cd43849729 100644
--- a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -157,7 +157,7 @@ void tst_QTextPieceTable::insertion3()
         table->insert(pos, str, charFormatIndex);
         compare.insert(pos, str);
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::insertion4()
@@ -176,7 +176,7 @@ void tst_QTextPieceTable::insertion4()
 //            exit(12);
 //        }
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::insertion5()
@@ -196,10 +196,10 @@ void tst_QTextPieceTable::insertion5()
         }
         compare.insert(pos, str);
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
     for (QTextBlock it = table->blocksBegin(); it != table->blocksEnd(); it = it.next()) {
         QTextDocumentPrivate::FragmentIterator fit = table->find(it.position());
-        QVERIFY(fit.position() == it.position());
+        QCOMPARE(fit.position(), it.position());
     }
 }
 
@@ -260,7 +260,7 @@ void tst_QTextPieceTable::removal3()
 //            exit(12);
 //        }
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::removal4()
@@ -294,7 +294,7 @@ void tst_QTextPieceTable::removal4()
 //            exit(12);
 //        }
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::undoRedo1()
@@ -392,7 +392,7 @@ void tst_QTextPieceTable::undoRedo6()
     QTextBlockFormat bfmt;
     bfmt.setAlignment(Qt::AlignHCenter);
     cursor.setBlockFormat(bfmt);
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
 
     QTextCursor range = cursor;
     range.clearSelection();
@@ -404,11 +404,11 @@ void tst_QTextPieceTable::undoRedo6()
     range.mergeCharFormat(modifier);
 
     cursor.movePosition(QTextCursor::Start);
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
 
     doc.undo();
 
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
 }
 
 void tst_QTextPieceTable::undoRedo7()
@@ -497,13 +497,13 @@ void tst_QTextPieceTable::undoRedo11()
         }
         l += remove ? -1 : 2;
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
     for (int i = 0; i < loops; ++i)
         table->undo();
-    QVERIFY(table->plainText() == QString(""));
+    QCOMPARE(table->plainText(), QString(""));
     for (int i = 0; i < loops; ++i)
         table->redo();
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 
@@ -693,9 +693,9 @@ void tst_QTextPieceTable::setBlockFormat()
     QTextBlock b = table->blocksFind(1);
     table->setBlockFormat(b, b, newbfmt);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == bfmt);
-    QVERIFY(table->blocksFind(1).blockFormat() == newbfmt);
-    QVERIFY(table->blocksFind(2).blockFormat() == bfmt);
+    QCOMPARE(table->blocksFind(0).blockFormat(), bfmt);
+    QCOMPARE(table->blocksFind(1).blockFormat(), newbfmt);
+    QCOMPARE(table->blocksFind(2).blockFormat(), bfmt);
 }
 
 
@@ -705,19 +705,19 @@ void tst_QTextPieceTable::blockInsertion()
     fmt.setTopMargin(100);
     int idx = table->formatCollection()->indexForFormat(fmt);
     int charFormat = table->formatCollection()->indexForFormat(QTextCharFormat());
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
 
     table->insertBlock(0, idx, charFormat);
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).blockFormat() == fmt);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).blockFormat(), fmt);
 
     table->undo();
-    QVERIFY(table->blockMap().length() == 1);
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blockMap().length(), 1);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
 
     table->redo();
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).blockFormat() == fmt);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).blockFormat(), fmt);
 }
 
 void tst_QTextPieceTable::blockInsertion2()
@@ -755,37 +755,37 @@ void tst_QTextPieceTable::blockRemoval1()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->beginEditBlock();
     table->remove(5, 5);
     table->endEditBlock();
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 5);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 5);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 5);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 5);
 }
 
 void tst_QTextPieceTable::blockRemoval2()
@@ -803,35 +803,35 @@ void tst_QTextPieceTable::blockRemoval2()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->remove(4, 1);
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(6).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 0);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(6).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 0);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(6).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 0);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(6).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 0);
 }
 
 void tst_QTextPieceTable::blockRemoval3()
@@ -849,38 +849,38 @@ void tst_QTextPieceTable::blockRemoval3()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->beginEditBlock();
     table->remove(3, 4);
     table->endEditBlock();
 
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 }
 
 void tst_QTextPieceTable::blockRemoval4()
@@ -899,35 +899,35 @@ void tst_QTextPieceTable::blockRemoval4()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->remove(3, 7);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
 #endif
 }
 
@@ -946,38 +946,38 @@ void tst_QTextPieceTable::blockRemoval5()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->beginEditBlock();
     table->remove(3, 8);
     table->endEditBlock();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 }
 
 
@@ -996,66 +996,66 @@ void tst_QTextPieceTable::checkFrames1()
     QPointer<QTextFrame> frame = table->insertFrame(1, 3, ffmt);
     QTextFrame *root = table->rootFrame();
 
-    QVERIFY(root == frame->parentFrame());
+    QCOMPARE(root, frame->parentFrame());
 
     QVERIFY(root);
-    QVERIFY(root->parentFrame() == 0);
+    QVERIFY(!root->parentFrame());
 
-    QVERIFY(root->childFrames().count() == 1);
+    QCOMPARE(root->childFrames().count(), 1);
     QVERIFY(frame->format() == ffmt);
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 4);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 4);
 
 
     QPointer<QTextFrame> frame2 = table->insertFrame(2, 3, ffmt);
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame);
-    QVERIFY(frame->childFrames().count() == 1);
-    QVERIFY(frame2->childFrames().count() == 0);
-    QVERIFY(frame2->parentFrame() == frame);
-    QVERIFY(frame2->firstPosition() == 3);
-    QVERIFY(frame2->lastPosition() == 4);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame.data());
+    QCOMPARE(frame->childFrames().count(), 1);
+    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->parentFrame(), frame.data());
+    QCOMPARE(frame2->firstPosition(), 3);
+    QCOMPARE(frame2->lastPosition(), 4);
 
     QVERIFY(frame->format() == ffmt);
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 6);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 6);
 
     table->removeFrame(frame);
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame2);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame2.data());
     QVERIFY(!frame);
-    QVERIFY(frame2->childFrames().count() == 0);
-    QVERIFY(frame2->parentFrame() == root);
-    QVERIFY(frame2->firstPosition() == 2);
-    QVERIFY(frame2->lastPosition() == 3);
+    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->parentFrame(), root);
+    QCOMPARE(frame2->firstPosition(), 2);
+    QCOMPARE(frame2->lastPosition(), 3);
 
     table->undo();
 
     frame = table->frameAt(2);
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame);
-    QVERIFY(frame->childFrames().count() == 1);
-    QVERIFY(frame->childFrames().at(0) == frame2);
-    QVERIFY(frame2->childFrames().count() == 0);
-    QVERIFY(frame2->parentFrame() == frame);
-    QVERIFY(frame2->firstPosition() == 3);
-    QVERIFY(frame2->lastPosition() == 4);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame.data());
+    QCOMPARE(frame->childFrames().count(), 1);
+    QCOMPARE(frame->childFrames().at(0), frame2.data());
+    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->parentFrame(), frame.data());
+    QCOMPARE(frame2->firstPosition(), 3);
+    QCOMPARE(frame2->lastPosition(), 4);
 
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 6);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 6);
 
     table->undo();
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame);
-    QVERIFY(frame->childFrames().count() == 0);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame.data());
+    QCOMPARE(frame->childFrames().count(), 0);
     QVERIFY(!frame2);
 
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 4);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 4);
 }
 
 void tst_QTextPieceTable::removeFrameDirect()
@@ -1065,7 +1065,7 @@ void tst_QTextPieceTable::removeFrameDirect()
 
     QTextFrame *frame = table->insertFrame(1, 5, ffmt);
 
-    QVERIFY(frame->parentFrame() == table->rootFrame());
+    QCOMPARE(frame->parentFrame(), table->rootFrame());
 
     const int start = frame->firstPosition() - 1;
     const int end = frame->lastPosition();
-- 
cgit v1.2.3