QTestEventLoop: add enterLoop(std::chrono::milliseconds) overload

Task-number: QTBUG-110059
Change-Id: Ibf1d76afd313e390103be4a22e44af7fb41ace1b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

4 files changed, 46 insertions, 38 deletions

diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
index 4ec4c1ef81..5e96c055e3 100644
--- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
+++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
@@ -26,6 +26,8 @@
 
 #include <algorithm>
 
+using namespace std::chrono_literals;
+
 QT_BEGIN_NAMESPACE
 
 namespace
@@ -127,8 +129,8 @@ private:
     DtlsPtr clientCrypto;
 
     QTestEventLoop testLoop;
-    const int handshakeTimeoutMS = 5000;
-    const int dataExchangeTimeoutMS = 1000;
+    static constexpr auto HandshakeTimeout = 5s;
+    static constexpr auto DataExchangeTimeout = 1s;
 
     const QByteArray presharedKey = "DEADBEEFDEADBEEF";
     QString certDirPath;
@@ -413,7 +415,7 @@ void tst_QDtls::handshake()
     QDTLS_VERIFY_NO_ERROR(clientCrypto);
     QCOMPARE(clientCrypto->handshakeState(), QDtls::HandshakeInProgress);
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!testLoop.timeout());
 
@@ -473,7 +475,7 @@ void tst_QDtls::handshakeWithRetransmission()
     // client will re-transmit in 1s., the first part of 'ServerHello' to be
     // dropped, the client then will re-transmit after another 2 s. Thus it's ~3.
     // We err on safe side and double our (already quite generous) 5s.
-    testLoop.enterLoopMSecs(handshakeTimeoutMS * 2);
+    testLoop.enterLoop(HandshakeTimeout * 2);
 
     QVERIFY(!testLoop.timeout());
     QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
@@ -496,7 +498,7 @@ void tst_QDtls::sessionCipher()
     QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, hostName));
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!testLoop.timeout());
     QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
@@ -559,7 +561,7 @@ void tst_QDtls::cipherPreferences()
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
     QDTLS_VERIFY_NO_ERROR(clientCrypto);
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
     QVERIFY(!testLoop.timeout());
     QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
     QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
@@ -626,7 +628,7 @@ void tst_QDtls::protocolVersionMatching()
     QVERIFY(clientCrypto->setPeer(serverAddress, serverPort));
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
 
     if (works) {
         QDTLS_VERIFY_HANDSHAKE_SUCCESS(serverCrypto);
@@ -661,7 +663,7 @@ void tst_QDtls::verificationErrors()
     // Now we are ready for handshake:
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!testLoop.timeout());
     QDTLS_VERIFY_NO_ERROR(serverCrypto);
@@ -731,7 +733,7 @@ void tst_QDtls::presetExpectedErrors()
     QVERIFY(clientCrypto->setPeer(serverAddress, serverPort));
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!testLoop.timeout());
 
