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>

1 files changed, 22 insertions, 22 deletions

diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index 5a03446b90..adc768f828 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
@@ -141,14 +141,14 @@ void tst_QTextBrowser::noReloadOnAnchorJump()
     browser->setSource(url);
     QCOMPARE(browser->htmlLoadAttempts, 1);
     QVERIFY(!browser->toPlainText().isEmpty());
-    QVERIFY(browser->source() == url);
+    QCOMPARE(browser->source(), url);
 }
 
 void tst_QTextBrowser::bgColorOnSourceChange()
 {
     browser->setSource(QUrl::fromLocalFile("pagewithbg.html"));
     QVERIFY(browser->document()->rootFrame()->frameFormat().hasProperty(QTextFormat::BackgroundBrush));
-    QVERIFY(browser->document()->rootFrame()->frameFormat().background().color() == Qt::blue);
+    QCOMPARE(browser->document()->rootFrame()->frameFormat().background().color(), QColor(Qt::blue));
 
     browser->setSource(QUrl::fromLocalFile("pagewithoutbg.html"));
     QVERIFY(!browser->document()->rootFrame()->frameFormat().hasProperty(QTextFormat::BackgroundBrush));
@@ -167,12 +167,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     QVariant val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(browser->historyTitle(-1).isEmpty());
@@ -185,12 +185,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(val.toBool());
 
     QCOMPARE(browser->historyTitle(-1), QString("Page With BG"));
@@ -201,12 +201,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(browser->historyTitle(-1).isEmpty());
@@ -217,12 +217,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(val.toBool());
 }
 
@@ -244,29 +244,29 @@ void tst_QTextBrowser::relativeLinks()
     QSignalSpy sourceChangedSpy(browser, SIGNAL(sourceChanged(QUrl)));
     browser->setSource(QUrl("subdir/../qtextbrowser.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/../qtextbrowser.html"));
     browser->setSource(QUrl("subdir/index.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/index.html"));
     browser->setSource(QUrl("anchor.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("anchor.html"));
     browser->setSource(QUrl("subdir/index.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/index.html"));
 
     // using QUrl::fromLocalFile()
     browser->setSource(QUrl::fromLocalFile("anchor.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("file:anchor.html"));
     browser->setSource(QUrl("subdir/../qtextbrowser.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/../qtextbrowser.html"));
 }
 
@@ -446,13 +446,13 @@ void tst_QTextBrowser::sourceInsideLoadResource()
 void tst_QTextBrowser::textInteractionFlags_vs_readOnly()
 {
     QVERIFY(browser->isReadOnly());
-    QVERIFY(browser->textInteractionFlags() == Qt::TextBrowserInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextBrowserInteraction);
     browser->setReadOnly(true);
-    QVERIFY(browser->textInteractionFlags() == Qt::TextBrowserInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextBrowserInteraction);
     browser->setReadOnly(false);
-    QVERIFY(browser->textInteractionFlags() == Qt::TextEditorInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextEditorInteraction);
     browser->setReadOnly(true);
-    QVERIFY(browser->textInteractionFlags() == Qt::TextBrowserInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextBrowserInteraction);
 }
 
 void tst_QTextBrowser::anchorsWithSelfBuiltHtml()
@@ -525,7 +525,7 @@ void tst_QTextBrowser::loadResourceOnRelativeLocalFiles()
     QVERIFY(!browser->toPlainText().isEmpty());
     QVariant v = browser->loadResource(QTextDocument::HtmlResource, QUrl("../anchor.html"));
     QVERIFY(v.isValid());
-    QVERIFY(v.type() == QVariant::ByteArray);
+    QCOMPARE(v.type(), QVariant::ByteArray);
     QVERIFY(!v.toByteArray().isEmpty());
 }
 
@@ -658,7 +658,7 @@ void tst_QTextBrowser::urlEncoding()
     QCOMPARE(spy.count(), 1);
 
     QUrl url = spy.at(0).at(0).toUrl();
-    QVERIFY(url.toEncoded() == QByteArray("http://www.google.com/q=%22"));
+    QCOMPARE(url.toEncoded(), QByteArray("http://www.google.com/q=%22"));
 
     delete browser;
 }