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

Expand tst_QNetworkReply::backgroundRequest to ftp & https

Browse Source 
Ftp and Http have different implementations of QNetworkReply,
so test both of them.

Change-Id: If502fa1788110edf89e619966534eea08830a19b
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
This commit is contained in:
Shane Kearns 2012-04-13 15:50:13 +01:00 committed by Qt by Nokia
parent a1e961705c
commit ddf040eccb
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -1402,6 +1402,11 @@ void tst_QNetworkReply::cleanup()
// clear cookies // clear cookies
cookieJar->setAllCookies(QList<QNetworkCookie>()); cookieJar->setAllCookies(QList<QNetworkCookie>());
// disconnect manager signals
manager.disconnect(SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)));
manager.disconnect(SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)));
manager.disconnect(SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
} }
void tst_QNetworkReply::stateChecking() void tst_QNetworkReply::stateChecking()
@ -6811,25 +6816,44 @@ void tst_QNetworkReply::ftpAuthentication()
void tst_QNetworkReply::backgroundRequest_data() void tst_QNetworkReply::backgroundRequest_data()
{ {
QTest::addColumn<QUrl>("url");
QTest::addColumn<bool>("background"); QTest::addColumn<bool>("background");
QTest::addColumn<int>("policy"); QTest::addColumn<int>("policy");
QTest::addColumn<QNetworkReply::NetworkError>("error"); QTest::addColumn<QNetworkReply::NetworkError>("error");
QTest::newRow("fg, normal") << false << 0 << QNetworkReply::NoError; QUrl httpurl("http://" + QtNetworkSettings::serverName());
QTest::newRow("bg, normal") << true << 0 << QNetworkReply::NoError; QUrl httpsurl("https://" + QtNetworkSettings::serverName());
QTest::newRow("fg, nobg") << false << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::NoError; QUrl ftpurl("ftp://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt");
QTest::newRow("bg, nobg") << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
QTest::newRow("http, fg, normal") << httpurl << false << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
QTest::newRow("http, bg, normal") << httpurl << true << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
QTest::newRow("http, fg, nobg") << httpurl << false << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::NoError;
QTest::newRow("http, bg, nobg") << httpurl << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
#ifndef QT_NO_SSL
QTest::newRow("https, fg, normal") << httpsurl << false << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
QTest::newRow("https, bg, normal") << httpsurl << true << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
QTest::newRow("https, fg, nobg") << httpsurl << false << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::NoError;
QTest::newRow("https, bg, nobg") << httpsurl << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
#endif
QTest::newRow("ftp, fg, normal") << ftpurl << false << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
QTest::newRow("ftp, bg, normal") << ftpurl << true << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
QTest::newRow("ftp, fg, nobg") << ftpurl << false << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::NoError;
QTest::newRow("ftp, bg, nobg") << ftpurl << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
} }
void tst_QNetworkReply::backgroundRequest() void tst_QNetworkReply::backgroundRequest()
{ {
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
#ifndef QT_NO_BEARERMANAGEMENT
QFETCH(QUrl, url);
QFETCH(bool, background); QFETCH(bool, background);
QFETCH(int, policy); QFETCH(int, policy);
QFETCH(QNetworkReply::NetworkError, error); QFETCH(QNetworkReply::NetworkError, error);
QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName())); QNetworkRequest request(url);
if (background) if (background)
request.setAttribute(QNetworkRequest::BackgroundRequestAttribute, QVariant::fromValue(true)); request.setAttribute(QNetworkRequest::BackgroundRequestAttribute, QVariant::fromValue(true));
@ -6837,6 +6861,11 @@ void tst_QNetworkReply::backgroundRequest()
//this preconstructs the session so we can change policies in advance //this preconstructs the session so we can change policies in advance
manager.setConfiguration(networkConfiguration); manager.setConfiguration(networkConfiguration);
#ifndef QT_NO_SSL
connect(&manager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
#endif
const QWeakPointer<const QNetworkSession> session = QNetworkAccessManagerPrivate::getNetworkSession(&manager); const QWeakPointer<const QNetworkSession> session = QNetworkAccessManagerPrivate::getNetworkSession(&manager);
QVERIFY(session); QVERIFY(session);
QNetworkSession::UsagePolicies original = session.data()->usagePolicies(); QNetworkSession::UsagePolicies original = session.data()->usagePolicies();
@ -6851,6 +6880,7 @@ void tst_QNetworkReply::backgroundRequest()
QVERIFY(reply->isFinished()); QVERIFY(reply->isFinished());
QCOMPARE(reply->error(), error); QCOMPARE(reply->error(), error);
#endif #endif
#endif
} }
// NOTE: This test must be last testcase in tst_qnetworkreply! // NOTE: This test must be last testcase in tst_qnetworkreply!