@@ -818,7 +820,7 @@ void tst_QDtls::verifyServerCertificate()
 
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
     QVERIFY(!testLoop.timeout());
 
     if (serverKey.isNull() && !serverCerts.isEmpty()) {
@@ -948,7 +950,7 @@ void tst_QDtls::verifyClientCertificate()
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
     QDTLS_VERIFY_NO_ERROR(clientCrypto);
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
 
     serverConfig = serverCrypto->dtlsConfiguration();
 
@@ -995,7 +997,7 @@ void tst_QDtls::blacklistedCerificate()
     QVERIFY(clientCrypto->setPeer(serverAddress, serverPort, name));
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
     QVERIFY(!testLoop.timeout());
     QCOMPARE(clientCrypto->handshakeState(), QDtls::PeerVerificationFailed);
     QCOMPARE(clientCrypto->dtlsError(), QDtlsError::PeerVerificationError);
@@ -1047,7 +1049,7 @@ void tst_QDtls::readWriteEncrypted()
     QCOMPARE(clientCrypto->dtlsError(), QDtlsError::InvalidOperation);
 
     // 1.2 Finish the handshake:
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
     QVERIFY(!testLoop.timeout());
 
     QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
@@ -1065,7 +1067,7 @@ void tst_QDtls::readWriteEncrypted()
     QVERIFY(clientBytesWritten > 0);
 
     // 5. Exchange client/server messages:
-    testLoop.enterLoopMSecs(dataExchangeTimeoutMS);
+    testLoop.enterLoop(DataExchangeTimeout);
     QVERIFY(!testLoop.timeout());
 
     QCOMPARE(serverExpectedPlainText, serverReceivedPlainText);
@@ -1083,7 +1085,7 @@ void tst_QDtls::readWriteEncrypted()
     QCOMPARE(crypto->handshakeState(), QDtls::HandshakeNotStarted);
     QVERIFY(!crypto->isConnectionEncrypted());
     // 8. Receive this read notification and handle it:
-    testLoop.enterLoopMSecs(dataExchangeTimeoutMS);
+    testLoop.enterLoop(DataExchangeTimeout);
     QVERIFY(!testLoop.timeout());
 
     DtlsPtr &peerCrypto = serverSideShutdown ? clientCrypto : serverCrypto;
@@ -1108,7 +1110,7 @@ void tst_QDtls::datagramFragmentation()
 
     QVERIFY(clientCrypto->doHandshake(&clientSocket));
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS);
+    testLoop.enterLoop(HandshakeTimeout);
     QVERIFY(!testLoop.timeout());
 
     QDTLS_VERIFY_HANDSHAKE_SUCCESS(clientCrypto);
diff --git a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
index 55322608f2..5690a5e04a 100644
--- a/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
+++ b/tests/auto/network/ssl/qdtlscookie/tst_qdtlscookie.cpp
@@ -22,6 +22,8 @@
 #include <utility>
 #include <vector>
 
+using namespace std::chrono_literals;
+
 QT_BEGIN_NAMESPACE
 
 #define STOP_ON_FAILURE \
@@ -76,7 +78,7 @@ private:
     quint16 serverPort = 0;
 
     QTestEventLoop testLoop;
-    int handshakeTimeoutMS = 500;
+    static constexpr auto HandshakeTimeout = 500ms;
 
     QDtlsClientVerifier listener;
     using HandshakePtr = QSharedPointer<QDtls>;
@@ -327,7 +329,7 @@ void tst_QDtlsCookie::verifyMultipleClients()
 
     clientsToAdd = clientsToWait = 100;
 
-    testLoop.enterLoopMSecs(handshakeTimeoutMS * clientsToWait);
+    testLoop.enterLoop(HandshakeTimeout * clientsToWait);
     QVERIFY(!testLoop.timeout());
     QVERIFY(clientsToWait == 0);
 }
@@ -351,7 +353,7 @@ void tst_QDtlsCookie::receiveMessage(QUdpSocket *socket, QByteArray *message,
     Q_ASSERT(socket && message);
 
     if (socket->pendingDatagramSize() <= 0)
-        testLoop.enterLoopMSecs(handshakeTimeoutMS);
+        testLoop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!testLoop.timeout());
     QVERIFY(socket->pendingDatagramSize());
diff --git a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
index cde8d43257..2d64f00de5 100644
--- a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
+++ b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
@@ -28,6 +28,8 @@
 #include <algorithm>
 #include <utility>
 
+using namespace std::chrono_literals;
+
 // NOTE: the word 'subject' in the code below means the subject of a status request,
 // so in general it's our peer's certificate we are asking about.
 
@@ -386,7 +388,7 @@ private:
     void (QSslSocket::*tlsErrorsSignal)(const QList<QSslError> &) = &QSslSocket::sslErrors;
     void (QTestEventLoop::*exitLoopSlot)() = &QTestEventLoop::exitLoop;
 
