git.iko.soy/unity8
on xenial help sign in
Fixed tests
commita394547b6c90518b2c8c92775640e6577e56f988 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 15 Jan 2014, 12:34 (13 years ago) parenta4c01dd
4 files changed+5−5
compare with xenial
unifiedsplit
plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml+2 tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml−4 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1 tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+2
plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml+2
@@ -88,6 +88,7 @@ Item {
8888 avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
8989 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
9090 // actions
91+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
9192// enabled: menuData && menuData.sensitive || false
9293 removable: !selected
9394 selected: messageFactoryItem.selected
@@ -136,6 +137,7 @@ Item {
136137 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
137138 // actions
138139 replyEnabled: replyAction.valid && replyAction.enabled
140+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
139141// enabled: menuData && menuData.sensitive || false
140142 removable: !selected
141143 selected: messageFactoryItem.selected
tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml−4
@@ -129,14 +129,10 @@ Item {
129129 function test_reloadData() {
130130 var mainMenu = findChild(page, "mainMenu");
131131
132− console.log("setting empty data");
133132 page.menuModel.modelData = [];
134133 tryCompare(mainMenu, "count", 0);
135− console.log("set empty data");
136134
137− console.log("setting full data");
138135 page.menuModel.modelData = fullMenuData;
139− console.log("set full data");
140136 tryCompare(mainMenu, "count", 3);
141137
142138 page.menuModel.modelData = [];
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1
@@ -157,13 +157,13 @@ Item {
157157 menuData.type = "com.canonical.indicator.slider"
158158 menuData.label = data.label;
159159 menuData.sensitive = data.enabled;
160− menuData.actionState = data.value;
161160 menuData.ext = {
162161 'minIcon': "file:///testMinIcon",
163162 'maxIcon': "file:///testMaxIcon",
164163 'minValue': data.minValue,
165164 'maxValue': data.maxValue
166165 };
166+ menuData.actionState = data.value;
167167
168168 loader.data = menuData;
169169 loader.sourceComponent = factory.load(menuData);
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+2
@@ -137,6 +137,7 @@ Item {
137137 compare(loader.item.message, data.message, "Message does not match data");
138138 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
139139 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
140+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
140141// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
141142 }
142143
@@ -179,6 +180,7 @@ Item {
179180 compare(loader.item.message, data.message, "Message does not match data");
180181 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
181182 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
183+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
182184// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
183185 }
184186