diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-04 00:28:26 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-04 00:28:26 (GMT) |
| commit | 72cca6fe7739c7b5ccd5fc17fb3e1913cc82dce1 (patch) | |
| tree | 4de2902aba198d339a2ea75d14bbc3d2b2d11723 /tests/auto/qnetworkreply | |
| parent | 9e57401d403ca31a880636ab91301158a085de09 (diff) | |
| parent | 4c501d7fce503a610edabfba5d6efc3ef2778bef (diff) | |
| download | Qt-72cca6fe7739c7b5ccd5fc17fb3e1913cc82dce1.zip Qt-72cca6fe7739c7b5ccd5fc17fb3e1913cc82dce1.tar.gz Qt-72cca6fe7739c7b5ccd5fc17fb3e1913cc82dce1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qnetworkreply')
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 52e967f..a223d1c 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -1366,8 +1366,10 @@ void tst_QNetworkReply::getFromHttp() QCOMPARE(reply->url(), request.url()); QCOMPARE(reply->error(), QNetworkReply::NoError); QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200); - - QCOMPARE(reply->header(QNetworkRequest::ContentLengthHeader).toLongLong(), reference.size()); + QCOMPARE(reply->size(), reference.size()); + // only compare when the header is set. + if (reply->header(QNetworkRequest::ContentLengthHeader).isValid()) + QCOMPARE(reply->header(QNetworkRequest::ContentLengthHeader).toLongLong(), reference.size()); QCOMPARE(reply->readAll(), reference.readAll()); } |