diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquickanimatedimage/data/stickmansourcesized.qml (renamed from tests/auto/quick/qquickanimatedimage/data/stickmanerror1.qml) | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickanimatedimage/data/stickmanerror1.qml b/tests/auto/quick/qquickanimatedimage/data/stickmansourcesized.qml index 4f823b3d70..76d277df62 100644 --- a/tests/auto/quick/qquickanimatedimage/data/stickmanerror1.qml +++ b/tests/auto/quick/qquickanimatedimage/data/stickmansourcesized.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 AnimatedImage { - sourceSize: "240x180" + sourceSize: "80x60" source: "stickman.gif" } diff --git a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp index 1a01a8aca5..cb81ec8a07 100644 --- a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp +++ b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp @@ -52,9 +52,9 @@ private slots: void remote(); void remote_data(); void sourceSize(); + void setSourceSize(); void sourceSizeChanges(); void sourceSizeChanges_intermediate(); - void sourceSizeReadOnly(); void invalidSource(); void qtbug_16520(); void progressAndStatusChanges(); @@ -287,12 +287,19 @@ void tst_qquickanimatedimage::sourceSize() delete anim; } -void tst_qquickanimatedimage::sourceSizeReadOnly() +void tst_qquickanimatedimage::setSourceSize() { QQmlEngine engine; - QQmlComponent component(&engine, testFileUrl("stickmanerror1.qml")); - QVERIFY(component.isError()); - QCOMPARE(component.errors().at(0).description(), QString("Invalid property assignment: \"sourceSize\" is a read-only property")); + QQmlComponent component(&engine, testFileUrl("stickmansourcesized.qml")); + QScopedPointer<QQuickAnimatedImage> anim(qobject_cast<QQuickAnimatedImage *>(component.create())); + QVERIFY(anim); + QCOMPARE(anim->sourceSize(), QSize(80, 60)); + + anim->setSourceSize(QSize(40, 30)); + QCOMPARE(anim->sourceSize(), QSize(40, 30)); + + anim->setSourceSize(QSize()); + QCOMPARE(anim->sourceSize(), QSize(160, 120)); } void tst_qquickanimatedimage::invalidSource() |