From 6f230545381f014be20f1804a63567a20f553b40 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Wed, 5 Apr 2017 19:31:48 -0700 Subject: [PATCH] Bug 812687 part 9: Add tests for "order" property's influence on list-numbering, baseline, and focus order in a flexbox. (no review, test-only) MozReview-Commit-ID: EEkPlCgzknG --HG-- rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001a.html rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001b.html rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001a.html rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001b.html --- .../reftests/list-item/numbering-5-ref.html | 24 ++++++ layout/reftests/list-item/numbering-5.html | 29 +++++++ layout/reftests/list-item/reftest.list | 1 + ...exbox-baseline-multi-item-horiz-001a.html} | 0 ...lexbox-baseline-multi-item-horiz-001b.html | 49 ++++++++++++ ...lexbox-baseline-multi-item-vert-001a.html} | 0 ...flexbox-baseline-multi-item-vert-001b.html | 59 ++++++++++++++ .../submitted/flexbox/reftest-stylo.list | 6 +- .../w3c-css/submitted/flexbox/reftest.list | 6 +- layout/style/test/mochitest.ini | 1 + .../style/test/test_flexbox_focus_order.html | 77 +++++++++++++++++++ 11 files changed, 248 insertions(+), 4 deletions(-) create mode 100644 layout/reftests/list-item/numbering-5-ref.html create mode 100644 layout/reftests/list-item/numbering-5.html rename layout/reftests/w3c-css/submitted/flexbox/{flexbox-baseline-multi-item-horiz-001.html => flexbox-baseline-multi-item-horiz-001a.html} (100%) create mode 100644 layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001b.html rename layout/reftests/w3c-css/submitted/flexbox/{flexbox-baseline-multi-item-vert-001.html => flexbox-baseline-multi-item-vert-001a.html} (100%) create mode 100644 layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001b.html create mode 100644 layout/style/test/test_flexbox_focus_order.html diff --git a/layout/reftests/list-item/numbering-5-ref.html b/layout/reftests/list-item/numbering-5-ref.html new file mode 100644 index 000000000000..74f5c37d678e --- /dev/null +++ b/layout/reftests/list-item/numbering-5-ref.html @@ -0,0 +1,24 @@ + + + + Reference for reordered 'li' flex items + + + +
    +
    4. List item 4
    +
    2. List item 2
    +
    3. List item 3
    +
    5. List item 5
    +
    6. List item 6
    +
    8. List item 8
    +
    1. List item 1
    +
    7. List item 7
    +
+ + diff --git a/layout/reftests/list-item/numbering-5.html b/layout/reftests/list-item/numbering-5.html new file mode 100644 index 000000000000..20c9f7e7a0a9 --- /dev/null +++ b/layout/reftests/list-item/numbering-5.html @@ -0,0 +1,29 @@ + + + + Testcase for reordered 'li' flex items + + + +
    + +
  1. List item 1
    2. +
  2. List item 2
    3. +
  3. List item 3
    4. + +
  4. List item 4
    5. +
  5. List item 5
    6. + +
  6. List item 6
    7. + +
  7. List item 7
    8. +
  8. List item 8
    9. +
