tests/auto/network: 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: Icaa1edafcc6e2779fbd6dbc2c058544d6e07f1e9
Reviewed-by: Richard J. Moore <rich@kde.org>

1 files changed, 19 insertions, 19 deletions

diff --git a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index 7dfc02463e..09ccff4968 100644
--- a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -68,7 +68,7 @@ void tst_QNetworkConfiguration::invalidPoint()
 
     QVERIFY(pt.name().isEmpty());
     QVERIFY(!pt.isValid());
-    QVERIFY(pt.type() == QNetworkConfiguration::Invalid);
+    QCOMPARE(pt.type(), QNetworkConfiguration::Invalid);
     QVERIFY(!(pt.state() & QNetworkConfiguration::Defined));
     QVERIFY(!(pt.state() & QNetworkConfiguration::Discovered));
     QVERIFY(!(pt.state() & QNetworkConfiguration::Active));
@@ -77,7 +77,7 @@ void tst_QNetworkConfiguration::invalidPoint()
     QNetworkConfiguration pt2(pt);
     QVERIFY(pt2.name().isEmpty());
     QVERIFY(!pt2.isValid());
-    QVERIFY(pt2.type() == QNetworkConfiguration::Invalid);
+    QCOMPARE(pt2.type(), QNetworkConfiguration::Invalid);
     QVERIFY(!(pt2.state() & QNetworkConfiguration::Defined));
     QVERIFY(!(pt2.state() & QNetworkConfiguration::Discovered));
     QVERIFY(!(pt2.state() & QNetworkConfiguration::Active));
@@ -91,27 +91,27 @@ void tst_QNetworkConfiguration::comparison()
     //compare invalid connection points
     QNetworkConfiguration pt1;
     QVERIFY(!pt1.isValid());
-    QVERIFY(pt1.type() == QNetworkConfiguration::Invalid);
+    QCOMPARE(pt1.type(), QNetworkConfiguration::Invalid);
 
     QNetworkConfiguration pt2(pt1);
     QVERIFY(pt1==pt2);
     QVERIFY(!(pt1!=pt2));
-    QVERIFY(pt1.name() == pt2.name());
-    QVERIFY(pt1.isValid() == pt2.isValid());
-    QVERIFY(pt1.type() == pt2.type());
-    QVERIFY(pt1.state() == pt2.state());
-    QVERIFY(pt1.purpose() == pt2.purpose());
+    QCOMPARE(pt1.name(), pt2.name());
+    QCOMPARE(pt1.isValid(), pt2.isValid());
+    QCOMPARE(pt1.type(), pt2.type());
+    QCOMPARE(pt1.state(), pt2.state());
+    QCOMPARE(pt1.purpose(), pt2.purpose());
 
 
     QNetworkConfiguration pt3;
     pt3 = pt1;
     QVERIFY(pt1==pt3);
     QVERIFY(!(pt1!=pt3));
-    QVERIFY(pt1.name() == pt3.name());
-    QVERIFY(pt1.isValid() == pt3.isValid());
-    QVERIFY(pt1.type() == pt3.type());
-    QVERIFY(pt1.state() == pt3.state());
-    QVERIFY(pt1.purpose() == pt3.purpose());
+    QCOMPARE(pt1.name(), pt3.name());
+    QCOMPARE(pt1.isValid(), pt3.isValid());
+    QCOMPARE(pt1.type(), pt3.type());
+    QCOMPARE(pt1.state(), pt3.state());
+    QCOMPARE(pt1.purpose(), pt3.purpose());
 
     //test case must run on machine that has valid connection points
     QNetworkConfigurationManager manager;
@@ -131,11 +131,11 @@ void tst_QNetworkConfiguration::comparison()
     pt3 = defaultConfig;
     QVERIFY(defaultConfig==pt3);
     QVERIFY(!(defaultConfig!=pt3));
-    QVERIFY(defaultConfig.name() == pt3.name());
-    QVERIFY(defaultConfig.isValid() == pt3.isValid());
-    QVERIFY(defaultConfig.type() == pt3.type());
-    QVERIFY(defaultConfig.state() == pt3.state());
-    QVERIFY(defaultConfig.purpose() == pt3.purpose());
+    QCOMPARE(defaultConfig.name(), pt3.name());
+    QCOMPARE(defaultConfig.isValid(), pt3.isValid());
+    QCOMPARE(defaultConfig.type(), pt3.type());
+    QCOMPARE(defaultConfig.state(), pt3.state());
+    QCOMPARE(defaultConfig.purpose(), pt3.purpose());
 }
 
 void tst_QNetworkConfiguration::children()
@@ -178,7 +178,7 @@ void tst_QNetworkConfiguration::isRoamingAvailable()
             if ( c.children().count() <= 1 )
                 QVERIFY(!c.isRoamingAvailable());
             foreach(QNetworkConfiguration child, c.children()) {
-                QVERIFY(QNetworkConfiguration::InternetAccessPoint == child.type());
+                QCOMPARE(QNetworkConfiguration::InternetAccessPoint, child.type());
                 QCOMPARE(child.children().count(), 0);
             }
         } else {