@@ -287,13 +287,15 @@ Rectangle {
287287 }
288288
289289 if (data.hasOwnProperty("width")) {
290− var width = typeof data.width === "function" ? data.width() : data.width;
291− tryCompare(art, "width", width);
290+ if (typeof data.width === "function") {
291+ tryCompareFunction(function() { return art.width === data.width() }, true);
292+ } else tryCompare(art, "width", data.width);
292293 }
293294
294295 if (data.hasOwnProperty("height")) {
295− var height = typeof data.height === "function" ? data.height() : data.height;
296− tryCompare(art, "height", height);
296+ if (typeof data.height === "function") {
297+ tryCompareFunction(function() { return art.height === data.height() }, true);
298+ } else tryCompare(art, "height", data.height);
297299 }
298300
299301 if (data.hasOwnProperty("fill")) {
@@ -326,8 +328,8 @@ Rectangle {
326328 function test_header_layout(data) {
327329 selector.selectedIndex = data.index;
328330
329− tryCompare(testCase.header, "y", data.top());
330− tryCompare(testCase.header, "x", data.left());
331+ tryCompareFunction(function() { return testCase.header.y === data.top() }, true);
332+ tryCompareFunction(function() { return testCase.header.x === data.left() }, true);
331333 }
332334 }
333335}