diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2011-05-23 14:44:10 +1000 |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2011-05-23 14:49:46 +1000 |
| commit | b8bc919e4ae9cccb056eccceecbb535c47985aa3 (patch) | |
| tree | c9ac62c11fd368eaf901c239f00cdb60a0909104 /tests | |
| parent | 5695c61b11618b163a326afaa2f1b0bb4854339c (diff) | |
Fix QDeclarativeImage test
Use smaller images that fit in the cache.
Task-number: QTBUG-19425
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 8742e6c388..a86c77a5da 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -544,7 +544,7 @@ void tst_qdeclarativeimage::noLoading() server.serveDirectory(SRCDIR "/data"); server.addRedirect("oldcolors.png", SERVER_ADDR "/colors.png"); - QString componentStr = "import QtQuick 1.0\nImage { source: srcImage }"; + QString componentStr = "import QtQuick 1.1\nImage { source: srcImage; cache: true }"; QDeclarativeContext *ctxt = engine.rootContext(); ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/heart.png")); QDeclarativeComponent component(&engine); @@ -558,7 +558,7 @@ void tst_qdeclarativeimage::noLoading() QSignalSpy statusSpy(obj, SIGNAL(statusChanged(QDeclarativeImageBase::Status))); // Loading local file - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png")); + ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/green.png")); QTRY_VERIFY(obj->status() == QDeclarativeImage::Ready); QTRY_VERIFY(obj->progress() == 1.0); QTRY_COMPARE(sourceSpy.count(), 1); @@ -566,7 +566,7 @@ void tst_qdeclarativeimage::noLoading() QTRY_COMPARE(statusSpy.count(), 0); // Loading remote file - ctxt->setContextProperty("srcImage", QString(SERVER_ADDR) + "/heart200.png"); + ctxt->setContextProperty("srcImage", QString(SERVER_ADDR) + "/rect.png"); QTRY_VERIFY(obj->status() == QDeclarativeImage::Loading); QTRY_VERIFY(obj->progress() == 0.0); QTRY_VERIFY(obj->status() == QDeclarativeImage::Ready); @@ -576,12 +576,11 @@ void tst_qdeclarativeimage::noLoading() QTRY_COMPARE(statusSpy.count(), 2); // Loading remote file again - should not go through 'Loading' state. - ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png")); - ctxt->setContextProperty("srcImage", QString(SERVER_ADDR) + "/heart200.png"); + ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/green.png")); + ctxt->setContextProperty("srcImage", QString(SERVER_ADDR) + "/rect.png"); QTRY_VERIFY(obj->status() == QDeclarativeImage::Ready); QTRY_VERIFY(obj->progress() == 1.0); QTRY_COMPARE(sourceSpy.count(), 4); - QSKIP("QTBUG-19425", SkipSingle); QTRY_COMPARE(progressSpy.count(), 2); QTRY_COMPARE(statusSpy.count(), 2); |