diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-12-21 10:47:38 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-28 02:56:02 +0100 |
| commit | 9fe76bf6a684c61263e1ef584668404d7c215805 (patch) | |
| tree | f03bda26a3794d64beaf69b22b4c66ee391311a4 | |
| parent | c559edd76bdb6cdaf86389789ab05cfff648b195 (diff) | |
Remove mention of Trolltech in QHttp autotest.
The data file named "trolltech" has nothing specific to Trolltech in its
contents. Rename it to "testhtml". The lack of a file extension is
intentional.
Task-number: QTBUG-19653
Change-Id: Idc5c5f4ffa447151e47f66ff7364f0fa8753a699
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/network/access/qhttp/qhttp.pro | 2 | ||||
| -rw-r--r-- | tests/auto/network/access/qhttp/testhtml (renamed from tests/auto/network/access/qhttp/trolltech) | 0 | ||||
| -rw-r--r-- | tests/auto/network/access/qhttp/tst_qhttp.cpp | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/network/access/qhttp/qhttp.pro b/tests/auto/network/access/qhttp/qhttp.pro index d25b321851..d672eb6009 100644 --- a/tests/auto/network/access/qhttp/qhttp.pro +++ b/tests/auto/network/access/qhttp/qhttp.pro @@ -10,7 +10,7 @@ wince*: { webFiles.path = webserver cgi.files = webserver/cgi-bin/* cgi.path = webserver/cgi-bin - addFiles.files = rfc3252.txt trolltech + addFiles.files = rfc3252.txt testhtml addFiles.path = . DEPLOYMENT += addFiles webFiles cgi DEFINES += SRCDIR=\\\"\\\" diff --git a/tests/auto/network/access/qhttp/trolltech b/tests/auto/network/access/qhttp/testhtml index c155360e8d..c155360e8d 100644 --- a/tests/auto/network/access/qhttp/trolltech +++ b/tests/auto/network/access/qhttp/testhtml diff --git a/tests/auto/network/access/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp index f6514bade1..8adb0ca05d 100644 --- a/tests/auto/network/access/qhttp/tst_qhttp.cpp +++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp @@ -306,9 +306,9 @@ void tst_QHttp::get_data() QByteArray rfc3252 = file.readAll(); file.close(); - file.setFileName( SRCDIR "trolltech" ); + file.setFileName( SRCDIR "testhtml" ); QVERIFY( file.open( QIODevice::ReadOnly ) ); - QByteArray trolltech = file.readAll(); + QByteArray testhtml = file.readAll(); file.close(); // test the two get() modes in one routine @@ -334,7 +334,7 @@ void tst_QHttp::get_data() // 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 << trolltech << (bool)(i==1); + << 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); |