git.iko.soy/unity8
on xenial help sign in
Fix some qmluitests

Approved by: Michael Zanetti

commit3558866dd10e452a9f74b7cde61070d5bc5e0f12 authorAlbert Astals <albert.astals@canonical.com> dateTue 25 Nov 2014, 13:54 (12 years ago) parenta761c825eba01c
3 files changed+5−5
compare with xenial
unifiedsplit
tests/qmltests/Dash/tst_GenericScopeView.qml+2−2 tests/qmltests/Dash/tst_PreviewListView.qml+2−2 tests/qmltests/Panel/tst_IndicatorsBar.qml+1−1
tests/qmltests/Dash/tst_GenericScopeView.qml+2−2
@@ -461,8 +461,8 @@ Item {
461461
462462 var innerHeader = findChild(header, "innerPageHeader");
463463 verify(innerHeader, "Could not find the inner header");
464− verify(Qt.colorEqual(innerHeader.textColor, data.foreground),
465− "Foreground color not equal: %1 != %2".arg(innerHeader.textColor).arg(data.foreground));
464+ verify(Qt.colorEqual(innerHeader.config.foregroundColor, data.foreground),
465+ "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(data.foreground));
466466
467467 var background = findChild(header, "headerBackground");
468468 verify(background, "Could not find the background");
tests/qmltests/Dash/tst_PreviewListView.qml+2−2
@@ -100,8 +100,8 @@ Rectangle {
100100
101101 var innerHeader = findChild(header, "innerPageHeader");
102102 verify(innerHeader, "Could not find the inner header");
103− verify(Qt.colorEqual(innerHeader.textColor, UbuntuColors.darkGrey),
104− "Foreground color not equal: %1 != %2".arg(innerHeader.textColor).arg(UbuntuColors.darkGrey));
103+ verify(Qt.colorEqual(innerHeader.config.foregroundColor, UbuntuColors.darkGrey),
104+ "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(UbuntuColors.darkGrey));
105105
106106 var background = findChild(header, "headerBackground");
107107 verify(background, "Could not find the background");
tests/qmltests/Panel/tst_IndicatorsBar.qml+1−1
@@ -136,8 +136,8 @@ IndicatorTest {
136136 var dataItem = findChild(indicatorsBar, root.originalModelData[data.index]["identifier"] + "-panelItem");
137137 verify(dataItem !== null);
138138
139+ waitForRendering(dataItem);
139140 var mappedPosition = indicatorsBar.mapFromItem(dataItem, dataItem.width/2, dataItem.height/2);
140−
141141 indicatorsBar.selectItemAt(mappedPosition.x);
142142 indicatorsBar.expanded = true;
143143 wait_for_expansion_to_settle();