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

Remove mention of Trolltech in QHttp autotest.

Browse Source 
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>
This commit is contained in:
Jason McDonald 2011-12-21 10:47:38 +10:00 committed by Qt by Nokia
parent c559edd76b
commit 9fe76bf6a6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/network/access/qhttp/qhttp.pro
View File

@ -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=\\\"\\\"

0
tests/auto/network/access/qhttp/trolltech → tests/auto/network/access/qhttp/testhtml
View File

6
tests/auto/network/access/qhttp/tst_qhttp.cpp
View File

@ -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);