5a05593 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix ZoomableImage test fail. Use relative scale.

5a05593Ying-Chun Liu12 years ago

tests/qmltests/Components/tst_ZoomableImage.qml+10−11

compare with xenial

unifiedsplit

@@ -124,16 +124,12 @@ Rectangle {

124 zoomable:false,

125 answer1: true,

126 answer2: false,

127− answer3: true,

127+ answer3: true },

128− answer4: 0.5,

129− answer5: 0.5 },

130 { source:widgetData2["source"],

128 { source:widgetData2["source"],

131 zoomable:true,

129 zoomable:true,

132 answer1: false,

130 answer1: false,

133 answer2: true,

131 answer2: true,

134− answer3: false,

132+ answer3: false }

135− answer4: 0.8870230941024013,

136− answer5: 0.5 }

137 ]

133 ]

138 }

134 }

139

135

@@ -164,7 +160,7 @@ Rectangle {

164 var y2End = zoomableImage.height * 5 / 6;

160 var y2End = zoomableImage.height * 5 / 6;

165

161

166 var oldScale = image.scale;

162 var oldScale = image.scale;

167−

163+ var newScale = -1;

168 // move mouse to center

164 // move mouse to center

169 mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);

165 mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);

170

166

@@ -173,20 +169,23 @@ Rectangle {

173 wait(3000); // have to delay between two consequent pinch event.

169 wait(3000); // have to delay between two consequent pinch event.

174 // pinch zoom-in

170 // pinch zoom-in

175 touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);

171 touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);

172+ waitForRendering(image);

176

173

177− tryCompare(image, "scale", data.answer4);

174+ if (newScale == -1) {

178− var newScale = image.scale;

175+ newScale = image.scale;

176+ }

177+ tryCompare(image, "scale", newScale);

179 compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);

178 compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);

180 compare(newScale > oldScale, data.answer2, "scale factor didn't changed");

179 compare(newScale > oldScale, data.answer2, "scale factor didn't changed");

181 compare(signalSpy.count == 0, data.answer3, "scale signal count error");

180 compare(signalSpy.count == 0, data.answer3, "scale signal count error");

182− compare(newScale, data.answer4, "scale factor error");

181+ compare(image.scale, newScale, "scale factor error");

183 compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));

182 compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));

184 compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));

183 compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));

185

184

186 wait(3000); // have to delay between two consequent pinch event.

185 wait(3000); // have to delay between two consequent pinch event.

187 // pinch zoom-out

186 // pinch zoom-out

188 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);

187 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);

189− tryCompare(image, "scale", data.answer5);

188+ tryCompare(image, "scale", oldScale);

190 compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));

189 compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));

191 compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));

190 compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));

192 }

191 }

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+7−5

@@ -26,12 +26,12 @@ Rectangle {

26 color: "lightgrey"

28 property var widgetData0: {

29− "source": ""

29+ "source": Qt.resolvedUrl("../artwork/checkers.png"),

30+ "zoomable": false

30 }

31 }

32 property var widgetData1: {

33 property var widgetData1: {

33− "source": Qt.resolvedUrl("../artwork/checkers.png"),

34+ "source": ""

34− "zoomable": false

35 }

37 PreviewZoomableImage {

@@ -49,11 +49,13 @@ Rectangle {

50 zoomableImage.widgetData = widgetData0;

51 waitForRendering(zoomableImage);

52+ waitForRendering(image);

52− tryCompare(image, "imageState", "default");

53+ tryCompare(image, "imageState", "ready");

54 zoomableImage.widgetData = widgetData1;

55 zoomableImage.widgetData = widgetData1;

55 waitForRendering(zoomableImage);

56 waitForRendering(zoomableImage);

57+ waitForRendering(image);

56− tryCompare(image, "imageState", "ready");

58+ tryCompare(image, "imageState", "default");

57 }

59 }

58 }

60 }

59}

61}