diff options
Diffstat (limited to 'tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp')
-rw-r--r-- | tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp index b627fe3..d6dd356 100644 --- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp +++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp @@ -179,7 +179,7 @@ void tst_QWebSocketServer::tst_initialisation() #ifndef QT_NO_SSL QCOMPARE(server.sslConfiguration(), QSslConfiguration::defaultConfiguration()); #endif - QCOMPARE(server.supportedVersions().count(), 1); + QCOMPARE(server.supportedVersions().size(), 1); QCOMPARE(server.supportedVersions().at(0), QWebSocketProtocol::VersionLatest); QCOMPARE(server.supportedVersions().at(0), QWebSocketProtocol::Version13); @@ -204,7 +204,7 @@ void tst_QWebSocketServer::tst_initialisation() #ifndef QT_NO_SSL QCOMPARE(server.sslConfiguration(), QSslConfiguration::defaultConfiguration()); #endif - QCOMPARE(server.supportedVersions().count(), 1); + QCOMPARE(server.supportedVersions().size(), 1); QCOMPARE(server.supportedVersions().at(0), QWebSocketProtocol::VersionLatest); QCOMPARE(server.supportedVersions().at(0), QWebSocketProtocol::Version13); QCOMPARE(server.serverUrl(), QUrl()); @@ -288,26 +288,26 @@ void tst_QWebSocketServer::tst_listening() QVERIFY(server.listen()); //listen on all network interface, choose an appropriate port QVERIFY(server.isListening()); - QCOMPARE(serverClosedSpy.count(), 0); + QCOMPARE(serverClosedSpy.size(), 0); server.close(); - QTRY_COMPARE(serverClosedSpy.count(), 1); + QTRY_COMPARE(serverClosedSpy.size(), 1); QVERIFY(!server.isListening()); - QCOMPARE(serverErrorSpy.count(), 0); + QCOMPARE(serverErrorSpy.size(), 0); QVERIFY(!server.listen(QHostAddress(QStringLiteral("1.2.3.4")), 0)); QCOMPARE(server.error(), QWebSocketProtocol::CloseCodeAbnormalDisconnection); QCOMPARE(server.errorString().toLatin1().constData(), "The address is not available"); QVERIFY(!server.isListening()); - QCOMPARE(serverAcceptErrorSpy.count(), 0); - QCOMPARE(serverConnectionSpy.count(), 0); - QCOMPARE(corsAuthenticationSpy.count(), 0); + QCOMPARE(serverAcceptErrorSpy.size(), 0); + QCOMPARE(serverConnectionSpy.size(), 0); + QCOMPARE(corsAuthenticationSpy.size(), 0); #ifndef QT_NO_SSL - QCOMPARE(peerVerifyErrorSpy.count(), 0); - QCOMPARE(sslErrorsSpy.count(), 0); + QCOMPARE(peerVerifyErrorSpy.size(), 0); + QCOMPARE(sslErrorsSpy.size(), 0); #endif - QCOMPARE(serverErrorSpy.count(), 1); - QCOMPARE(serverClosedSpy.count(), 1); + QCOMPARE(serverErrorSpy.size(), 1); + QCOMPARE(serverClosedSpy.size(), 1); } void tst_QWebSocketServer::tst_connectivity() @@ -336,21 +336,21 @@ void tst_QWebSocketServer::tst_connectivity() socket.open(server.serverUrl().toString()); - QTRY_COMPARE(socketConnectedSpy.count(), 1); + QTRY_COMPARE(socketConnectedSpy.size(), 1); QCOMPARE(socket.state(), QAbstractSocket::ConnectedState); - QCOMPARE(serverConnectionSpy.count(), 1); - QCOMPARE(corsAuthenticationSpy.count(), 1); + QCOMPARE(serverConnectionSpy.size(), 1); + QCOMPARE(corsAuthenticationSpy.size(), 1); - QCOMPARE(serverClosedSpy.count(), 0); + QCOMPARE(serverClosedSpy.size(), 0); server.close(); - QTRY_COMPARE(serverClosedSpy.count(), 1); + QTRY_COMPARE(serverClosedSpy.size(), 1); #ifndef QT_NO_SSL - QCOMPARE(peerVerifyErrorSpy.count(), 0); - QCOMPARE(sslErrorsSpy.count(), 0); + QCOMPARE(peerVerifyErrorSpy.size(), 0); + QCOMPARE(sslErrorsSpy.size(), 0); #endif - QCOMPARE(serverErrorSpy.count(), 0); + QCOMPARE(serverErrorSpy.size(), 0); } void tst_QWebSocketServer::tst_protocols_data() @@ -385,7 +385,7 @@ void tst_QWebSocketServer::tst_protocols() client.open(server.serverUrl(), opt); QTRY_COMPARE(client.state(), QAbstractSocket::ConnectedState); - QTRY_COMPARE(newConnectionSpy.count(), 1); + QTRY_COMPARE(newConnectionSpy.size(), 1); auto *serverSocket = server.nextPendingConnection(); QVERIFY(serverSocket); @@ -463,19 +463,19 @@ void tst_QWebSocketServer::tst_preSharedKey() socket.open(server.serverUrl().toString()); - QTRY_COMPARE(socketConnectedSpy.count(), 1); + QTRY_COMPARE(socketConnectedSpy.size(), 1); QCOMPARE(socket.state(), QAbstractSocket::ConnectedState); - QCOMPARE(serverConnectionSpy.count(), 1); - QCOMPARE(serverPskRequiredSpy.count(), 1); - QCOMPARE(socketPskRequiredSpy.count(), 1); + QCOMPARE(serverConnectionSpy.size(), 1); + QCOMPARE(serverPskRequiredSpy.size(), 1); + QCOMPARE(socketPskRequiredSpy.size(), 1); - QCOMPARE(serverClosedSpy.count(), 0); + QCOMPARE(serverClosedSpy.size(), 0); server.close(); - QTRY_COMPARE(serverClosedSpy.count(), 1); - QCOMPARE(sslErrorsSpy.count(), 0); - QCOMPARE(serverErrorSpy.count(), 0); + QTRY_COMPARE(serverClosedSpy.size(), 1); + QCOMPARE(sslErrorsSpy.size(), 0); + QCOMPARE(serverErrorSpy.size(), 0); } void tst_QWebSocketServer::tst_maxPendingConnections() @@ -511,21 +511,21 @@ void tst_QWebSocketServer::tst_maxPendingConnections() socket1.open(server.serverUrl().toString()); - QTRY_COMPARE(socket1ConnectedSpy.count(), 1); + QTRY_COMPARE(socket1ConnectedSpy.size(), 1); QCOMPARE(socket1.state(), QAbstractSocket::ConnectedState); - QCOMPARE(serverConnectionSpy.count(), 1); - QCOMPARE(corsAuthenticationSpy.count(), 1); + QCOMPARE(serverConnectionSpy.size(), 1); + QCOMPARE(corsAuthenticationSpy.size(), 1); socket2.open(server.serverUrl().toString()); - QTRY_COMPARE(socket2ConnectedSpy.count(), 1); + QTRY_COMPARE(socket2ConnectedSpy.size(), 1); QCOMPARE(socket2.state(), QAbstractSocket::ConnectedState); - QCOMPARE(serverConnectionSpy.count(), 2); - QCOMPARE(corsAuthenticationSpy.count(), 2); + QCOMPARE(serverConnectionSpy.size(), 2); + QCOMPARE(corsAuthenticationSpy.size(), 2); socket3.open(server.serverUrl().toString()); QVERIFY(!socket3ConnectedSpy.wait(250)); - QCOMPARE(socket3ConnectedSpy.count(), 0); + QCOMPARE(socket3ConnectedSpy.size(), 0); QCOMPARE(socket3.state(), QAbstractSocket::UnconnectedState); - QCOMPARE(serverConnectionSpy.count(), 2); - QCOMPARE(corsAuthenticationSpy.count(), 2); + QCOMPARE(serverConnectionSpy.size(), 2); + QCOMPARE(corsAuthenticationSpy.size(), 2); QVERIFY(server.hasPendingConnections()); QWebSocket *pSocket = server.nextPendingConnection(); @@ -540,20 +540,20 @@ void tst_QWebSocketServer::tst_maxPendingConnections() //will resolve in another commit #ifndef Q_OS_WIN - QCOMPARE(serverErrorSpy.count(), 1); + QCOMPARE(serverErrorSpy.size(), 1); QCOMPARE(serverErrorSpy.at(0).at(0).value<QWebSocketProtocol::CloseCode>(), QWebSocketProtocol::CloseCodeAbnormalDisconnection); #endif - QCOMPARE(serverClosedSpy.count(), 0); + QCOMPARE(serverClosedSpy.size(), 0); server.close(); - QTRY_COMPARE(serverClosedSpy.count(), 1); + QTRY_COMPARE(serverClosedSpy.size(), 1); #ifndef QT_NO_SSL - QCOMPARE(peerVerifyErrorSpy.count(), 0); - QCOMPARE(sslErrorsSpy.count(), 0); + QCOMPARE(peerVerifyErrorSpy.size(), 0); + QCOMPARE(sslErrorsSpy.size(), 0); #endif - QCOMPARE(serverAcceptErrorSpy.count(), 0); + QCOMPARE(serverAcceptErrorSpy.size(), 0); } void tst_QWebSocketServer::tst_serverDestroyedWhileSocketConnected() @@ -578,16 +578,16 @@ void tst_QWebSocketServer::tst_serverDestroyedWhileSocketConnected() socket.open(server->serverUrl().toString()); - QTRY_COMPARE(socketConnectedSpy.count(), 1); + QTRY_COMPARE(socketConnectedSpy.size(), 1); QCOMPARE(socket.state(), QAbstractSocket::ConnectedState); - QCOMPARE(serverConnectionSpy.count(), 1); - QCOMPARE(corsAuthenticationSpy.count(), 1); + QCOMPARE(serverConnectionSpy.size(), 1); + QCOMPARE(corsAuthenticationSpy.size(), 1); - QCOMPARE(serverClosedSpy.count(), 0); + QCOMPARE(serverClosedSpy.size(), 0); delete server; - QTRY_COMPARE(socketDisconnectedSpy.count(), 1); + QTRY_COMPARE(socketDisconnectedSpy.size(), 1); } #ifndef QT_NO_SSL @@ -622,7 +622,7 @@ void tst_QWebSocketServer::tst_scheme() QWebSocket plainSocket; plainSocket.open(plainServer.serverUrl().toString()); - QTRY_COMPARE(plainServerConnectionSpy.count(), 1); + QTRY_COMPARE(plainServerConnectionSpy.size(), 1); QScopedPointer<QWebSocket> plainServerSocket(plainServer.nextPendingConnection()); QVERIFY(!plainServerSocket.isNull()); QCOMPARE(plainServerSocket->requestUrl().scheme(), QStringLiteral("ws")); @@ -646,7 +646,7 @@ void tst_QWebSocketServer::tst_scheme() }); secureSocket.open(secureServer.serverUrl().toString()); - QTRY_COMPARE(secureServerConnectionSpy.count(), 1); + QTRY_COMPARE(secureServerConnectionSpy.size(), 1); QScopedPointer<QWebSocket> secureServerSocket(secureServer.nextPendingConnection()); QVERIFY(!secureServerSocket.isNull()); QCOMPARE(secureServerSocket->requestUrl().scheme(), QStringLiteral("wss")); @@ -670,9 +670,9 @@ void tst_QWebSocketServer::tst_handleConnection() QWebSocket webSocket; QSignalSpy wsConnectedSpy(&webSocket, &QWebSocket::connected); webSocket.open(QStringLiteral("ws://localhost:%1").arg(tcpServer.serverPort())); - QTRY_COMPARE(wsConnectedSpy.count(), 1); + QTRY_COMPARE(wsConnectedSpy.size(), 1); - QTRY_COMPARE(wsServerConnectionSpy.count(), 1); + QTRY_COMPARE(wsServerConnectionSpy.size(), 1); QScopedPointer<QWebSocket> webServerSocket(wsServer.nextPendingConnection()); QVERIFY(!webServerSocket.isNull()); @@ -680,7 +680,7 @@ void tst_QWebSocketServer::tst_handleConnection() QSignalSpy wsMessageReceivedSpy(webServerSocket.data(), &QWebSocket::textMessageReceived); webSocket.sendTextMessage("dummy"); - QTRY_COMPARE(wsMessageReceivedSpy.count(), 1); + QTRY_COMPARE(wsMessageReceivedSpy.size(), 1); QList<QVariant> arguments = wsMessageReceivedSpy.takeFirst(); QCOMPARE(arguments.first().toString(), QString("dummy")); @@ -688,7 +688,7 @@ void tst_QWebSocketServer::tst_handleConnection() webServerSocket->sendTextMessage("hello"); QVERIFY(webServerSocket->bytesToWrite() > 5); // 5 + a few extra bytes for header QTRY_COMPARE(webServerSocket->bytesToWrite(), 0); - QTRY_COMPARE(clientMessageReceivedSpy.count(), 1); + QTRY_COMPARE(clientMessageReceivedSpy.size(), 1); arguments = clientMessageReceivedSpy.takeFirst(); QCOMPARE(arguments.first().toString(), QString("hello")); } @@ -718,7 +718,7 @@ static void openManyConnections(QList<SocketSpy *> *sockets, quint16 port, int n static int sumSocketSpyCount(const QList<SocketSpy *> &sockets) { return std::accumulate(sockets.cbegin(), sockets.cend(), 0, [](int c, SocketSpy *s) { - return c + s->disconnectSpy->count(); + return c + s->disconnectSpy->size(); }); } @@ -734,7 +734,7 @@ void tst_QWebSocketServer::tst_handshakeTimeout() QWebSocket socket; socket.open(plainServer.serverUrl().toString()); - QTRY_COMPARE(plainServerConnectionSpy.count(), 1); + QTRY_COMPARE(plainServerConnectionSpy.size(), 1); QScopedPointer<QWebSocket> plainServerSocket(plainServer.nextPendingConnection()); QVERIFY(!plainServerSocket.isNull()); @@ -759,14 +759,14 @@ void tst_QWebSocketServer::tst_handshakeTimeout() QCoreApplication::processEvents(); /* We have 50 plain TCP connections open, that are not proper websockets. */ - QCOMPARE(plainServerConnectionSpy.count(), 0); + QCOMPARE(plainServerConnectionSpy.size(), 0); QWebSocket socket; socket.open(plainServer.serverUrl().toString()); /* Check that a real websocket will be processed after some non-websocket * TCP connections timeout. */ - QTRY_COMPARE(plainServerConnectionSpy.count(), 1); + QTRY_COMPARE(plainServerConnectionSpy.size(), 1); QScopedPointer<QWebSocket> plainServerSocket(plainServer.nextPendingConnection()); QVERIFY(!plainServerSocket.isNull()); @@ -794,7 +794,7 @@ void tst_QWebSocketServer::tst_handshakeTimeout() openManyConnections(&sockets, secureServer.serverPort(), numConnections); QCoreApplication::processEvents(); - QCOMPARE(secureServerConnectionSpy.count(), 0); + QCOMPARE(secureServerConnectionSpy.size(), 0); QWebSocket secureSocket; connect(&secureSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), @@ -808,7 +808,7 @@ void tst_QWebSocketServer::tst_handshakeTimeout() secureSocket.open(secureServer.serverUrl().toString()); - QTRY_COMPARE(secureServerConnectionSpy.count(), 1); + QTRY_COMPARE(secureServerConnectionSpy.size(), 1); QScopedPointer<QWebSocket> serverSocket(secureServer.nextPendingConnection()); QVERIFY(!serverSocket.isNull()); @@ -830,14 +830,14 @@ void tst_QWebSocketServer::tst_handshakeTimeout() QSignalSpy socketDisconnectedSpy(&socket, &QWebSocket::disconnected); socket.open(plainServer.serverUrl().toString()); - QTRY_COMPARE(plainServerConnectionSpy.count(), 1); - QTRY_COMPARE(socketConnectedSpy.count(), 1); + QTRY_COMPARE(plainServerConnectionSpy.size(), 1); + QTRY_COMPARE(socketConnectedSpy.size(), 1); QEventLoop loop; QTimer::singleShot(500, &loop, &QEventLoop::quit); loop.exec(); - QCOMPARE(socketDisconnectedSpy.count(), 0); + QCOMPARE(socketDisconnectedSpy.size(), 0); } } @@ -865,7 +865,7 @@ void tst_QWebSocketServer::multipleFrames() QVERIFY(messageReceivedSpy.wait()); // Since there's no guarantee the operating system will fit all 10 websocket frames into 1 tcp // frame, let's just assume it will do at least 2. EXCEPT_FAIL any which doesn't merge any. - QVERIFY2(messageReceivedSpy.count() > 1, "Received only 1 message in the TCP frame!"); + QVERIFY2(messageReceivedSpy.size() > 1, "Received only 1 message in the TCP frame!"); } QTEST_MAIN(tst_QWebSocketServer) |