1
=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
2
--- tests/qmltests/Components/tst_ZoomableImage.qml	2014-04-25 14:48:36 +0000
3
+++ tests/qmltests/Components/tst_ZoomableImage.qml	2014-05-23 14:07:40 +0000
4
@@ -98,22 +98,23 @@
5
98
            // move mouse to center
98
            // move mouse to center
6
99
            mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
99
            mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
7
100
100
8
101
            var oldScale = image.scale;
9
101
            // Test Zoom-in Zoom-out twice.
102
            // Test Zoom-in Zoom-out twice.
10
102
            for (var c=0; c<2; c++) {
103
            for (var c=0; c<2; c++) {
11
103
                // zoom in
104
                // zoom in
12
104
                for (var i=0; i<10; i++) {
105
                for (var i=0; i<10; i++) {
13
105
                    mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);
106
                    mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);
17
106
                    tryCompare(image, "scale", 1.0 + (i + 1) * 0.1);
107
                    tryCompare(image, "scale", oldScale + (i + 1) * 0.1);
18
107
                    compare(flickable.contentWidth, lazyImage.width * image.scale);
108
                    compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
19
108
                    compare(flickable.contentHeight, lazyImage.height * image.scale);
109
                    compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
20
109
                }
110
                }
21
110
111
22
111
                // zoom out
112
                // zoom out
23
112
                for (var i=0; i<10; i++) {
113
                for (var i=0; i<10; i++) {
24
113
                    mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);
114
                    mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);
28
114
                    tryCompare(image, "scale", 2.0 - (i + 1) * 0.1);
115
                    tryCompare(image, "scale", oldScale + 1.0 - (i + 1) * 0.1);
29
115
                    compare(flickable.contentWidth, lazyImage.width * image.scale);
116
                    compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
30
116
                    compare(flickable.contentHeight, lazyImage.height * image.scale);
117
                    compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
31
117
                }
118
                }
32
118
            }
119
            }
33
119
        }
120
        }
34
@@ -123,16 +124,12 @@
35
123
                       zoomable:false,
124
                       zoomable:false,
36
124
                       answer1: true,
125
                       answer1: true,
37
125
                       answer2: false,
126
                       answer2: false,
41
126
                       answer3: true,
127
                       answer3: true },
39
127
                       answer4: 1.0,
40
128
                       answer5: 1.0 },
42
129
                     { source:widgetData2["source"],
128
                     { source:widgetData2["source"],
43
130
                       zoomable:true,
129
                       zoomable:true,
44
131
                       answer1: false,
130
                       answer1: false,
45
132
                       answer2: true,
131
                       answer2: true,
49
133
                       answer3: false,
132
                       answer3: false }
47
134
                       answer4: 1.7740461882048026,
48
135
                       answer5: 1.0 }
50
136
                   ]
133
                   ]
51
137
        }
134
        }
52
138
135
53
@@ -163,7 +160,7 @@
54
163
            var y2End = zoomableImage.height * 5 / 6;
160
            var y2End = zoomableImage.height * 5 / 6;
55
164
161
56
165
            var oldScale = image.scale;
162
            var oldScale = image.scale;
58
166
163
            var newScale = -1;
59
167
            // move mouse to center
164
            // move mouse to center
60
168
            mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
165
            mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
61
169
166
62
@@ -172,20 +169,25 @@
63
172
                wait(3000); // have to delay between two consequent pinch event.
169
                wait(3000); // have to delay between two consequent pinch event.
64
173
                // pinch zoom-in
170
                // pinch zoom-in
65
174
                touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);
171
                touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);
66
172
                waitForRendering(image);
67
175
173
70
176
                tryCompare(image, "scale", data.answer4);
174
                if (newScale == -1) {
71
177
                var newScale = image.scale;
175
                    newScale = image.scale;
72
176
                }
73
177
                tryCompare(image, "scale", newScale);
74
178
                compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);
178
                compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);
75
179
                compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
179
                compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
76
180
                compare(signalSpy.count == 0, data.answer3, "scale signal count error");
180
                compare(signalSpy.count == 0, data.answer3, "scale signal count error");
80
181
                compare(newScale, data.answer4, "scale factor error");
181
                compare(image.scale, newScale, "scale factor error");
81
182
                compare(flickable.contentWidth, lazyImage.width * image.scale);
182
                compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
82
183
                compare(flickable.contentHeight, lazyImage.height * image.scale);
183
                compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
83
184
184
84
185
                wait(3000); // have to delay between two consequent pinch event.
