1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QSocks5SocketEngine: Refactor tests

Browse Source 
Rewrite tcpSocketNonBlockingTest() and downloadBigFile() to use lambdas for
the slots. This allows for removing the related member variables and slots
of the test class and ensures no leaks of sockets or inconsistent values.
Add an error handler printing the error message to the flaky downloadBigFile()
test.

Change-Id: Ieb64063c41e045a1a50a6d074bef01753ee319ef
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Friedemann Kleint 2017-01-23 11:04:12 +01:00
parent 186a5af82b
commit 45948967bd
1 changed files with 50 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
View File

@ -54,7 +54,6 @@ class tst_QSocks5SocketEngine : public QObject, public QAbstractSocketEngineRece
private slots: private slots:
void initTestCase(); void initTestCase();
void init();
void construction(); void construction();
void errorTest_data(); void errorTest_data();
void errorTest(); void errorTest();
@ -74,13 +73,6 @@ private slots:
void incomplete(); void incomplete();
protected slots: protected slots:
void tcpSocketNonBlocking_hostFound();
void tcpSocketNonBlocking_connected();
void tcpSocketNonBlocking_closed();
void tcpSocketNonBlocking_readyRead();
void tcpSocketNonBlocking_bytesWritten(qint64);
void exitLoopSlot();
void downloadBigFileSlot();
void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth); void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
private: private:
@ -89,11 +81,6 @@ private:
void closeNotification() { } void closeNotification() { }
void exceptionNotification() { } void exceptionNotification() { }
void connectionNotification() { } void connectionNotification() { }
QTcpSocket *tcpSocketNonBlocking_socket;
QStringList tcpSocketNonBlocking_data;
qint64 tcpSocketNonBlocking_totalWritten;
QTcpSocket *tmpSocket;
qint64 bytesAvailable;
}; };
class MiniSocks5ResponseHandler : public QObject class MiniSocks5ResponseHandler : public QObject
@ -153,12 +140,6 @@ void tst_QSocks5SocketEngine::initTestCase()
QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
} }
void tst_QSocks5SocketEngine::init()
{
tmpSocket = 0;
bytesAvailable = 0;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void tst_QSocks5SocketEngine::construction() void tst_QSocks5SocketEngine::construction()
{ {
@ -631,13 +612,27 @@ void tst_QSocks5SocketEngine::tcpSocketNonBlockingTest()
{ {
QSocks5SocketEngineHandler socks5; QSocks5SocketEngineHandler socks5;
qint64 tcpSocketNonBlocking_totalWritten = 0;
QStringList tcpSocketNonBlocking_data;
QTcpSocket socket; QTcpSocket socket;
connect(&socket, SIGNAL(hostFound()), SLOT(tcpSocketNonBlocking_hostFound())); connect(&socket, &QAbstractSocket::hostFound,
connect(&socket, SIGNAL(connected()), SLOT(tcpSocketNonBlocking_connected())); &QTestEventLoop::instance(), &QTestEventLoop::exitLoop);
connect(&socket, SIGNAL(disconnected()), SLOT(tcpSocketNonBlocking_closed())); connect(&socket, &QAbstractSocket::connected,
connect(&socket, SIGNAL(bytesWritten(qint64)), SLOT(tcpSocketNonBlocking_bytesWritten(qint64))); &QTestEventLoop::instance(), &QTestEventLoop::exitLoop);
connect(&socket, SIGNAL(readyRead()), SLOT(tcpSocketNonBlocking_readyRead())); connect(&socket, &QIODevice::bytesWritten,
tcpSocketNonBlocking_socket = &socket; [&tcpSocketNonBlocking_totalWritten] (qint64 written)
{
tcpSocketNonBlocking_totalWritten += written;
QTestEventLoop::instance().exitLoop();
});
connect(&socket, &QIODevice::readyRead,
[&tcpSocketNonBlocking_data, &socket] ()
{
while (socket.canReadLine())
tcpSocketNonBlocking_data.append(socket.readLine());
QTestEventLoop::instance().exitLoop();
});
// Connect // Connect
socket.connectToHost(QtNetworkSettings::serverName(), 143); socket.connectToHost(QtNetworkSettings::serverName(), 143);
@ -725,62 +720,50 @@ void tst_QSocks5SocketEngine::tcpSocketNonBlockingTest()
QCOMPARE(socket.state(), QTcpSocket::UnconnectedState); QCOMPARE(socket.state(), QTcpSocket::UnconnectedState);
} }
void tst_QSocks5SocketEngine::tcpSocketNonBlocking_hostFound()
{
QTestEventLoop::instance().exitLoop();
}
void tst_QSocks5SocketEngine::tcpSocketNonBlocking_connected()
{
QTestEventLoop::instance().exitLoop();
}
void tst_QSocks5SocketEngine::tcpSocketNonBlocking_readyRead()
{
while (tcpSocketNonBlocking_socket->canReadLine())
tcpSocketNonBlocking_data.append(tcpSocketNonBlocking_socket->readLine());
QTestEventLoop::instance().exitLoop();
}
void tst_QSocks5SocketEngine::tcpSocketNonBlocking_bytesWritten(qint64 written)
{
tcpSocketNonBlocking_totalWritten += written;
QTestEventLoop::instance().exitLoop();
}
void tst_QSocks5SocketEngine::tcpSocketNonBlocking_closed()
{
}
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
void tst_QSocks5SocketEngine::downloadBigFile() void tst_QSocks5SocketEngine::downloadBigFile()
{ {
QSocks5SocketEngineHandler socks5; QSocks5SocketEngineHandler socks5;
if (tmpSocket) QTcpSocket socket;
delete tmpSocket; qint64 bytesAvailable = 0;
tmpSocket = new QTcpSocket; connect(&socket, &QAbstractSocket::connected,
&QTestEventLoop::instance(), &QTestEventLoop::exitLoop);
connect(&socket, &QIODevice::readyRead,
[&socket, &bytesAvailable] ()
{
const QByteArray tmp = socket.readAll();
int correction = tmp.indexOf(char(0), 0); //skip header
if (correction == -1)
correction = 0;
bytesAvailable += (tmp.size() - correction);
if (bytesAvailable >= 10000000)
QTestEventLoop::instance().exitLoop();
});
connect(tmpSocket, SIGNAL(connected()), SLOT(exitLoopSlot())); connect(&socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
connect(tmpSocket, SIGNAL(readyRead()), SLOT(downloadBigFileSlot())); [&socket] (QAbstractSocket::SocketError errorCode)
{
qWarning().noquote().nospace() << QTest::currentTestFunction()
<< ": error " << errorCode << ": " << socket.errorString();
});
tmpSocket->connectToHost(QtNetworkSettings::serverName(), 80); socket.connectToHost(QtNetworkSettings::serverName(), 80);
QTestEventLoop::instance().enterLoop(30); QTestEventLoop::instance().enterLoop(30);
if (QTestEventLoop::instance().timeout()) if (QTestEventLoop::instance().timeout())
QFAIL("Network operation timed out"); QFAIL("Network operation timed out");
QByteArray hostName = QtNetworkSettings::serverName().toLatin1(); QByteArray hostName = QtNetworkSettings::serverName().toLatin1();
QCOMPARE(tmpSocket->state(), QAbstractSocket::ConnectedState); QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
QVERIFY(tmpSocket->write("GET /qtest/mediumfile HTTP/1.0\r\n") > 0); QVERIFY(socket.write("GET /qtest/mediumfile HTTP/1.0\r\n") > 0);
QVERIFY(tmpSocket->write("HOST: ") > 0); QVERIFY(socket.write("HOST: ") > 0);
QVERIFY(tmpSocket->write(hostName.data()) > 0); QVERIFY(socket.write(hostName.data()) > 0);
QVERIFY(tmpSocket->write("\r\n") > 0); QVERIFY(socket.write("\r\n") > 0);
QVERIFY(tmpSocket->write("\r\n") > 0); QVERIFY(socket.write("\r\n") > 0);
bytesAvailable = 0;
QTime stopWatch; QTime stopWatch;
stopWatch.start(); stopWatch.start();
@ -791,31 +774,12 @@ void tst_QSocks5SocketEngine::downloadBigFile()
QCOMPARE(bytesAvailable, qint64(10000000)); QCOMPARE(bytesAvailable, qint64(10000000));
QCOMPARE(tmpSocket->state(), QAbstractSocket::ConnectedState); QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
/*qDebug("\t\t%.1fMB/%.1fs: %.1fMB/s", /*qDebug("\t\t%.1fMB/%.1fs: %.1fMB/s",
bytesAvailable / (1024.0 * 1024.0), bytesAvailable / (1024.0 * 1024.0),
stopWatch.elapsed() / 1024.0, stopWatch.elapsed() / 1024.0,
(bytesAvailable / (stopWatch.elapsed() / 1000.0)) / (1024 * 1024));*/ (bytesAvailable / (stopWatch.elapsed() / 1000.0)) / (1024 * 1024));*/
delete tmpSocket;
tmpSocket = 0;
}
void tst_QSocks5SocketEngine::exitLoopSlot()
{
QTestEventLoop::instance().exitLoop();
}
void tst_QSocks5SocketEngine::downloadBigFileSlot()
{
QByteArray tmp=tmpSocket->readAll();
int correction=tmp.indexOf((char)0,0); //skip header
if (correction==-1) correction=0;
bytesAvailable += (tmp.size()-correction);
if (bytesAvailable >= 10000000)
QTestEventLoop::instance().exitLoop();
} }
void tst_QSocks5SocketEngine::passwordAuth() void tst_QSocks5SocketEngine::passwordAuth()