Changeset 94137 in webkit

Timestamp:

Aug 30, 2011 5:29:46 PM (13 years ago)

Author:

ojan@chromium.org

Message:

add a test for border/padding/margin on the flexbox container
​https://bugs.webkit.org/show_bug.cgi?id=67243

Reviewed by Tony Chang.

• css3/flexbox/001-expected.txt:
• css3/flexbox/001.html:
• css3/flexbox/resources/flexbox.js:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• css3/flexbox/001-expected.txt (modified) (1 diff)
• css3/flexbox/001.html (modified) (1 diff)
• css3/flexbox/resources/flexbox.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-30  Ojan Vafai  <ojan@chromium.org>
+
+        add a test for border/padding/margin on the flexbox container
+        https://bugs.webkit.org/show_bug.cgi?id=67243
+
+        Reviewed by Tony Chang.
+
+        * css3/flexbox/001-expected.txt:
+        * css3/flexbox/001.html:
+        * css3/flexbox/resources/flexbox.js:
+
 2011-08-30  Alice Boxhall  <aboxhall@chromium.org>
 

trunk/LayoutTests/css3/flexbox/001-expected.txt

@@ +1 @@
+PASS
 PASS
 PASS

trunk/LayoutTests/css3/flexbox/001.html

@@ -142 +142 @@
 </div>
 
+<!-- Test border/padding/margin on the flexbox itself. -->
+<div style="border: 10px solid; display: inline-block;">
+    <div data-expected-width="700" style="display: -webkit-flexbox; padding-left: 10px; padding-right: 20px; border-left: 30px solid; border-right: 40px solid; margin-left: 50px; margin-right:60px;" class="horizontal-box ">
+      <div data-offset-x="100" data-expected-width="200" style="width: -webkit-flex(1)"></div>
+      <div data-offset-x="300" data-expected-width="200" style="width: -webkit-flex(1)"></div>
+      <div data-offset-x="500" data-expected-width="200" style="width: -webkit-flex(1)"></div>
+    </div>
+</div>
+
 </body>
 </html>

trunk/LayoutTests/css3/flexbox/resources/flexbox.js

@@ -7 +7 @@
 }
 
+function checkExpectedValues(node, failures)
+{
+    var expectedWidth = node.getAttribute && node.getAttribute("data-expected-width");
+    if (node.offsetWidth && expectedWidth) {
+        if (node.offsetWidth != parseInt(expectedWidth))
+            failures.push("Expected " + expectedWidth + " for width, but got " + node.offsetWidth + ". ");
+    }
+
+    var expectedOffset = node.getAttribute && node.getAttribute("data-offset-x");
+    if (node.offsetLeft && expectedOffset) {
+        if (node.offsetLeft != parseInt(expectedOffset))
+            failures.push("Expected " + expectedOffset + " for offsetLeft, but got " + node.offsetLeft + ". ");
+    }
+}
+
 function checkHorizontalBoxen()
 {
     var flexboxen = document.getElementsByClassName("horizontal-box");
     Array.prototype.forEach.call(flexboxen, function(flexbox) {
-      var failures = "";
+      var failures = [];
+      checkExpectedValues(flexbox, failures);
+
       var child = flexbox.firstChild;
       while (child) {
-          var expectedWidth = child.getAttribute && child.getAttribute("data-expected-width");
-          if (child.offsetWidth && expectedWidth) {
-              if (child.offsetWidth != parseInt(expectedWidth)) {
-                  failures += "Expected " + expectedWidth + " for width, but got " + child.offsetWidth + ". ";
-              }
-          }
-
-          var expectedOffset = child.getAttribute && child.getAttribute("data-offset-x");
-          if (child.offsetLeft && expectedOffset) {
-              if (child.offsetLeft != parseInt(expectedOffset)) {
-                  failures += "Expected " + expectedOffset + " for offsetLeft, but got " + child.offsetLeft + ". ";
-              }
-          }
-
+          checkExpectedValues(child, failures);
           child = child.nextSibling;
       }
 
       insertAfter(document.createElement("p"), flexbox);
-      insertAfter(document.createTextNode(failures ? failures : "PASS"), flexbox);
+      insertAfter(document.createTextNode(failures.length ? failures.join('<br>') : "PASS"), flexbox);
     });
 }