on xenial help sign in
Fix PreviewZoomableImage unit test.
commit4fa93a0d7e3214883439aeb341eec11aacf01d37 authorYing-Chun Liu <paul.liu@canonical.com> dateThu 27 Mar 2014, 23:30 (13 years ago) parent974e2ac
3 files changed+13−17
qml/Components/ZoomableImage.qml+1 tests/qmltests/Components/tst_ZoomableImage.qml+9−9 tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+3−8
qml/Components/ZoomableImage.qml+1
@@ -38,6 +38,7 @@ Item {
3838 clip: true
3939 contentHeight: imageContainer.height
4040 contentWidth: imageContainer.width
41+
4142 onHeightChanged: image.resetScale()
4243 onWidthChanged: image.resetScale()
4344 anchors.fill: parent
tests/qmltests/Components/tst_ZoomableImage.qml+9−9
@@ -21,8 +21,8 @@ import Unity.Test 0.1 as UT
2121
2222Rectangle {
2323 id: root
24− width: units.gu(40)
25− height: units.gu(80)
24+ width: units.gu(20)
25+ height: units.gu(40)
2626 color: "lightgrey"
2727
2828 property var widgetData0: {
@@ -76,6 +76,12 @@ Rectangle {
7676 compare (signalSpy.count, 1);
7777 }
7878
79+ function get_filename(a) {
80+ var wordsA = a.split("/");
81+ var filenameA = wordsA[wordsA.length-1];
82+ return filenameA;
83+ }
84+
7985 function test_zoomable_data() {
8086 return [ { source:widgetData2["source"],
8187 zoomable:false,
@@ -90,12 +96,6 @@ Rectangle {
9096 ]
9197 }
9298
93− function get_filename(a) {
94− var wordsA = a.split("/");
95− var filenameA = wordsA[wordsA.length-1];
96− return filenameA;
97− }
98−
9999 function test_zoomable(data) {
100100 var image = findChild(zoomableImage, "image");
101101 var lazyImage = findChild(zoomableImage, "lazyImage");
@@ -135,9 +135,9 @@ Rectangle {
135135
136136 for (var i = 0.0; i < 1.0; i += 0.02) {
137137 event1.move(0, x1Start + (x1End - x1Start) * i, y1Start + (y1End - y1Start) * i);
138+ event1.commit();
138139 event1.move(1, x2Start + (x2End - x2Start) * i, y2Start + (y2End - y2Start) * i);
139140 event1.commit();
140− wait(30);
141141 }
142142
143143 event1.release(0, x1End, y1End);
tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+3−8
@@ -34,14 +34,9 @@ Rectangle {
3434 "zoomable": false
3535 }
3636
37− property var widgetData2: {
38− "source": "../graphics/phone/screenshots/gallery@12.png",
39− "zoomable": true
40− }
41−
4237 PreviewZoomableImage {
4338 id: zoomableImage
44− width: parent.width
39+ anchors.fill: parent
4540 }
4641
4742 UT.UnityTestCase {
@@ -53,11 +48,11 @@ Rectangle {
5348
5449 zoomableImage.widgetData = widgetData0;
5550 waitForRendering(zoomableImage);
56− tryCompare(image, "state", "default");
51+ tryCompare(image, "imageState", "default");
5752
5853 zoomableImage.widgetData = widgetData1;
5954 waitForRendering(zoomableImage);
60− tryCompare(image, "state", "ready");
55+ tryCompare(image, "imageState", "ready");
6156 }
6257 }
6358}