Force unitless data-expected attributes

LayoutTests/resources/check-layout.js

 if (window.testRunner)
     testRunner.dumpAsText();
 
 (function() {
 
 function insertAfter(nodeToAdd, referenceNode)
 {
     if (referenceNode == document.body) {
         document.body.appendChild(nodeToAdd);
         return;
@@ skipping 19 matching lines @@
     var result = node.getAttribute && node.getAttribute(attribute);
     output.checked |= !!result;
     return result;
 }
 
 function checkExpectedValues(node, failures)
 {
     var output = { checked: false };
     var expectedWidth = checkAttribute(output, node, "data-expected-width");
     if (expectedWidth) {
-        if (Math.abs(node.offsetWidth - expectedWidth) >= 1)
+        if (isNaN(expectedWidth) || Math.abs(node.offsetWidth - expectedWidth) >= 1)
             failures.push("Expected " + expectedWidth + " for width, but got " + node.offsetWidth + ". ");
     }
 
     var expectedHeight = checkAttribute(output, node, "data-expected-height");
     if (expectedHeight) {
-        if (Math.abs(node.offsetHeight - expectedHeight) >= 1)
+        if (isNaN(expectedHeight) || Math.abs(node.offsetHeight - expectedHeight) >= 1)
             failures.push("Expected " + expectedHeight + " for height, but got " + node.offsetHeight + ". ");
     }
 
     var expectedOffset = checkAttribute(output, node, "data-offset-x");
     if (expectedOffset) {
-        if (Math.abs(node.offsetLeft - expectedOffset) >= 1)
+        if (isNaN(expectedOffset) || Math.abs(node.offsetLeft - expectedOffset) >= 1)
             failures.push("Expected " + expectedOffset + " for offsetLeft, but got " + node.offsetLeft + ". ");
     }
 
     var expectedOffset = checkAttribute(output, node, "data-offset-y");
     if (expectedOffset) {
-        if (Math.abs(node.offsetTop - expectedOffset) >= 1)
+        if (isNaN(expectedOffset) || Math.abs(node.offsetTop - expectedOffset) >= 1)
             failures.push("Expected " + expectedOffset + " for offsetTop, but got " + node.offsetTop + ". ");
     }
 
     var expectedWidth = checkAttribute(output, node, "data-expected-client-width");
     if (expectedWidth) {
-        if (Math.abs(node.clientWidth - expectedWidth) >= 1)
+        if (isNaN(expectedWidth) || Math.abs(node.clientWidth - expectedWidth) >= 1)
             failures.push("Expected " + expectedWidth + " for clientWidth, but got " + node.clientWidth + ". ");
     }
 
     var expectedHeight = checkAttribute(output, node, "data-expected-client-height");
     if (expectedHeight) {
-        if (Math.abs(node.clientHeight - expectedHeight) >= 1)
+        if (isNaN(expectedHeight) || Math.abs(node.clientHeight - expectedHeight) >= 1)
             failures.push("Expected " + expectedHeight + " for clientHeight, but got " + node.clientHeight + ". ");
     }
 
     var expectedWidth = checkAttribute(output, node, "data-expected-scroll-width");
     if (expectedWidth) {
-        if (Math.abs(node.scrollWidth - expectedWidth) >= 1)
+        if (isNaN(expectedWidth) || Math.abs(node.scrollWidth - expectedWidth) >= 1)
             failures.push("Expected " + expectedWidth + " for scrollWidth, but got " + node.scrollWidth + ". ");
     }
 
     var expectedHeight = checkAttribute(output, node, "data-expected-scroll-height");
     if (expectedHeight) {
-        if (Math.abs(node.scrollHeight - expectedHeight) >= 1)
+        if (isNaN(expectedHeight) || Math.abs(node.scrollHeight - expectedHeight) >= 1)
             failures.push("Expected " + expectedHeight + " for scrollHeight, but got " + node.scrollHeight + ". ");
     }
 
     var expectedOffset = checkAttribute(output, node, "data-total-x");
     if (expectedOffset) {
         var totalLeft = node.clientLeft + node.offsetLeft;
-        if (Math.abs(totalLeft - expectedOffset) >= 1)
+        if (isNaN(expectedOffset) || Math.abs(totalLeft - expectedOffset) >= 1)
             failures.push("Expected " + expectedOffset + " for clientLeft+offsetLeft, but got " + totalLeft + ", clientLeft: " + node.clientLeft + ", offsetLeft: " + node.offsetLeft + ". ");
     }
 
     var expectedOffset = checkAttribute(output, node, "data-total-y");
     if (expectedOffset) {
         var totalTop = node.clientTop + node.offsetTop;
-        if (Math.abs(totalTop - expectedOffset) >= 1)
+        if (isNaN(expectedOffset) || Math.abs(totalTop - expectedOffset) >= 1)
             failures.push("Expected " + expectedOffset + " for clientTop+offsetTop, but got " + totalTop + ", clientTop: " + node.clientTop + ", + offsetTop: " + node.offsetTop + ". ");
     }

[Julien - ping for review, 2015/02/03 02:42:53]

Should we have testing for that in the harness? (I don't think we have any kind
of testing for check-layout.js but I would be supportive of adding a lot!

 
     var expectedDisplay = checkAttribute(output, node, "data-expected-display");
     if (expectedDisplay) {
         var actualDisplay = getComputedStyle(node).display;
         if (actualDisplay != expectedDisplay)
             failures.push("Expected " + expectedDisplay + " for display, but got " + actualDisplay + ". ");
     }
 
     var expectedPaddingTop = checkAttribute(output, node, "data-expected-padding-top");
     if (expectedPaddingTop) {
@@ skipping 111 matching lines @@
         return false;
     }
 
     var pre = document.querySelector('.FAIL');
     if (pre)
         setTimeout(function() { pre.previousSibling.scrollIntoView(); }, 0);
     return result;
 }
 
 })();