Tests: Use QCOMPARE() with QLatin1String() for QString values.

Prefer QCOMPARE over QVERIFY for equality and use QLatin1String().

Change-Id: If226a0fc7b25be3e6774c7e36ca1e6f99234e5dd
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index df60501628..8d6bfc1f1b 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -189,7 +189,7 @@ private slots:
     }
     void slotError(QLocalSocket::LocalSocketError newError)
     {
-        QVERIFY(errorString() != "Unknown error");
+        QVERIFY(errorString() != QLatin1String("Unknown error"));
         QCOMPARE(error(), newError);
     }
     void slotStateChanged(QLocalSocket::LocalSocketState newState)
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 8da656aab7..bd43961ea2 100644
--- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -613,8 +613,8 @@ void tst_QSocks5SocketEngine::tcpSocketBlockingTest()
 
     // Read greeting
     QVERIFY(socket.waitForReadyRead(5000));
-    QString s = socket.readLine();
-    QVERIFY2(QtNetworkSettings::compareReplyIMAP(s.toLatin1()), s.toLatin1().constData());
+    QByteArray s = socket.readLine();
+    QVERIFY2(QtNetworkSettings::compareReplyIMAP(s), s.constData());
 
     // Write NOOP
     QCOMPARE((int) socket.write("1 NOOP\r\n", 8), 8);
@@ -624,7 +624,7 @@ void tst_QSocks5SocketEngine::tcpSocketBlockingTest()
 
     // Read response
     s = socket.readLine();
-    QCOMPARE(s.toLatin1().constData(), "1 OK Completed\r\n");
+    QCOMPARE(s, QByteArrayLiteral("1 OK Completed\r\n"));
 
     // Write LOGOUT
     QCOMPARE((int) socket.write("2 LOGOUT\r\n", 10), 10);
@@ -634,13 +634,13 @@ void tst_QSocks5SocketEngine::tcpSocketBlockingTest()
 
     // Read two lines of respose
     s = socket.readLine();
-    QCOMPARE(s.toLatin1().constData(), "* BYE LOGOUT received\r\n");
+    QCOMPARE(s, QByteArrayLiteral("* BYE LOGOUT received\r\n"));
 
     if (!socket.canReadLine())
         QVERIFY(socket.waitForReadyRead(5000));
 
     s = socket.readLine();
-    QCOMPARE(s.toLatin1().constData(), "2 OK Completed\r\n");
+    QCOMPARE(s, QByteArrayLiteral("2 OK Completed\r\n"));
 
     // Close the socket
     socket.close();
@@ -715,7 +715,7 @@ void tst_QSocks5SocketEngine::tcpSocketNonBlockingTest()
 
     // Read response
     QVERIFY(!tcpSocketNonBlocking_data.isEmpty());
-    QCOMPARE(tcpSocketNonBlocking_data.at(0).toLatin1().constData(), "1 OK Completed\r\n");
+    QCOMPARE(tcpSocketNonBlocking_data.at(0), QLatin1String("1 OK Completed\r\n"));
     tcpSocketNonBlocking_data.clear();
 
 
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index 0e597e39e2..0c217195a0 100644
--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@@ -844,7 +844,7 @@ void tst_QSslCertificate::nulInCN()
     QVERIFY(!cert.isNull());
 
     QString cn = cert.subjectInfo(QSslCertificate::CommonName)[0];
-    QVERIFY(cn != "www.bank.com");
+    QVERIFY(cn != QLatin1String("www.bank.com"));
 
     static const char realCN[] = "www.bank.com\0.badguy.com";
     QCOMPARE(cn, QString::fromLatin1(realCN, sizeof realCN - 1));