-    const int handshakeTimeoutMS = 500;
+    static constexpr auto HandshakeTimeout = 500ms;
     QTestEventLoop loop;
 
     std::vector<QSslError::SslError> ocspErrorCodes = {QSslError::OcspNoResponseFound,
@@ -462,7 +464,7 @@ void tst_QOcsp::connectSelfSigned()
         auto roots = clientConfig.caCertificates();
         setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
         clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-        loop.enterLoopMSecs(handshakeTimeoutMS);
+        loop.enterLoop(HandshakeTimeout);
 
         QVERIFY(!clientSocket.isEncrypted());
         QCOMPARE_SINGLE_ERROR(clientSocket, expectedError);
@@ -478,7 +480,7 @@ void tst_QOcsp::connectSelfSigned()
         QSslSocket clientSocket;
         setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
         clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-        loop.enterLoopMSecs(handshakeTimeoutMS);
+        loop.enterLoop(HandshakeTimeout);
 
         QVERIFY_HANDSHAKE_WITHOUT_ERRORS(clientSocket);
 
@@ -543,7 +545,7 @@ void tst_QOcsp::badStatus()
     QSslSocket clientSocket;
     setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
     clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-    loop.enterLoopMSecs(handshakeTimeoutMS);
+    loop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!clientSocket.isEncrypted());
     QCOMPARE_SINGLE_ERROR(clientSocket, expectedError.error());
@@ -574,7 +576,7 @@ void tst_QOcsp::multipleSingleResponses()
     QSslSocket clientSocket;
     setupOcspClient(clientSocket, issuerToChain(responderChain), server.peerVerifyName());
     clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-    loop.enterLoopMSecs(handshakeTimeoutMS);
+    loop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!clientSocket.isEncrypted());
     QCOMPARE_SINGLE_ERROR(clientSocket, expectedError);
@@ -594,7 +596,7 @@ void tst_QOcsp::malformedResponse()
     QSslSocket clientSocket;
     setupOcspClient(clientSocket, issuerToChain(serverChain), server.peerVerifyName());
     clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-    loop.enterLoopMSecs(handshakeTimeoutMS);
+    loop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!clientSocket.isEncrypted());
     QCOMPARE(clientSocket.error(), QAbstractSocket::SslHandshakeFailedError);
@@ -633,7 +635,7 @@ void tst_QOcsp::expiredResponse()
     QSslSocket clientSocket;
     setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
     clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-    loop.enterLoopMSecs(handshakeTimeoutMS);
+    loop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!clientSocket.isEncrypted());
     QCOMPARE_SINGLE_ERROR(clientSocket, expectedError);
@@ -664,7 +666,7 @@ void tst_QOcsp::noNextUpdate()
     QSslSocket clientSocket;
     setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
     clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-    loop.enterLoopMSecs(handshakeTimeoutMS);
+    loop.enterLoop(HandshakeTimeout);
 
     QVERIFY_HANDSHAKE_WITHOUT_ERRORS(clientSocket);
 }
@@ -710,7 +712,7 @@ void tst_QOcsp::wrongCertificateInResponse()
     QSslSocket clientSocket;
     setupOcspClient(clientSocket, issuerToChain(subjectChain), server.peerVerifyName());
     clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-    loop.enterLoopMSecs(handshakeTimeoutMS);
+    loop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!clientSocket.isEncrypted());
     QVERIFY(containsError(clientSocket.sslHandshakeErrors(), expectedError));
@@ -735,7 +737,7 @@ void tst_QOcsp::untrustedResponder()
     QSslSocket clientSocket;
     setupOcspClient(clientSocket, {}, server.peerVerifyName());
     clientSocket.connectToHostEncrypted(server.hostName(), server.serverPort());
-    loop.enterLoopMSecs(handshakeTimeoutMS);
+    loop.enterLoop(HandshakeTimeout);
 
     QVERIFY(!clientSocket.isEncrypted());
     QVERIFY(containsError(clientSocket.sslHandshakeErrors(), expectedError));
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index f58d7ed440..725f932868 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -44,6 +44,8 @@
 #include "private/qsslsocket_p.h"
 #include "private/qsslconfiguration_p.h"
 
