summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp')
-rw-r--r--tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp55
1 files changed, 55 insertions, 0 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index ccc70cfff4..308b2a70d1 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -507,6 +507,9 @@ private Q_SLOTS:
void getWithTimeout();
void postWithTimeout();
+ void moreActivitySignals_data();
+ void moreActivitySignals();
+
void contentEncoding_data();
void contentEncoding();
void contentEncodingBigPayload_data();
@@ -9370,6 +9373,58 @@ void tst_QNetworkReply::postWithTimeout()
manager.setTransferTimeout(0);
}
+void tst_QNetworkReply::moreActivitySignals_data()
+{
+ QTest::addColumn<QUrl>("url");
+ QTest::addColumn<bool>("useipv6");
+ QTest::addRow("local4") << QUrl("http://127.0.0.1") << false;
+ QTest::addRow("local6") << QUrl("http://[::1]") << true;
+ if (qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci")) {
+ // On CI server
+ QTest::addRow("localDns") << QUrl("http://localhost") << false; // will find v6
+ } else {
+ // For manual testing
+ QTest::addRow("localDns4") << QUrl("http://localhost") << true; // will find both v4 and v6
+ QTest::addRow("localDns6") << QUrl("http://localhost") << false; // will find both v4 and v6
+ }
+}
+
+void tst_QNetworkReply::moreActivitySignals()
+{
+ QFETCH(QUrl, url);
+ QFETCH(bool, useipv6);
+ MiniHttpServer server(tst_QNetworkReply::httpEmpty200Response, false, nullptr/*thread*/, useipv6);
+ server.doClose = false;
+ url.setPort(server.serverPort());
+ QNetworkRequest request(url);
+ QNetworkReplyPtr reply(manager.get(request));
+ QSignalSpy spy1(reply.data(), SIGNAL(socketConnecting()));
+ QSignalSpy spy2(reply.data(), SIGNAL(requestSent()));
+ QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged()));
+ QSignalSpy spy4(reply.data(), SIGNAL(finished()));
+ spy1.wait();
+ QCOMPARE(spy1.count(), 1);
+ spy2.wait();
+ QCOMPARE(spy2.count(), 1);
+ spy3.wait();
+ QCOMPARE(spy3.count(), 1);
+ spy4.wait();
+ QCOMPARE(spy4.count(), 1);
+ QVERIFY(reply->error() == QNetworkReply::NoError);
+ // Second request will not send socketConnecting because of keep-alive, so don't check it.
+ QNetworkReplyPtr secondreply(manager.get(request));
+ QSignalSpy secondspy2(secondreply.data(), SIGNAL(requestSent()));
+ QSignalSpy secondspy3(secondreply.data(), SIGNAL(metaDataChanged()));
+ QSignalSpy secondspy4(secondreply.data(), SIGNAL(finished()));
+ secondspy2.wait();
+ QCOMPARE(secondspy2.count(), 1);
+ secondspy3.wait();
+ QCOMPARE(secondspy3.count(), 1);
+ secondspy4.wait();
+ QCOMPARE(secondspy4.count(), 1);
+ QVERIFY(secondreply->error() == QNetworkReply::NoError);
+}
+
void tst_QNetworkReply::contentEncoding_data()
{
QTest::addColumn<QByteArray>("encoding");