git.iko.soy/unity8
on xenial help sign in
Use hasOwnProperty instead of != undefined.
c7ee987Michał Sawicz
tests/qmltests/Dash/tst_CardHeader.qml+2−2
compare with xenial
unifiedsplit
@@ -77,7 +77,7 @@ Rectangle {
77 cardHeader.title = data.title !== undefined ? data.title : "";
77 cardHeader.title = data.title !== undefined ? data.title : "";
78 cardHeader.subtitle = data.subtitle !== undefined ? data.subtitle : "";
78 cardHeader.subtitle = data.subtitle !== undefined ? data.subtitle : "";
79 tryCompare(cardHeader, "visible", data.visible);
79 tryCompare(cardHeader, "visible", data.visible);
80− if (data.maxLineCount != undefined) {
80+ if (data.hasOwnProperty("maxLineCount")) {
81 compare(testCase.titleLabel.maximumLineCount, data.maxLineCount, "titleLabel maximumLineCount should be %1".arg(data.maxLineCount));
81 compare(testCase.titleLabel.maximumLineCount, data.maxLineCount, "titleLabel maximumLineCount should be %1".arg(data.maxLineCount));
82 }
82 }
83 }
83 }
@@ -99,7 +99,7 @@ Rectangle {
99 cardHeader.oldPrice = data.old !== undefined ? data.old : "";
99 cardHeader.oldPrice = data.old !== undefined ? data.old : "";
100 cardHeader.altPrice = data.alt !== undefined ? data.alt : "";
100 cardHeader.altPrice = data.alt !== undefined ? data.alt : "";
101 tryCompare(cardHeader, "visible", data.visible);
101 tryCompare(cardHeader, "visible", data.visible);
102− if (data.oldAlign !== undefined) {
102+ if (data.hasOwnProperty("oldAlign")) {
103 compare(testCase.oldPriceLabel.horizontalAlignment, data.oldAlign, "Old price label is aligned wrong.")
103 compare(testCase.oldPriceLabel.horizontalAlignment, data.oldAlign, "Old price label is aligned wrong.")
104 }
104 }
105 }
105 }