+using namespace std::chrono_literals;
+
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 // make these enum values available without causing deprecation warnings:
@@ -2824,7 +2826,7 @@ void tst_QSslSocket::closeWhileEmittingSocketError()
     // Make sure we have some data buffered so that close will try to flush:
     clientSocket.write(QByteArray(1000000, Qt::Uninitialized));
 
-    QTestEventLoop::instance().enterLoopMSecs(1000);
+    QTestEventLoop::instance().enterLoop(1s);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(socketErrorSpy.size(), 1);
@@ -4555,7 +4557,7 @@ void tst_QSslSocket::unsupportedProtocols()
         return;
 
     QFETCH(const QSsl::SslProtocol, unsupportedProtocol);
-    const int timeoutMS = 500;
+    constexpr auto timeout = 500ms;
     // Test a client socket.
     {
         // 0. connectToHostEncrypted: client-side, non-blocking API, error is discovered
@@ -4577,7 +4579,7 @@ void tst_QSslSocket::unsupportedProtocols()
         QCOMPARE(socket.error(), QAbstractSocket::UnknownSocketError);
 
         socket.connectToHost(QHostAddress::LocalHost, server.serverPort());
-        QVERIFY(socket.waitForConnected(timeoutMS));
+        QVERIFY(socket.waitForConnected(int(timeout.count())));
 
         socket.setProtocol(unsupportedProtocol);
         socket.startClientEncryption();
@@ -4602,7 +4604,7 @@ void tst_QSslSocket::unsupportedProtocols()
 
         QTcpSocket client;
         client.connectToHost(QHostAddress::LocalHost, server.serverPort());
-        loop.enterLoopMSecs(timeoutMS);
+        loop.enterLoop(timeout);
         QVERIFY(!loop.timeout());
         QVERIFY(server.socket);
         QCOMPARE(server.socket->error(), QAbstractSocket::SslInvalidUserDataError);
@@ -4709,7 +4711,7 @@ void tst_QSslSocket::alertMissingCertificate()
     connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
     connect(&server, &SslServer::socketError, earlyQuitter);
 
-    runner.enterLoopMSecs(1000);
+    runner.enterLoop(1s);
 
     if (clientSocket.isEncrypted()) {
         // When using TLS 1.3 the client side thinks it is connected very
@@ -4717,7 +4719,7 @@ void tst_QSslSocket::alertMissingCertificate()
         // inevitable disconnect.
         QCOMPARE(clientSocket.sessionProtocol(), QSsl::TlsV1_3);
         connect(&clientSocket, &QSslSocket::disconnected, &runner, &QTestEventLoop::exitLoop);
-        runner.enterLoopMSecs(10000);
+        runner.enterLoop(10s);
     }
 
     QVERIFY(serverSpy.size() > 0);
@@ -4772,7 +4774,7 @@ void tst_QSslSocket::alertInvalidCertificate()
     connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
     connect(&server, &SslServer::socketError, earlyQuitter);
 
-    runner.enterLoopMSecs(1000);
+    runner.enterLoop(1s);
 
     QVERIFY(serverSpy.size() > 0);
     QVERIFY(clientSpy.size() > 0);
@@ -4900,7 +4902,7 @@ void tst_QSslSocket::selfSignedCertificates()
     connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
     connect(&server, &SslServer::socketError, earlyQuitter);
 
-    runner.enterLoopMSecs(1000);
+    runner.enterLoop(1s);
 
     if (clientKnown) {
         QCOMPARE(serverSpy.size(), 0);
@@ -5038,7 +5040,7 @@ void tst_QSslSocket::pskHandshake()
     connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
     connect(&server, &SslServer::socketError, earlyQuitter);
 
-    runner.enterLoopMSecs(1000);
+    runner.enterLoop(1s);
 
     if (pskRight) {
         QCOMPARE(serverSpy.size(), 0);