c416cfe · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix test: The items don't have template anymore

c416cfeAlbert Astals Cid11 years ago

qml/Dash/CardTool.qml+16−14

compare with xenial

unifiedsplit

@@ -198,8 +198,8 @@ Item {

198

199 Loader {

200 id: cardLoader

201− property var fields: ["art", "mascot", "title", "subtitle", "summary", "attributes"]

201+ readonly property var fields: ["art", "mascot", "title", "subtitle", "summary", "attributes"]

202− property var maxData: {

202+ readonly property var maxData: {

203 "art": Qt.resolvedUrl("graphics/pixel.png"),

204 "mascot": Qt.resolvedUrl("graphics/pixel.png"),

205 "title": "—\n—",

@@ -216,20 +216,22 @@ Item {

216 item.height = Qt.binding(function() { return cardTool.cardHeight || item.implicitHeight; });

217 }

218 Connections {

219− target: cardLoader.item

219+ target: cardTool

220+ onTemplateChanged: cardLoader.updateCardData();

220− onComponentsChanged: {

221+ onComponentsChanged: cardLoader.updateCardData();

222+ }

223+ function updateCardData() {

221− var data = {};

224+ var data = {};

222− for (var k in cardLoader.fields) {

225+ for (var k in fields) {

223− var component = cardLoader.item.components[cardLoader.fields[k]];

226+ var component = cardTool.components[fields[k]];

224− var key = cardLoader.fields[k];

227+ var key = fields[k];

225− if ((typeof component === "string" && component.length > 0) ||

228+ if ((typeof component === "string" && component.length > 0) ||

226− (typeof component === "object" && component !== null

229+ (typeof component === "object" && component !== null

227− && typeof component["field"] === "string" && component["field"].length > 0)) {

230+ && typeof component["field"] === "string" && component["field"].length > 0)) {

228− data[key] = cardLoader.maxData[key];

231+ data[key] = maxData[key];

229− }

230 }

232 }

231− cardLoader.item.cardData = data;

232 }

233 }

234+ item.cardData = data;

233 }

235 }

234 }

236 }

235}

237}

tests/qmltests/Dash/tst_GenericScopeView.qml+21−7

@@ -302,6 +302,7 @@ Item {

302 }

303

304 function closePreview() {

305+ tryCompare(testCase.subPageLoader, "x", 0);

305 var closePreviewMouseArea = findChild(subPageLoader.item, "pageHeader");

306 var closePreviewMouseArea = findChild(subPageLoader.item, "pageHeader");

306 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));

307 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));

307

308

@@ -616,27 +617,40 @@ Item {

616 waitForRendering(category0);

617 waitForRendering(category0);

617

618

618 var cardTool = findChild(category0, "cardTool");

619 var cardTool = findChild(category0, "cardTool");

619− var cardGrid = category0.item;

620−

621 cardTool.template["non-interactive"] = true;

620 cardTool.template["non-interactive"] = true;

621+ cardTool.templateChanged();

622+

623+ var category0 = findChild(categoryListView, "dashCategory0");

624+ waitForRendering(category0);

625+

626+ var cardGrid = category0.item;

622 compare(cardGrid.cardTool.template["non-interactive"], true);

627 compare(cardGrid.cardTool.template["non-interactive"], true);

623

628

624 var item0 = findChild(cardGrid, "delegate0");

629 var item0 = findChild(cardGrid, "delegate0");

625 waitForRendering(item0);

630 waitForRendering(item0);

626− item0.template = cardTool.template;

627− compare(item0.template["non-interactive"], true);

628 compare(item0.enabled, false);

631 compare(item0.enabled, false);

629 var touchdown = findChild(item0, "touchdown");

632 var touchdown = findChild(item0, "touchdown");

630

633

631 compare(touchdown.visible, false);

634 compare(touchdown.visible, false);

632− mouseClick(item0);

635+ mousePress(item0);

633 compare(touchdown.visible, false);

636 compare(touchdown.visible, false);

637+ mouseRelease(item0);

634

638

635 cardTool.template["non-interactive"] = false;

639 cardTool.template["non-interactive"] = false;

640+ cardTool.templateChanged();

636 compare(cardGrid.cardTool.template["non-interactive"], false);

641 compare(cardGrid.cardTool.template["non-interactive"], false);

637− item0.template = cardTool.template;

642+

638− compare(item0.template["non-interactive"], false);

643+ waitForRendering(category0);

644+ item0 = findChild(cardGrid, "delegate0");

639 compare(item0.enabled, true);

645 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();

640 }

654 }

641 }

655 }

642 }

656 }