AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Check for null string comparison

Browse Source 
Do not compare a QString to QString(). Instead use the .isEmpty() method.

Change-Id: I8bb5e64563bf173abe7288bb9e35375bee1fe445
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Sergio Ahumada 2012-09-04 20:32:33 +02:00 committed by Qt by Nokia
parent 0102f34f1e
commit 10ed50002c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
View File

@ -259,7 +259,7 @@ void tst_QLocalSocket::socket_basic()
socket.close(); socket.close();
socket.disconnectFromServer(); socket.disconnectFromServer();
QCOMPARE(QLocalSocket::UnknownSocketError, socket.error()); QCOMPARE(QLocalSocket::UnknownSocketError, socket.error());
QVERIFY(socket.errorString() != QString()); QVERIFY(!socket.errorString().isEmpty());
QCOMPARE(socket.flush(), false); QCOMPARE(socket.flush(), false);
QCOMPARE(socket.isValid(), false); QCOMPARE(socket.isValid(), false);
QVERIFY(socket.readBufferSize() == 0); QVERIFY(socket.readBufferSize() == 0);
@ -307,12 +307,12 @@ void tst_QLocalSocket::listen()
QCOMPARE(server.hits.count(), 0); QCOMPARE(server.hits.count(), 0);
QCOMPARE(spyNewConnection.count(), 0); QCOMPARE(spyNewConnection.count(), 0);
if (canListen) { if (canListen) {
QVERIFY(server.errorString() == QString()); QVERIFY(server.errorString().isEmpty());
QCOMPARE(server.serverError(), QAbstractSocket::UnknownSocketError); QCOMPARE(server.serverError(), QAbstractSocket::UnknownSocketError);
// already isListening // already isListening
QVERIFY(!server.listen(name)); QVERIFY(!server.listen(name));
} else { } else {
QVERIFY(server.errorString() != QString()); QVERIFY(!server.errorString().isEmpty());
QCOMPARE(server.serverError(), QAbstractSocket::HostNotFoundError); QCOMPARE(server.serverError(), QAbstractSocket::HostNotFoundError);
} }
QCOMPARE(server.maxPendingConnections(), 30); QCOMPARE(server.maxPendingConnections(), 30);
@ -379,7 +379,7 @@ void tst_QLocalSocket::listenAndConnect()
//QVERIFY(socket->socketDescriptor() != -1); //QVERIFY(socket->socketDescriptor() != -1);
QCOMPARE(spyError.count(), 0); QCOMPARE(spyError.count(), 0);
} else { } else {
QVERIFY(socket->errorString() != QString()); QVERIFY(!socket->errorString().isEmpty());
QVERIFY(socket->error() != QLocalSocket::UnknownSocketError); QVERIFY(socket->error() != QLocalSocket::UnknownSocketError);
QCOMPARE(socket->state(), QLocalSocket::UnconnectedState); QCOMPARE(socket->state(), QLocalSocket::UnconnectedState);
//QVERIFY(socket->socketDescriptor() == -1); //QVERIFY(socket->socketDescriptor() == -1);
@ -434,7 +434,7 @@ void tst_QLocalSocket::listenAndConnect()
QVERIFY(server.nextPendingConnection() != (QLocalSocket*)0); QVERIFY(server.nextPendingConnection() != (QLocalSocket*)0);
QTRY_COMPARE(server.hits.count(), i + 1); QTRY_COMPARE(server.hits.count(), i + 1);
QCOMPARE(spyNewConnection.count(), i + 1); QCOMPARE(spyNewConnection.count(), i + 1);
QVERIFY(server.errorString() == QString()); QVERIFY(server.errorString().isEmpty());
QCOMPARE(server.serverError(), QAbstractSocket::UnknownSocketError); QCOMPARE(server.serverError(), QAbstractSocket::UnknownSocketError);
} else { } else {
QVERIFY(server.serverName().isEmpty()); QVERIFY(server.serverName().isEmpty());
@ -442,7 +442,7 @@ void tst_QLocalSocket::listenAndConnect()
QVERIFY(server.nextPendingConnection() == (QLocalSocket*)0); QVERIFY(server.nextPendingConnection() == (QLocalSocket*)0);
QCOMPARE(spyNewConnection.count(), 0); QCOMPARE(spyNewConnection.count(), 0);
QCOMPARE(server.hits.count(), 0); QCOMPARE(server.hits.count(), 0);
QVERIFY(server.errorString() != QString()); QVERIFY(!server.errorString().isEmpty());
QCOMPARE(server.serverError(), QAbstractSocket::HostNotFoundError); QCOMPARE(server.serverError(), QAbstractSocket::HostNotFoundError);
} }
} }