185
                wait(3000); // have to delay between two consequent pinch event.
85
186
                // pinch zoom-out
186
                // pinch zoom-out
86
187
                touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
187
                touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
88
188
                tryCompare(image, "scale", data.answer5);
188
                tryCompare(image, "scale", oldScale);
89
189
                compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
90
190
                compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
91
189
            }
191
            }
92
190
        }
192
        }
93
191
    }
193
    }
94
192
194
95
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
96
--- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2014-04-08 12:38:12 +0000
97
+++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2014-05-23 14:07:40 +0000
98
@@ -26,14 +26,14 @@
99
26
    color: "lightgrey"
26
    color: "lightgrey"
100
27
27
101
28
    property var widgetData0: {
28
    property var widgetData0: {
102
29
        "source": ""
103
30
    }
104
31
105
32
    property var widgetData1: {
106
33
        "source": Qt.resolvedUrl("../artwork/checkers.png"),
29
        "source": Qt.resolvedUrl("../artwork/checkers.png"),
107
34
        "zoomable": false
30
        "zoomable": false
108
35
    }
31
    }
109
36
32
110
33
    property var widgetData1: {
111
34
        "source": ""
112
35
    }
113
36
114
37
    PreviewZoomableImage {
37
    PreviewZoomableImage {
115
38
        id: zoomableImage
38
        id: zoomableImage
116
39
        anchors.fill: parent
39
        anchors.fill: parent
117
@@ -49,11 +49,13 @@
118
49
49
119
50
            zoomableImage.widgetData = widgetData0;
50
            zoomableImage.widgetData = widgetData0;
120
51
            waitForRendering(zoomableImage);
51
            waitForRendering(zoomableImage);
121
52
            waitForRendering(image);
122
53
            tryCompare(image, "imageState", "ready");
123
54
124
55
            zoomableImage.widgetData = widgetData1;
125
56
            waitForRendering(zoomableImage);
126
57
            waitForRendering(image);
127
52
            tryCompare(image, "imageState", "default");
58
            tryCompare(image, "imageState", "default");
128
53
129
54
            zoomableImage.widgetData = widgetData1;
130
55
            waitForRendering(zoomableImage);
131
56
            tryCompare(image, "imageState", "ready");
132
57
        }
59
        }
133
58
    }
60
    }
