974e2ac · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Remove the tests which are already in ZoomableImage's test.

974e2acYing-Chun Liu13 years ago

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml−49

compare with xenial

unifiedsplit

@@ -55,58 +55,9 @@ Rectangle {

55 waitForRendering(zoomableImage);

56 tryCompare(image, "state", "default");

58− wait(3000);

59−

60 zoomableImage.widgetData = widgetData1;

58 zoomableImage.widgetData = widgetData1;

61 waitForRendering(zoomableImage);

59 waitForRendering(zoomableImage);

62 tryCompare(image, "state", "ready");

60 tryCompare(image, "state", "ready");

63 }

61 }

64−

65− function test_zoomable() {

66− var image = findChild(zoomableImage, "image");

67−

68− zoomableImage.widgetData = widgetData2;

69− waitForRendering(zoomableImage);

70−

71− tryCompare(image, "state", "ready");

72− waitForRendering(image);

73−

74− var event1 = touchEvent();

75− var event2 = touchEvent();

76− var x1Start = zoomableImage.width * 2 / 6;

77− var y1Start = zoomableImage.height * 2 / 6;

78− var x1End = zoomableImage.width * 1 / 6;

79− var y1End = zoomableImage.height * 1 / 6;

80− var x2Start = zoomableImage.width * 4 / 6;

81− var y2Start = zoomableImage.height * 4 / 6;

82− var x2End = zoomableImage.width * 5 / 6;

83− var y2End = zoomableImage.height * 5 / 6;

84−

85− var oldScale = image.scale;

86−

87− mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);

88− mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);

89−

90− event1.press(0, x1Start, y1Start);

91− event1.commit();

92− event1.press(1, x2Start, y2Start);

93− event1.commit();

94−

95− for (var i = 0.0; i < 1.0; i += 0.02) {

96− event1.move(0, x1Start + (x1End - x1Start) * i, y1Start + (y1End - y1Start) * i);

97− event1.move(1, x2Start + (x2End - x2Start) * i, y2Start + (y2End - y2Start) * i);

98− event1.commit();

99− wait(30);

100− }

101−

102− event1.release(0, x1End, y1End);

103− event1.commit();

104− event1.release(1, x2End, y2End);

105− event1.commit();

106−

107− var newScale = image.scale;

108−

109− compare(newScale > oldScale, true, "the image should be larger than before");

110− }

111 }

62 }

112}

63}