git.iko.soy/unity8
on xenial help sign in
Card test: Limit the precision we ask for doubles to be equal

The test that dividies by 0.7 was failing on i386 because Actual (): 434.2858326192127 Expected (): 434.28571428571433 we don't need that much precision on pixels, so limit that test to 2 decimals, which is more than enough really Approved by: Lukáš Tinkl

commit04a414e27c5b3ee2e18cd1b1de5f8a4aff1209be authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 29 Jan 2016, 11:50 (11 years ago) parent72323d74b50a96
1 file changed+3−5
compare with xenial
unifiedsplit
tests/qmltests/Dash/tst_Card.qml+3−5
tests/qmltests/Dash/tst_Card.qml+3−5
@@ -307,8 +307,8 @@ Rectangle {
307307 { tag: "Medium", width: units.gu(18), fill: Image.PreserveAspectCrop, index: 0 },
308308 { tag: "Small", width: units.gu(12), index: 1 },
309309 { tag: "Large", width: units.gu(38), index: 2 },
310− { tag: "Wide", height: units.gu(19), size: "large", index: 3 },
311− { tag: "Tall", height: units.gu(38) / 0.7, size: "large", width: units.gu(38), index: 4 },
310+ { tag: "Wide", height: function() { return units.gu(19) }, size: "large", index: 3 },
311+ { tag: "Tall", height: function() { return units.gu(38) / 0.7 }, size: "large", width: units.gu(38), index: 4 },
312312 { tag: "VerticalWidth", width: function() { return headerRow.width + units.gu(1) }, index: 0 },
313313 { tag: "HorizontalHeight", height: function() { return headerRow.height + units.gu(1) * 2 }, index: 5 },
314314 { tag: "HorizontalWidth", width: function() { return headerRow.x - units.gu(1) }, index: 5 },
@@ -337,9 +337,7 @@ Rectangle {
337337 }
338338
339339 if (data.hasOwnProperty("height")) {
340− if (typeof data.height === "function") {
341− tryCompareFunction(function() { return art.height === data.height() }, true);
342− } else tryCompare(art, "height", data.height);
340+ tryCompareFunction(function() { return art.height.toFixed(2) === data.height().toFixed(2) }, true);
343341 }
344342
345343 if (data.hasOwnProperty("fill")) {