summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-04-16 20:32:37 +0100
committerShane Kearns <shane.kearns@accenture.com>2012-04-20 12:29:13 +0200
commit554a2448783cf735256807ea7f532b63cd745464 (patch)
treea888883abd34614f2ac44383c14c24044a16ba98
parent5a12bc0e9ed4335a36c54275ce64bf78ab669735 (diff)
Fix failing test case
Removed references to nokia and trolltech websites, the test just uses the network test server now. The test was failing due to a redirect in place on qt.nokia.com Change-Id: I3716552cc1a12f0157121694250cfacaf5cbc7b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--tests/auto/qhttp/qhttp.pro4
-rw-r--r--tests/auto/qhttp/tst_qhttp.cpp37
2 files changed, 16 insertions, 25 deletions
diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/qhttp/qhttp.pro
index 55d90ac..b053b7c 100644
--- a/tests/auto/qhttp/qhttp.pro
+++ b/tests/auto/qhttp/qhttp.pro
@@ -4,6 +4,8 @@ INCLUDEPATH += "../../../include"
QT = core network testlib http
+TARGET = tst_qhttp
+
wince*: {
webFiles.files = webserver/*
webFiles.path = webserver
@@ -18,5 +20,3 @@ wince*: {
} else {
DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
-
-CONFIG+=insignificant_test # QTQAINFRA-428
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp
index cc4b1f2..1660233 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/qhttp/tst_qhttp.cpp
@@ -331,11 +331,6 @@ void tst_QHttp::get_data()
QTest::newRow( QString("failprot_02_%1").arg(i).toLatin1() ) << QtNetworkSettings::serverName() << 80u
<< QString("qtest/rfc3252.txt") << 1 << 400 << QByteArray() << (bool)(i==1);
- // qt.nokia.com/doc uses transfer-encoding=chunked
- /* qt.nokia.com/doc no longer seams to be using chuncked encodig.
- QTest::newRow( QString("chunked_01_%1").arg(i).toLatin1() ) << QString("test.troll.no") << 80u
- << QString("/") << 1 << 200 << testhtml << (bool)(i==1);
- */
QTest::newRow( QString("chunked_02_%1").arg(i).toLatin1() ) << QtNetworkSettings::serverName() << 80u
<< QString("/qtest/cgi-bin/rfc.cgi") << 1 << 200 << rfc3252 << (bool)(i==1);
}
@@ -432,10 +427,6 @@ void tst_QHttp::head_data()
QTest::newRow( "failprot_02" ) << QtNetworkSettings::serverName() << 80u
<< QString("qtest/rfc3252.txt") << 1 << 400 << 0u;
- /* qt.nokia.com/doc no longer seams to be using chuncked encodig.
- QTest::newRow( "chunked_01" ) << QString("qt.nokia.com/doc") << 80u
- << QString("/index.html") << 1 << 200 << 0u;
- */
QTest::newRow( "chunked_02" ) << QtNetworkSettings::serverName() << 80u
<< QString("/qtest/cgi-bin/rfc.cgi") << 1 << 200 << 0u;
}
@@ -783,13 +774,13 @@ void tst_QHttp::proxy_data()
QTest::addColumn<QString>("proxypass");
QTest::newRow("qt-test-server") << QtNetworkSettings::serverName() << 3128
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/")
<< QString::fromLatin1("") << QString::fromLatin1("");
QTest::newRow("qt-test-server pct") << QtNetworkSettings::serverName() << 3128
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/%64eveloper")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/")
<< QString::fromLatin1("") << QString::fromLatin1("");
QTest::newRow("qt-test-server-basic") << QtNetworkSettings::serverName() << 3129
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/")
<< QString::fromLatin1("qsockstest") << QString::fromLatin1("password");
#if 0
@@ -797,7 +788,7 @@ void tst_QHttp::proxy_data()
// the tst_QHttp class is too strict to handle the byte counts sent by dataSendProgress
// So don't run this test:
QTest::newRow("qt-test-server-ntlm") << QtNetworkSettings::serverName() << 3130
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/")
<< QString::fromLatin1("qsockstest") << QString::fromLatin1("password");
#endif
}
@@ -1204,10 +1195,10 @@ void tst_QHttp::reconnect()
QHttp http;
QObject::connect(&http, SIGNAL(stateChanged(int)), this, SLOT(reconnect_state(int)));
- http.setHost("trolltech.com", 80);
- http.get("/company/index.html");
- http.setHost("trolltech.com", 8080);
- http.get("/company/index.html");
+ http.setHost(QtNetworkSettings::serverName(), 80);
+ http.get("/");
+ http.setHost(QtNetworkSettings::serverName(), 8080);
+ http.get("/");
QTestEventLoop::instance().enterLoop(60);
if (QTestEventLoop::instance().timeout())
@@ -1305,7 +1296,7 @@ void tst_QHttp::pctEncodedPath()
void tst_QHttp::caseInsensitiveKeys()
{
- QHttpResponseHeader header("HTTP/1.1 200 OK\r\nContent-Length: 213\r\nX-Been-There: True\r\nLocation: http://www.TrollTech.com/\r\n\r\n");
+ QHttpResponseHeader header("HTTP/1.1 200 OK\r\nContent-Length: 213\r\nX-Been-There: True\r\nLocation: http://www.Qt-Project.org/\r\n\r\n");
QVERIFY(header.hasKey("Content-Length"));
QVERIFY(header.hasKey("X-Been-There"));
QVERIFY(header.hasKey("Location"));
@@ -1314,16 +1305,16 @@ void tst_QHttp::caseInsensitiveKeys()
QVERIFY(header.hasKey("location"));
QCOMPARE(header.value("Content-Length"), QString("213"));
QCOMPARE(header.value("X-Been-There"), QString("True"));
- QCOMPARE(header.value("Location"), QString("http://www.TrollTech.com/"));
+ QCOMPARE(header.value("Location"), QString("http://www.Qt-Project.org/"));
QCOMPARE(header.value("content-length"), QString("213"));
QCOMPARE(header.value("x-been-there"), QString("True"));
- QCOMPARE(header.value("location"), QString("http://www.TrollTech.com/"));
- QCOMPARE(header.allValues("location"), QStringList("http://www.TrollTech.com/"));
+ QCOMPARE(header.value("location"), QString("http://www.Qt-Project.org/"));
+ QCOMPARE(header.allValues("location"), QStringList("http://www.Qt-Project.org/"));
header.addValue("Content-Length", "213");
header.addValue("Content-Length", "214");
header.addValue("Content-Length", "215");
- qDebug() << header.toString();
+ QCOMPARE(header.allValues("Content-Length"), QStringList() << "213" << "213" << "214" << "215");
}
void tst_QHttp::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *auth)
@@ -1422,7 +1413,7 @@ void tst_QHttp::cachingProxyAndSsl()
void tst_QHttp::emptyBodyInReply()
{
// Note: if this test starts failing, please verify the date on the file
- // returned by Apache on http://netiks.troll.no/
+ // returned by Apache on the network test server
// It is right now hard-coded to the date below
QHttp http;
http.setHost(QtNetworkSettings::serverName());