git.iko.soy/unity8
on xenial help sign in
Fix test: The items don't have template anymore
commitc416cfee6cec3d6c592b38e4370c1d6304003c59 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 13 May 2015, 12:24 (11 years ago) parenta92cf82
2 files changed+37−21
compare with xenial
unifiedsplit
qml/Dash/CardTool.qml+16−14 tests/qmltests/Dash/tst_GenericScopeView.qml+21−7
qml/Dash/CardTool.qml+16−14
@@ -198,8 +198,8 @@ Item {
198198
199199 Loader {
200200 id: cardLoader
201− property var fields: ["art", "mascot", "title", "subtitle", "summary", "attributes"]
202− property var maxData: {
201+ readonly property var fields: ["art", "mascot", "title", "subtitle", "summary", "attributes"]
202+ readonly property var maxData: {
203203 "art": Qt.resolvedUrl("graphics/pixel.png"),
204204 "mascot": Qt.resolvedUrl("graphics/pixel.png"),
205205 "title": "—\n—",
@@ -216,20 +216,22 @@ Item {
216216 item.height = Qt.binding(function() { return cardTool.cardHeight || item.implicitHeight; });
217217 }
218218 Connections {
219− target: cardLoader.item
220− onComponentsChanged: {
221− var data = {};
222− for (var k in cardLoader.fields) {
223− var component = cardLoader.item.components[cardLoader.fields[k]];
224− var key = cardLoader.fields[k];
225− if ((typeof component === "string" && component.length > 0) ||
226− (typeof component === "object" && component !== null
227− && typeof component["field"] === "string" && component["field"].length > 0)) {
228− data[key] = cardLoader.maxData[key];
229− }
219+ target: cardTool
220+ onTemplateChanged: cardLoader.updateCardData();
221+ onComponentsChanged: cardLoader.updateCardData();
222+ }
223+ function updateCardData() {
224+ var data = {};
225+ for (var k in fields) {
226+ var component = cardTool.components[fields[k]];
227+ var key = fields[k];
228+ if ((typeof component === "string" && component.length > 0) ||
229+ (typeof component === "object" && component !== null
230+ && typeof component["field"] === "string" && component["field"].length > 0)) {
231+ data[key] = maxData[key];
230232 }
231− cardLoader.item.cardData = data;
232233 }
234+ item.cardData = data;
233235 }
234236 }
235237}
tests/qmltests/Dash/tst_GenericScopeView.qml+21−7
@@ -302,6 +302,7 @@ Item {
302302 }
303303
304304 function closePreview() {
305+ tryCompare(testCase.subPageLoader, "x", 0);
305306 var closePreviewMouseArea = findChild(subPageLoader.item, "pageHeader");
306307 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
307308
@@ -616,27 +617,40 @@ Item {
616617 waitForRendering(category0);
617618
618619 var cardTool = findChild(category0, "cardTool");
619− var cardGrid = category0.item;
620−
621620 cardTool.template["non-interactive"] = true;
621+ cardTool.templateChanged();
622+
623+ var category0 = findChild(categoryListView, "dashCategory0");
624+ waitForRendering(category0);
625+
626+ var cardGrid = category0.item;
622627 compare(cardGrid.cardTool.template["non-interactive"], true);
623628
624629 var item0 = findChild(cardGrid, "delegate0");
625630 waitForRendering(item0);
626− item0.template = cardTool.template;
627− compare(item0.template["non-interactive"], true);
628631 compare(item0.enabled, false);
629632 var touchdown = findChild(item0, "touchdown");
630633
631634 compare(touchdown.visible, false);
632− mouseClick(item0);
635+ mousePress(item0);
633636 compare(touchdown.visible, false);
637+ mouseRelease(item0);
634638
635639 cardTool.template["non-interactive"] = false;
640+ cardTool.templateChanged();
636641 compare(cardGrid.cardTool.template["non-interactive"], false);
637− item0.template = cardTool.template;
638− compare(item0.template["non-interactive"], false);
642+
643+ waitForRendering(category0);
644+ item0 = findChild(cardGrid, "delegate0");
639645 compare(item0.enabled, true);
646+ var touchdown = findChild(item0, "touchdown");
647+
648+ compare(touchdown.visible, false);
649+ mousePress(item0);
650+ compare(touchdown.visible, true);
651+ mouseRelease(item0);
652+ compare(touchdown.visible, false);
653+ closePreview();
640654 }
641655 }
642656 }