[webkit-changes] [185318] trunk/LayoutTests

Mon, 08 Jun 2015 09:14:44 -0700

Title: [185318] trunk/LayoutTests
Revision
185318
Author
[email protected]
Date
2015-06-08 09:13:42 -0700 (Mon, 08 Jun 2015)

Log Message

[CSS Grid Layout] Add some more testing for grid line names
https://bugs.webkit.org/show_bug.cgi?id=145691

Reviewed by Darin Adler.

After moving to the new syntax which uses brackets instead of
parentheses for grid line names lists, it's good to improve a bit
the testing of the feature with some more new test cases.

* fast/css-grid-layout/named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/named-grid-line-get-set.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (185317 => 185318)


--- trunk/LayoutTests/ChangeLog	2015-06-08 15:59:14 UTC (rev 185317)
+++ trunk/LayoutTests/ChangeLog	2015-06-08 16:13:42 UTC (rev 185318)
@@ -1,3 +1,17 @@
+2015-06-08  Sergio Villar Senin  <[email protected]>
+
+        [CSS Grid Layout] Add some more testing for grid line names
+        https://bugs.webkit.org/show_bug.cgi?id=145691
+
+        Reviewed by Darin Adler.
+
+        After moving to the new syntax which uses brackets instead of
+        parentheses for grid line names lists, it's good to improve a bit
+        the testing of the feature with some more new test cases.
+
+        * fast/css-grid-layout/named-grid-line-get-set-expected.txt:
+        * fast/css-grid-layout/named-grid-line-get-set.html:
+
 2015-06-07  Darin Adler  <[email protected]>
 
         REGRESSION (r181720): Unnecessary layout triggered any time animated GIF advances to a new frame

Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt (185317 => 185318)


--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt	2015-06-08 15:59:14 UTC (rev 185317)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt	2015-06-08 16:13:42 UTC (rev 185318)
@@ -22,6 +22,10 @@
 PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav] 15px [last]"
 PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-columns') is "[first nav] 80px [nav] 120px [last]"
 PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-rows') is "[first nav2] 150px [nav2] 450px [last]"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px [nav nav2] 400px [nav nav2] 400px"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('-webkit-grid-template-rows') is "100px [nav nav2] 150px [nav nav2] 150px [last]"
+PASS window.getComputedStyle(gridWithEmptyBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithEmptyBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "20px 50px"
 
 Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS
 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 18px"
@@ -72,12 +76,40 @@
 PASS element.style.webkitGridTemplateColumns is "[foo bar] auto [foo] auto [bar]"
 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "[foo bar] 0px [foo] 0px [bar]"
 PASS element.style.webkitGridTemplateRows is "[foo bar] auto [foo] auto [bar]"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 0px [foo bar] 20px [foo bar] 20px"
+PASS element.style.webkitGridTemplateColumns is "[first] auto [foo bar] 20px [foo bar] 20px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "220px [foo] 300px [baz]"
+PASS element.style.webkitGridTemplateRows is "220px [foo] 50% [baz]"
 
+Test getting invalid grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithoutBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithoutBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithInvalidNestedBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithInvalidNestedBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithUnbalancedBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithUnbalancedBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMisplacedBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithMisplacedBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithContiguousBrackets, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithContiguousBrackets, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+
 Test getting and setting invalid -webkit-grid-template-columns and -webkit-grid-template-rows through JS
 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html (185317 => 185318)


--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html	2015-06-08 15:59:14 UTC (rev 185317)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html	2015-06-08 16:13:42 UTC (rev 185318)
@@ -38,6 +38,34 @@
     -webkit-grid-template-columns: [first nav] 10% [nav] 15% [last];
     -webkit-grid-template-rows: [first nav2] 25% [nav2] 75% [last];
 }
+.gridWithRepeat {
+    -webkit-grid-template-columns: [first] 10px repeat(2, [nav nav2] 50%);
+    -webkit-grid-template-rows: 100px repeat(2, [nav nav2] 25%) [last];
+}
+.gridWithEmptyBrackets {
+    -webkit-grid-template-columns: [] 10px;
+    -webkit-grid-template-rows: 20px [ ] 50px [];
+}
+.gridWithoutBrackets {
+    -webkit-grid-template-columns: first nav 10px;
+    -webkit-grid-template-rows: first 50% last;
+}
+.gridWithInvalidNestedBrackets {
+    -webkit-grid-template-columns: [first [nav]] 10px [last];
+    -webkit-grid-template-rows: [first] 50% [last [nav] nav2];
+}
+.gridWithUnbalancedBrackets {
+    -webkit-grid-template-columns: [first nav 10px;
+    -webkit-grid-template-rows: [first] 50% last];
+}
+.gridWithMisplacedBrackets {
+    -webkit-grid-template-columns: [first 10px] 50%;
+    -webkit-grid-template-rows: [first] [nav 50%];
+}
+.gridWithContiguousBrackets {
+    -webkit-grid-template-columns: [first] [nav] 10px;
+    -webkit-grid-template-rows: 50px [nav nav2] [middle] 10px;
+}
 </style>
 <script src=""
 </head>