+ + diff --git a/layout/reftests/list-item/reftest.list b/layout/reftests/list-item/reftest.list index 0328c1891b35..034c173927eb 100644 --- a/layout/reftests/list-item/reftest.list +++ b/layout/reftests/list-item/reftest.list @@ -2,6 +2,7 @@ fuzzy-if(OSX,55,4) == numbering-1.html numbering-1-ref.html == numbering-2.html numbering-2-ref.html pref(layout.css.grid.enabled,true) fuzzy-if(OSX,8,1) == numbering-3.html numbering-3-ref.html fuzzy-if(OSX,72,2) == numbering-4.html numbering-4-ref.html +== numbering-5.html numbering-5-ref.html == ol-reversed-1a.html ol-reversed-1-ref.html asserts(1) == ol-reversed-1b.html ol-reversed-1-ref.html # bug 478135 == ol-reversed-1c.html ol-reversed-1-ref.html diff --git a/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001.html b/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001a.html similarity index 100% rename from layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001.html rename to layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001a.html diff --git a/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001b.html b/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001b.html new file mode 100644 index 000000000000..d40a986405bd --- /dev/null +++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-horiz-001b.html @@ -0,0 +1,49 @@ + + + + + + CSS Test: Testing the baseline of a horizontal flex container whose flex items are not baseline-aligned + + + + + + + + a +
+
c
b
+
+
+
e
d
+
+ + diff --git a/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001.html b/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001a.html similarity index 100% rename from layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001.html rename to layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001a.html diff --git a/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001b.html b/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001b.html new file mode 100644 index 000000000000..841613d09828 --- /dev/null +++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-item-vert-001b.html @@ -0,0 +1,59 @@ + + + + + + CSS Test: Testing the baseline of a vertical flex container whose flex items are not baseline-aligned + + + + + + + + + a +
+
c
b
+
+
+
e
d
+
+ + diff --git a/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list b/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list index 01f3928ddcf0..4bdad16c9706 100644 --- a/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list +++ b/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list @@ -45,8 +45,10 @@ == flexbox-baseline-align-self-baseline-vert-001.html flexbox-baseline-align-self-baseline-vert-001.html == flexbox-baseline-empty-001a.html flexbox-baseline-empty-001a.html == flexbox-baseline-empty-001b.html flexbox-baseline-empty-001b.html -== flexbox-baseline-multi-item-horiz-001.html flexbox-baseline-multi-item-horiz-001.html -== flexbox-baseline-multi-item-vert-001.html flexbox-baseline-multi-item-vert-001.html +== flexbox-baseline-multi-item-horiz-001a.html flexbox-baseline-multi-item-horiz-001a.html +== flexbox-baseline-multi-item-horiz-001b.html flexbox-baseline-multi-item-horiz-001b.html +== flexbox-baseline-multi-item-vert-001a.html flexbox-baseline-multi-item-vert-001a.html +== flexbox-baseline-multi-item-vert-001b.html flexbox-baseline-multi-item-vert-001b.html == flexbox-baseline-multi-line-horiz-001.html flexbox-baseline-multi-line-horiz-001.html == flexbox-baseline-multi-line-horiz-002.html flexbox-baseline-multi-line-horiz-002.html == flexbox-baseline-multi-line-horiz-003.html flexbox-baseline-multi-line-horiz-003.html diff --git a/layout/reftests/w3c-css/submitted/flexbox/reftest.list b/layout/reftests/w3c-css/submitted/flexbox/reftest.list index fd8bfccc9052..07f5dd82c6df 100644 --- a/layout/reftests/w3c-css/submitted/flexbox/reftest.list +++ b/layout/reftests/w3c-css/submitted/flexbox/reftest.list @@ -46,8 +46,10 @@ fuzzy-if(Android,158,32) == flexbox-align-self-vert-rtl-001.xhtml flexbox-align == flexbox-baseline-align-self-baseline-vert-001.html flexbox-baseline-align-self-baseline-vert-001-ref.html == flexbox-baseline-empty-001a.html flexbox-baseline-empty-001-ref.html == flexbox-baseline-empty-001b.html flexbox-baseline-empty-001-ref.html -== flexbox-baseline-multi-item-horiz-001.html flexbox-baseline-multi-item-horiz-001-ref.html -== flexbox-baseline-multi-item-vert-001.html flexbox-baseline-multi-item-vert-001-ref.html +== flexbox-baseline-multi-item-horiz-001a.html flexbox-baseline-multi-item-horiz-001-ref.html +== flexbox-baseline-multi-item-horiz-001b.html flexbox-baseline-multi-item-horiz-001-ref.html +== flexbox-baseline-multi-item-vert-001a.html flexbox-baseline-multi-item-vert-001-ref.html +== flexbox-baseline-multi-item-vert-001b.html flexbox-baseline-multi-item-vert-001-ref.html == flexbox-baseline-multi-line-horiz-001.html flexbox-baseline-multi-line-horiz-001-ref.html == flexbox-baseline-multi-line-horiz-002.html flexbox-baseline-multi-line-horiz-002-ref.html == flexbox-baseline-multi-line-horiz-003.html flexbox-baseline-multi-line-horiz-003-ref.html diff --git a/layout/style/test/mochitest.ini b/layout/style/test/mochitest.ini index c3a56d28be58..9293545eea0d 100644 --- a/layout/style/test/mochitest.ini +++ b/layout/style/test/mochitest.ini @@ -189,6 +189,7 @@ skip-if = toolkit == 'android' #bug 536603 [test_flexbox_child_display_values.xhtml] [test_flexbox_flex_grow_and_shrink.html] [test_flexbox_flex_shorthand.html] +[test_flexbox_focus_order.html] [test_flexbox_layout.html] support-files = flexbox_layout_testcases.js [test_flexbox_order.html] diff --git a/layout/style/test/test_flexbox_focus_order.html b/layout/style/test/test_flexbox_focus_order.html new file mode 100644 index 000000000000..75bd7a9040eb --- /dev/null +++ b/layout/style/test/test_flexbox_focus_order.html @@ -0,0 +1,77 @@ + + + + + Test for Bug 812687: focus order of reordered flex items + + + + + +Mozilla Bug 812687 +

+ Link before container + +

+ 1 +
2
+
3
+
4
+ 5 +
+

+ + +
+
+
+ +