diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-04 20:32:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-05 03:03:02 +0200 |
| commit | 10ed50002c2ad6f4caaa7b922af5a9f1d3d91f52 (patch) | |
| tree | 6c4a723eba010272ae366ba6b78a410e5cbfabcd /tests/auto/network/socket/qlocalsocket | |
| parent | 0102f34f1ebe91aaff6fb2edc83a7ebf7ffb4d1e (diff) | |
test: Check for null string comparison
Do not compare a QString to QString(). Instead use the .isEmpty() method.
Change-Id: I8bb5e64563bf173abe7288bb9e35375bee1fe445
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/network/socket/qlocalsocket')
| -rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index c0dc3e1b52..a26e0b4175 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -259,7 +259,7 @@ void tst_QLocalSocket::socket_basic() socket.close(); socket.disconnectFromServer(); QCOMPARE(QLocalSocket::UnknownSocketError, socket.error()); - QVERIFY(socket.errorString() != QString()); + QVERIFY(!socket.errorString().isEmpty()); QCOMPARE(socket.flush(), false); QCOMPARE(socket.isValid(), false); QVERIFY(socket.readBufferSize() == 0); @@ -307,12 +307,12 @@ void tst_QLocalSocket::listen() QCOMPARE(server.hits.count(), 0); QCOMPARE(spyNewConnection.count(), 0); if (canListen) { - QVERIFY(server.errorString() == QString()); + QVERIFY(server.errorString().isEmpty()); QCOMPARE(server.serverError(), QAbstractSocket::UnknownSocketError); // already isListening QVERIFY(!server.listen(name)); } else { - QVERIFY(server.errorString() != QString()); + QVERIFY(!server.errorString().isEmpty()); QCOMPARE(server.serverError(), QAbstractSocket::HostNotFoundError); } QCOMPARE(server.maxPendingConnections(), 30); @@ -379,7 +379,7 @@ void tst_QLocalSocket::listenAndConnect() //QVERIFY(socket->socketDescriptor() != -1); QCOMPARE(spyError.count(), 0); } else { - QVERIFY(socket->errorString() != QString()); + QVERIFY(!socket->errorString().isEmpty()); QVERIFY(socket->error() != QLocalSocket::UnknownSocketError); QCOMPARE(socket->state(), QLocalSocket::UnconnectedState); //QVERIFY(socket->socketDescriptor() == -1); @@ -434,7 +434,7 @@ void tst_QLocalSocket::listenAndConnect() QVERIFY(server.nextPendingConnection() != (QLocalSocket*)0); QTRY_COMPARE(server.hits.count(), i + 1); QCOMPARE(spyNewConnection.count(), i + 1); - QVERIFY(server.errorString() == QString()); + QVERIFY(server.errorString().isEmpty()); QCOMPARE(server.serverError(), QAbstractSocket::UnknownSocketError); } else { QVERIFY(server.serverName().isEmpty()); @@ -442,7 +442,7 @@ void tst_QLocalSocket::listenAndConnect() QVERIFY(server.nextPendingConnection() == (QLocalSocket*)0); QCOMPARE(spyNewConnection.count(), 0); QCOMPARE(server.hits.count(), 0); - QVERIFY(server.errorString() != QString()); + QVERIFY(!server.errorString().isEmpty()); QCOMPARE(server.serverError(), QAbstractSocket::HostNotFoundError); } } |