@@ -55,6 +83,13 @@
 <div class="grid gridWithMinMax" id="gridWithMinMax"></div>
 <div class="grid gridWithFixedMultiple" id="gridWithFixedMultiple"></div>
 <div class="grid gridWithPercentageSameStringMultipleTimes" id="gridWithPercentageSameStringMultipleTimes"></div>
+<div class="grid gridWithRepeat" id="gridWithRepeatElement"></div>
+<div class="grid gridWithEmptyBrackets" id="gridWithEmptyBrackets"></div>
+<div class="grid gridWithoutBrackets" id="gridWithoutBrackets"></div>
+<div class="grid gridWithInvalidNestedBrackets" id="gridWithInvalidNestedBrackets"></div>
+<div class="grid gridWithUnbalancedBrackets" id="gridWithUnbalancedBrackets"></div>
+<div class="grid gridWithMisplacedBrackets" id="gridWithMisplacedBrackets"></div>
+<div class="grid gridWithContiguousBrackets" id="gridWithContiguousBrackets"></div>
 <script src=""
 <script>
     description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
@@ -69,6 +104,8 @@
     testGridTemplatesValues(document.getElementById("gridWithMinMax"), "[first] 80px", "300px [last]");
     testGridTemplatesValues(document.getElementById("gridWithFixedMultiple"), "[first nav] 10px [last]", "[first nav] 15px [last]");
     testGridTemplatesValues(document.getElementById("gridWithPercentageSameStringMultipleTimes"), "[first nav] 80px [nav] 120px [last]", "[first nav2] 150px [nav2] 450px [last]");
+    testGridTemplatesValues(document.getElementById("gridWithRepeatElement"), "[first] 10px [nav nav2] 400px [nav nav2] 400px", "100px [nav nav2] 150px [nav nav2] 150px [last]");
+    testGridTemplatesValues(document.getElementById("gridWithEmptyBrackets"), "10px", "20px 50px");
 
     debug("");
     debug("Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
@@ -84,12 +121,28 @@
     testGridTemplatesSetJSValues("[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]", "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]", "[first nav] 0px [last]", "[first nav] 0px [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]", "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]");
     testGridTemplatesSetJSValues("[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]", "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]", "[first nav] 0px [nav] 0px [last]", "[first nav2] 0px [nav2] 15px [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]", "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]");
     testGridTemplatesSetJSValues("[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] 0px [foo] 0px [bar]", "[foo bar] 0px [foo] 0px [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]");
+    testGridTemplatesSetJSValues("[first] auto repeat(2, [foo bar] 20px)", "220px [foo] repeat(1, 50% [baz])", "[first] 0px [foo bar] 20px [foo bar] 20px", "220px [foo] 300px [baz]", "[first] auto [foo bar] 20px [foo bar] 20px", "220px [foo] 50% [baz]");
 
     debug("");
+    debug("Test getting invalid grid-template-columns and grid-template-rows set through CSS");
+    testGridTemplatesValues(document.getElementById("gridWithoutBrackets"), "none", "none");
+    testGridTemplatesValues(document.getElementById("gridWithInvalidNestedBrackets"), "none", "none");
+    testGridTemplatesValues(document.getElementById("gridWithUnbalancedBrackets"), "none", "none");
+    testGridTemplatesValues(document.getElementById("gridWithMisplacedBrackets"), "none", "none");
+    testGridTemplatesValues(document.getElementById("gridWithContiguousBrackets"), "none", "none");
+
+    debug("");
     debug("Test getting and setting invalid -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
     testGridTemplatesSetBadJSValues("foo", "bar");
     testGridTemplatesSetBadJSValues("foo bar", "bar foo");
+    testGridTemplatesSetBadJSValues("[foo]", "[bar");
+    testGridTemplatesSetBadJSValues("[foo bar]", "[bar foo]");
+    testGridTemplatesSetBadJSValues("foo bar 10px", "50% baz bar foo 2em");
+    testGridTemplatesSetBadJSValues("[foo [bar]] 10px", "50% [[baz bar] foo] 2em");
+    testGridTemplatesSetBadJSValues("[foo bar 10px", "50% [baz bar] foo] 2em");
+    testGridTemplatesSetBadJSValues("[foo 10px] 2em", "[50% bar] [foo]");
 </script>
 <script src=""
 </body>
 </html>
+

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to