git.iko.soy/unity8
on xenial help sign in
Fix some failed test cases due to null.
5f47c41Ying-Chun Liu
tests/qmltests/Dash/tst_Card.qml+11−1
compare with xenial
unifiedsplit
@@ -288,6 +288,10 @@ Rectangle {
288
288
289 waitForRendering(card);
289 waitForRendering(card);
290
290
291+ if (art === null) {
292+ return;
293+ }
294+
291 if (data.hasOwnProperty("width")) {
295 if (data.hasOwnProperty("width")) {
292 if (typeof data.width === "function") {
296 if (typeof data.width === "function") {
293 tryCompareFunction(function() { return art.width === data.width() }, true);
297 tryCompareFunction(function() { return art.width === data.width() }, true);
@@ -316,6 +320,10 @@ Rectangle {
316 selector.selectedIndex = data.index;
320 selector.selectedIndex = data.index;
317 waitForRendering(card);
321 waitForRendering(card);
318
322
323+ if (art === null) {
324+ return;
325+ }
326+
319 tryCompare(headerRow, "x", data.left());
327 tryCompare(headerRow, "x", data.left());
320 }
328 }
321
329
@@ -438,7 +446,9 @@ Rectangle {
438 selector.selectedIndex = 10;
446 selector.selectedIndex = 10;
439 waitForRendering(card);
447 waitForRendering(card);
440
448
449+ if (background !== null) {
441− background.color = data.tag;
450+ background.color = data.tag;
451+ }
442
452
443 var fontColor = data.dark ? "grey" : "white";
453 var fontColor = data.dark ? "grey" : "white";
444
454