From: Shane Kearns <ext-shane.2.kearns@nokia.com>
Date: Mon, 5 Mar 2012 14:09:04 +0000 (+0000)
Subject: Fix QNetworkReply ioGetFromHttpWithCache test case
X-Git-Tag: qt-v5.0.0-alpha1~537
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=299e7ffd6a8a91f1d4259b91d4a519c1933c5f33;p=profile%2Fivi%2Fqtbase.git

Fix QNetworkReply ioGetFromHttpWithCache test case

Expiration date is calculated from max-age header when a response is
inserted into the cache. Because the test case is prepopulating the
cache outside of QNAM's control, the expiration date was uninitialised,
causing the test to fail.

This is due to a 2 year old change in QNAM, where max age calculation was
removed from cache retrieval, and more recent changes to QDateTime
where secsTo() returns 0 if one of the arguments is invalid.

Change-Id: Ieecd46123dde4ca0fd0be3ae79e70e1528ec02bc
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
---

diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index d8f9bf3..00b3fd1 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -3385,6 +3385,7 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
             << QNetworkCacheMetaData::RawHeader("Cache-control", "max-age=0"); // isn't used in cache loading
     content.first.setRawHeaders(rawHeaders);
     content.first.setLastModified(past);
+    content.first.setExpirationDate(past);
 
     QTest::newRow("expired,200,prefer-network")
             << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << false << true;