391dbfe · unity8 · git.iko.soy

on xenial help sign in

Make PreviewActionsTest::test_comboButton more stable

391dbfeAlbert Astals Cid10 years ago

tests/qmltests/Dash/Previews/tst_PreviewActions.qml+2−1

@@ -151,15 +151,16 @@ Rectangle {

151 {

152 var button = findChild(buttonGroup, "moreLessButton");

153 var buttonColumn = findChild(buttonGroup, "buttonColumn");

154+ var buttonGroupInitialHeight = buttonGroup.height;

154 verify(button != null);

155 verify(button != null);

155 mouseClick(button);

156 mouseClick(button);

156 tryCompare(buttonColumn, "height", buttonColumn.implicitHeight);

157 tryCompare(buttonColumn, "height", buttonColumn.implicitHeight);

158+ tryCompare(buttonGroup, "height", buttonGroupInitialHeight + buttonColumn.height + buttonColumn.anchors.topMargin);

157 }

159 }

158

160

159 function test_comboButton(data) {

161 function test_comboButton(data) {

160 var twoActionsY = twoActions.y

162 var twoActionsY = twoActions.y

161 pressMoreButton(buttonAndCombo);

163 pressMoreButton(buttonAndCombo);

162− tryCompareFunction(function () { return twoActions.y <= twoActionsY; }, false);

163 checkButtonPressSignal(buttonAndCombo, data.id);

164 checkButtonPressSignal(buttonAndCombo, data.id);

164 mouseClick(findChild(buttonAndCombo, "moreLessButton"));

165 mouseClick(findChild(buttonAndCombo, "moreLessButton"));

165 tryCompare(twoActions, "y", twoActionsY);

166 tryCompare(twoActions, "y", twoActionsY);