summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/socket')
-rw-r--r--tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp2
-rw-r--r--tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp7
-rw-r--r--tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp3
-rw-r--r--tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp3
4 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 8cc06a77ba..74bffef4f4 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -698,7 +698,7 @@ void tst_QLocalSocket::simpleCommandProtocol2()
QObject::connect(localSocketRead, &QLocalSocket::readyRead, [&] {
forever {
- if (localSocketRead->bytesAvailable() < sizeof(qint64))
+ if (localSocketRead->bytesAvailable() < qint64(sizeof(qint64)))
return;
if (blockSize == 0) {
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 5a0baf73b5..4bbd0662e4 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -929,15 +929,16 @@ void tst_QTcpServer::linkLocal()
//each server should have two connections
foreach (QTcpServer* server, servers) {
- QTcpSocket* remote;
//qDebug() << "checking for connections" << server->serverAddress() << ":" << server->serverPort();
QVERIFY(server->waitForNewConnection(5000));
- QVERIFY(remote = server->nextPendingConnection());
+ QTcpSocket* remote = server->nextPendingConnection();
+ QVERIFY(remote != nullptr);
remote->close();
delete remote;
if (!server->hasPendingConnections())
QVERIFY(server->waitForNewConnection(5000));
- QVERIFY(remote = server->nextPendingConnection());
+ remote = server->nextPendingConnection();
+ QVERIFY(remote != nullptr);
remote->close();
delete remote;
QVERIFY(!server->hasPendingConnections());
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
index 407d244f15..ed61db1a13 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
@@ -47,7 +47,8 @@ void My4Socket::read(void)
{
QDataStream in(this);
- quint32 num, reply;
+ quint32 num = 0;
+ quint32 reply = 0;
while (bytesAvailable()) {
in >> num;
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index fb6b0c6e32..fe1057bdde 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -2251,7 +2251,8 @@ void tst_QTcpSocket::abortiveClose()
enterLoop(10);
QVERIFY(server.hasPendingConnections());
- QVERIFY(tmpSocket = server.nextPendingConnection());
+ tmpSocket = server.nextPendingConnection();
+ QVERIFY(tmpSocket != nullptr);
qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
QSignalSpy readyReadSpy(clientSocket, SIGNAL(readyRead()));