134
59
}
61
}
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2014-05-07	Approve on 2014-05-26
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-05-23
Michał Sawicz			Needs Fixing on 2014-05-22
Review via email: mp+218649@code.launchpad.net
1	=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
2	--- tests/qmltests/Components/tst_ZoomableImage.qml 2014-04-25 14:48:36 +0000
3	+++ tests/qmltests/Components/tst_ZoomableImage.qml 2014-05-23 14:07:40 +0000
4	@@ -98,22 +98,23 @@
5	98	// move mouse to center	98	// move mouse to center
6	99	mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);	99	mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
7	100		100
8			101	var oldScale = image.scale;
9	101	// Test Zoom-in Zoom-out twice.	102	// Test Zoom-in Zoom-out twice.
10	102	for (var c=0; c<2; c++) {	103	for (var c=0; c<2; c++) {
11	103	// zoom in	104	// zoom in
12	104	for (var i=0; i<10; i++) {	105	for (var i=0; i<10; i++) {
13	105	mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);	106	mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);
17	106	tryCompare(image, "scale", 1.0 + (i + 1) * 0.1);	107	tryCompare(image, "scale", oldScale + (i + 1) * 0.1);
18	107	compare(flickable.contentWidth, lazyImage.width * image.scale);	108	compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
19	108	compare(flickable.contentHeight, lazyImage.height * image.scale);	109	compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
20	109	}	110	}
21	110		111
22	111	// zoom out	112	// zoom out
23	112	for (var i=0; i<10; i++) {	113	for (var i=0; i<10; i++) {
24	113	mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);	114	mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);
28	114	tryCompare(image, "scale", 2.0 - (i + 1) * 0.1);	115	tryCompare(image, "scale", oldScale + 1.0 - (i + 1) * 0.1);
29	115	compare(flickable.contentWidth, lazyImage.width * image.scale);	116	compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
30	116	compare(flickable.contentHeight, lazyImage.height * image.scale);	117	compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
31	117	}	118	}
32	118	}	119	}
33	119	}	120	}
34	@@ -123,16 +124,12 @@
35	123	zoomable:false,	124	zoomable:false,
36	124	answer1: true,	125	answer1: true,
37	125	answer2: false,	126	answer2: false,
41	126	answer3: true,	127	answer3: true },
39	127	answer4: 1.0,
40	128	answer5: 1.0 },
42	129	{ source:widgetData2["source"],	128	{ source:widgetData2["source"],
43	130	zoomable:true,	129	zoomable:true,
44	131	answer1: false,	130	answer1: false,
45	132	answer2: true,	131	answer2: true,
49	133	answer3: false,	132	answer3: false }
47	134	answer4: 1.7740461882048026,
48	135	answer5: 1.0 }
50	136	]	133	]
51	137	}	134	}
52	138		135
53	@@ -163,7 +160,7 @@
54	163	var y2End = zoomableImage.height * 5 / 6;	160	var y2End = zoomableImage.height * 5 / 6;
55	164		161
56	165	var oldScale = image.scale;	162	var oldScale = image.scale;
58	166		163	var newScale = -1;
59	167	// move mouse to center	164	// move mouse to center
60	168	mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);	165	mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
61	169		166
62	@@ -172,20 +169,25 @@
63	172	wait(3000); // have to delay between two consequent pinch event.	169	wait(3000); // have to delay between two consequent pinch event.
64	173	// pinch zoom-in	170	// pinch zoom-in
65	174	touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);	171	touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);
66			172	waitForRendering(image);
67	175		173
70	176	tryCompare(image, "scale", data.answer4);	174	if (newScale == -1) {
71	177	var newScale = image.scale;	175	newScale = image.scale;
72			176	}
73			177	tryCompare(image, "scale", newScale);
74	178	compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);	178	compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);
75	179	compare(newScale > oldScale, data.answer2, "scale factor didn't changed");	179	compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
76	180	compare(signalSpy.count == 0, data.answer3, "scale signal count error");	180	compare(signalSpy.count == 0, data.answer3, "scale signal count error");
80	181	compare(newScale, data.answer4, "scale factor error");	181	compare(image.scale, newScale, "scale factor error");
81	182	compare(flickable.contentWidth, lazyImage.width * image.scale);	182	compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
82	183	compare(flickable.contentHeight, lazyImage.height * image.scale);	183	compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
83	184		184
84	185	wait(3000); // have to delay between two consequent pinch event.	185	wait(3000); // have to delay between two consequent pinch event.
85	186	// pinch zoom-out	186	// pinch zoom-out
86	187	touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);	187	touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
88	188	tryCompare(image, "scale", data.answer5);	188	tryCompare(image, "scale", oldScale);
89			189	compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
90			190	compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
91	189	}	191	}
92	190	}	192	}
93	191	}	193	}
94	192		194
95	=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
96	--- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml 2014-04-08 12:38:12 +0000
97	+++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml 2014-05-23 14:07:40 +0000
98	@@ -26,14 +26,14 @@
99	26	color: "lightgrey"	26	color: "lightgrey"
100	27		27
101	28	property var widgetData0: {	28	property var widgetData0: {
102	29	"source": ""
103	30	}
104	31
105	32	property var widgetData1: {
106	33	"source": Qt.resolvedUrl("../artwork/checkers.png"),	29	"source": Qt.resolvedUrl("../artwork/checkers.png"),
107	34	"zoomable": false	30	"zoomable": false
108	35	}	31	}
109	36		32
110			33	property var widgetData1: {
111			34	"source": ""
112			35	}
113			36
114	37	PreviewZoomableImage {	37	PreviewZoomableImage {
115	38	id: zoomableImage	38	id: zoomableImage
116	39	anchors.fill: parent	39	anchors.fill: parent
117	@@ -49,11 +49,13 @@
118	49		49
119	50	zoomableImage.widgetData = widgetData0;	50	zoomableImage.widgetData = widgetData0;
120	51	waitForRendering(zoomableImage);	51	waitForRendering(zoomableImage);
121			52	waitForRendering(image);
122			53	tryCompare(image, "imageState", "ready");
123			54
124			55	zoomableImage.widgetData = widgetData1;
125			56	waitForRendering(zoomableImage);
126			57	waitForRendering(image);
127	52	tryCompare(image, "imageState", "default");	58	tryCompare(image, "imageState", "default");
128	53
129	54	zoomableImage.widgetData = widgetData1;
130	55	waitForRendering(zoomableImage);
131	56	tryCompare(image, "imageState", "ready");
132	57	}	59	}
133	58	}	60	}
134	59	}	61	}