git.iko.soy/unity8
on xenial help sign in
improve tryCompare addition
7196dc0Albert Astals Cid
tests/qmltests/Dash/Previews/tst_PreviewActions.qml+1−2
compare with xenial
unifiedsplit
@@ -151,12 +151,11 @@ Rectangle {
151 {
151 {
152 var button = findChild(buttonGroup, "moreLessButton");
152 var button = findChild(buttonGroup, "moreLessButton");
153 var buttonColumn = findChild(buttonGroup, "buttonColumn");
153 var buttonColumn = findChild(buttonGroup, "buttonColumn");
154− var buttonColumnInitialHeight = buttonColumn.height;
155 var buttonGroupInitialHeight = buttonGroup.height;
154 var buttonGroupInitialHeight = buttonGroup.height;
156 verify(button != null);
155 verify(button != null);
157 mouseClick(button);
156 mouseClick(button);
158 tryCompare(buttonColumn, "height", buttonColumn.implicitHeight);
157 tryCompare(buttonColumn, "height", buttonColumn.implicitHeight);
159− tryCompare(buttonGroup, "height", buttonGroupInitialHeight + (buttonColumn.height - buttonColumnInitialHeight + units.gu(1)));
158+ tryCompare(buttonGroup, "height", buttonGroupInitialHeight + (buttonColumn.height + buttonColumn.anchors.topMargin));
160 }
159 }
161
160
162 function test_comboButton(data) {
161 function test_comboButton(data) {