From ed43f54eafb90c77561b511689e0e427aab1e0cb Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Fri, 7 Oct 2022 13:50:45 -0700 Subject: [PATCH 1/6] Add basic accname tests for shadow DOM --- .../name_test_case_shadowdom_1-manual.html | 84 +++++++++++++++++++ .../name_test_case_shadowdom_2-manual.html | 84 +++++++++++++++++++ .../name_test_case_shadowdom_3-manual.html | 84 +++++++++++++++++++ .../name_test_case_shadowdom_4-manual.html | 84 +++++++++++++++++++ .../name_test_case_shadowdom_5-manual.html | 84 +++++++++++++++++++ .../name_test_case_shadowdom_6-manual.html | 84 +++++++++++++++++++ 6 files changed, 504 insertions(+) create mode 100644 accname/name_test_case_shadowdom_1-manual.html create mode 100644 accname/name_test_case_shadowdom_2-manual.html create mode 100644 accname/name_test_case_shadowdom_3-manual.html create mode 100644 accname/name_test_case_shadowdom_4-manual.html create mode 100644 accname/name_test_case_shadowdom_5-manual.html create mode 100644 accname/name_test_case_shadowdom_6-manual.html diff --git a/accname/name_test_case_shadowdom_1-manual.html b/accname/name_test_case_shadowdom_1-manual.html new file mode 100644 index 00000000000000..478b6eb8b9ccbf --- /dev/null +++ b/accname/name_test_case_shadowdom_1-manual.html @@ -0,0 +1,84 @@ + + + + Name test case 762 + + + + + + + + + +

This test examines the ARIA properties for accessible name in shadow DOM - text node in shadow DOM.

+ + + + + + +
+
+
+ + diff --git a/accname/name_test_case_shadowdom_2-manual.html b/accname/name_test_case_shadowdom_2-manual.html new file mode 100644 index 00000000000000..a031072ea99a94 --- /dev/null +++ b/accname/name_test_case_shadowdom_2-manual.html @@ -0,0 +1,84 @@ + + + + Name test case 762 + + + + + + + + + +

This test examines the ARIA properties for accessible name in shadow DOM - aria-label in shadow DOM.

+ + + + + + +
+
+
+ + diff --git a/accname/name_test_case_shadowdom_3-manual.html b/accname/name_test_case_shadowdom_3-manual.html new file mode 100644 index 00000000000000..25685fd69215a6 --- /dev/null +++ b/accname/name_test_case_shadowdom_3-manual.html @@ -0,0 +1,84 @@ + + + + Name test case 762 + + + + + + + + + +

This test examines the ARIA properties for accessible name in shadow DOM - slotted content.

+ + + + + + +
+
+
+ + diff --git a/accname/name_test_case_shadowdom_4-manual.html b/accname/name_test_case_shadowdom_4-manual.html new file mode 100644 index 00000000000000..42b9baa48d9342 --- /dev/null +++ b/accname/name_test_case_shadowdom_4-manual.html @@ -0,0 +1,84 @@ + + + + Name test case 762 + + + + + + + + + +

This test examines the ARIA properties for accessible name in shadow DOM - default slotted content.

+ + + + + + +
+
+
+ + diff --git a/accname/name_test_case_shadowdom_5-manual.html b/accname/name_test_case_shadowdom_5-manual.html new file mode 100644 index 00000000000000..154b85f8f57323 --- /dev/null +++ b/accname/name_test_case_shadowdom_5-manual.html @@ -0,0 +1,84 @@ + + + + Name test case 762 + + + + + + + + + +

This test examines the ARIA properties for accessible name in shadow DOM - aria-label on slot with slotted content.

+ + + + + + +
+
+
+ + diff --git a/accname/name_test_case_shadowdom_6-manual.html b/accname/name_test_case_shadowdom_6-manual.html new file mode 100644 index 00000000000000..ef6f7cc266d27f --- /dev/null +++ b/accname/name_test_case_shadowdom_6-manual.html @@ -0,0 +1,84 @@ + + + + Name test case 762 + + + + + + + + + +

This test examines the ARIA properties for accessible name in shadow DOM - aria-label on slot with default content.

+ + + + + + +
+
+
+ + From 7f354e6abfecdd7f4d6d0e39b4175dd4d30a315b Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Tue, 8 Nov 2022 12:13:21 -0800 Subject: [PATCH 2/6] fix: switch from AXDescription to AXTitle --- accname/name_test_case_shadowdom_1-manual.html | 2 +- accname/name_test_case_shadowdom_2-manual.html | 2 +- accname/name_test_case_shadowdom_3-manual.html | 2 +- accname/name_test_case_shadowdom_4-manual.html | 2 +- accname/name_test_case_shadowdom_5-manual.html | 2 +- accname/name_test_case_shadowdom_6-manual.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/accname/name_test_case_shadowdom_1-manual.html b/accname/name_test_case_shadowdom_1-manual.html index 478b6eb8b9ccbf..3435726d27efa3 100644 --- a/accname/name_test_case_shadowdom_1-manual.html +++ b/accname/name_test_case_shadowdom_1-manual.html @@ -33,7 +33,7 @@ "AXAPI" : [ [ "property", - "AXDescription", + "AXTitle", "is", "foo" ] diff --git a/accname/name_test_case_shadowdom_2-manual.html b/accname/name_test_case_shadowdom_2-manual.html index a031072ea99a94..aad094647cd484 100644 --- a/accname/name_test_case_shadowdom_2-manual.html +++ b/accname/name_test_case_shadowdom_2-manual.html @@ -33,7 +33,7 @@ "AXAPI" : [ [ "property", - "AXDescription", + "AXTitle", "is", "foo" ] diff --git a/accname/name_test_case_shadowdom_3-manual.html b/accname/name_test_case_shadowdom_3-manual.html index 25685fd69215a6..d84fc8716d3458 100644 --- a/accname/name_test_case_shadowdom_3-manual.html +++ b/accname/name_test_case_shadowdom_3-manual.html @@ -33,7 +33,7 @@ "AXAPI" : [ [ "property", - "AXDescription", + "AXTitle", "is", "foo slotted bar" ] diff --git a/accname/name_test_case_shadowdom_4-manual.html b/accname/name_test_case_shadowdom_4-manual.html index 42b9baa48d9342..19a65f1eb8cde6 100644 --- a/accname/name_test_case_shadowdom_4-manual.html +++ b/accname/name_test_case_shadowdom_4-manual.html @@ -33,7 +33,7 @@ "AXAPI" : [ [ "property", - "AXDescription", + "AXTitle", "is", "foo default bar" ] diff --git a/accname/name_test_case_shadowdom_5-manual.html b/accname/name_test_case_shadowdom_5-manual.html index 154b85f8f57323..2972aa877dbb11 100644 --- a/accname/name_test_case_shadowdom_5-manual.html +++ b/accname/name_test_case_shadowdom_5-manual.html @@ -33,7 +33,7 @@ "AXAPI" : [ [ "property", - "AXDescription", + "AXTitle", "is", "foo slotted bar" ] diff --git a/accname/name_test_case_shadowdom_6-manual.html b/accname/name_test_case_shadowdom_6-manual.html index ef6f7cc266d27f..83f6800ba5c22a 100644 --- a/accname/name_test_case_shadowdom_6-manual.html +++ b/accname/name_test_case_shadowdom_6-manual.html @@ -33,7 +33,7 @@ "AXAPI" : [ [ "property", - "AXDescription", + "AXTitle", "is", "foo default bar" ] From 39f49b9895542a01140bd52e64a775d5fdf5c5d1 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Fri, 21 Apr 2023 13:09:00 -0700 Subject: [PATCH 3/6] fix: port from manual to automated --- .../name_test_case_shadowdom_1-manual.html | 84 ------------------- .../name_test_case_shadowdom_2-manual.html | 84 ------------------- .../name_test_case_shadowdom_3-manual.html | 84 ------------------- .../name_test_case_shadowdom_4-manual.html | 84 ------------------- .../name_test_case_shadowdom_5-manual.html | 84 ------------------- .../name_test_case_shadowdom_6-manual.html | 84 ------------------- accname/shadowdom/author1.html | 20 +++++ accname/shadowdom/content1.html | 21 +++++ accname/shadowdom/slot1.html | 20 +++++ accname/shadowdom/slot2.html | 20 +++++ accname/shadowdom/slot3.html | 20 +++++ accname/shadowdom/slot4.html | 20 +++++ 12 files changed, 121 insertions(+), 504 deletions(-) delete mode 100644 accname/name_test_case_shadowdom_1-manual.html delete mode 100644 accname/name_test_case_shadowdom_2-manual.html delete mode 100644 accname/name_test_case_shadowdom_3-manual.html delete mode 100644 accname/name_test_case_shadowdom_4-manual.html delete mode 100644 accname/name_test_case_shadowdom_5-manual.html delete mode 100644 accname/name_test_case_shadowdom_6-manual.html create mode 100644 accname/shadowdom/author1.html create mode 100644 accname/shadowdom/content1.html create mode 100644 accname/shadowdom/slot1.html create mode 100644 accname/shadowdom/slot2.html create mode 100644 accname/shadowdom/slot3.html create mode 100644 accname/shadowdom/slot4.html diff --git a/accname/name_test_case_shadowdom_1-manual.html b/accname/name_test_case_shadowdom_1-manual.html deleted file mode 100644 index 3435726d27efa3..00000000000000 --- a/accname/name_test_case_shadowdom_1-manual.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - Name test case 762 - - - - - - - - - -

This test examines the ARIA properties for accessible name in shadow DOM - text node in shadow DOM.

- - - - - - -
-
-
- - diff --git a/accname/name_test_case_shadowdom_2-manual.html b/accname/name_test_case_shadowdom_2-manual.html deleted file mode 100644 index aad094647cd484..00000000000000 --- a/accname/name_test_case_shadowdom_2-manual.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - Name test case 762 - - - - - - - - - -

This test examines the ARIA properties for accessible name in shadow DOM - aria-label in shadow DOM.

- - - - - - -
-
-
- - diff --git a/accname/name_test_case_shadowdom_3-manual.html b/accname/name_test_case_shadowdom_3-manual.html deleted file mode 100644 index d84fc8716d3458..00000000000000 --- a/accname/name_test_case_shadowdom_3-manual.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - Name test case 762 - - - - - - - - - -

This test examines the ARIA properties for accessible name in shadow DOM - slotted content.

- - - - - - -
-
-
- - diff --git a/accname/name_test_case_shadowdom_4-manual.html b/accname/name_test_case_shadowdom_4-manual.html deleted file mode 100644 index 19a65f1eb8cde6..00000000000000 --- a/accname/name_test_case_shadowdom_4-manual.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - Name test case 762 - - - - - - - - - -

This test examines the ARIA properties for accessible name in shadow DOM - default slotted content.

- - - - - - -
-
-
- - diff --git a/accname/name_test_case_shadowdom_5-manual.html b/accname/name_test_case_shadowdom_5-manual.html deleted file mode 100644 index 2972aa877dbb11..00000000000000 --- a/accname/name_test_case_shadowdom_5-manual.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - Name test case 762 - - - - - - - - - -

This test examines the ARIA properties for accessible name in shadow DOM - aria-label on slot with slotted content.

- - - - - - -
-
-
- - diff --git a/accname/name_test_case_shadowdom_6-manual.html b/accname/name_test_case_shadowdom_6-manual.html deleted file mode 100644 index 83f6800ba5c22a..00000000000000 --- a/accname/name_test_case_shadowdom_6-manual.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - Name test case 762 - - - - - - - - - -

This test examines the ARIA properties for accessible name in shadow DOM - aria-label on slot with default content.

- - - - - - -
-
-
- - diff --git a/accname/shadowdom/author1.html b/accname/shadowdom/author1.html new file mode 100644 index 00000000000000..c20ab0c8b39a88 --- /dev/null +++ b/accname/shadowdom/author1.html @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/accname/shadowdom/content1.html b/accname/shadowdom/content1.html new file mode 100644 index 00000000000000..6679830da72468 --- /dev/null +++ b/accname/shadowdom/content1.html @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/accname/shadowdom/slot1.html b/accname/shadowdom/slot1.html new file mode 100644 index 00000000000000..d08e797fae6a87 --- /dev/null +++ b/accname/shadowdom/slot1.html @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/accname/shadowdom/slot2.html b/accname/shadowdom/slot2.html new file mode 100644 index 00000000000000..a3bdae18f991b3 --- /dev/null +++ b/accname/shadowdom/slot2.html @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/accname/shadowdom/slot3.html b/accname/shadowdom/slot3.html new file mode 100644 index 00000000000000..26f0bdfec59252 --- /dev/null +++ b/accname/shadowdom/slot3.html @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/accname/shadowdom/slot4.html b/accname/shadowdom/slot4.html new file mode 100644 index 00000000000000..4ccd590f691cc7 --- /dev/null +++ b/accname/shadowdom/slot4.html @@ -0,0 +1,20 @@ + + + + + + + + + + From d01da6bcee2b03079717a13ddd5aa88ed1bec759 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Fri, 21 Apr 2023 16:22:50 -0700 Subject: [PATCH 4/6] fix: refactor to use AriaUtils and fewer files --- accname/shadowdom/author1.html | 20 ------------ accname/shadowdom/basic.html | 35 ++++++++++++++++++++ accname/shadowdom/content1.html | 21 ------------ accname/shadowdom/slot.html | 58 +++++++++++++++++++++++++++++++++ accname/shadowdom/slot1.html | 20 ------------ accname/shadowdom/slot2.html | 20 ------------ accname/shadowdom/slot3.html | 20 ------------ accname/shadowdom/slot4.html | 20 ------------ wai-aria/scripts/aria-utils.js | 24 ++++++++++++++ 9 files changed, 117 insertions(+), 121 deletions(-) delete mode 100644 accname/shadowdom/author1.html create mode 100644 accname/shadowdom/basic.html delete mode 100644 accname/shadowdom/content1.html create mode 100644 accname/shadowdom/slot.html delete mode 100644 accname/shadowdom/slot1.html delete mode 100644 accname/shadowdom/slot2.html delete mode 100644 accname/shadowdom/slot3.html delete mode 100644 accname/shadowdom/slot4.html diff --git a/accname/shadowdom/author1.html b/accname/shadowdom/author1.html deleted file mode 100644 index c20ab0c8b39a88..00000000000000 --- a/accname/shadowdom/author1.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/accname/shadowdom/basic.html b/accname/shadowdom/basic.html new file mode 100644 index 00000000000000..7a561727e3ff96 --- /dev/null +++ b/accname/shadowdom/basic.html @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/accname/shadowdom/content1.html b/accname/shadowdom/content1.html deleted file mode 100644 index 6679830da72468..00000000000000 --- a/accname/shadowdom/content1.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/accname/shadowdom/slot.html b/accname/shadowdom/slot.html new file mode 100644 index 00000000000000..d645ed7b378715 --- /dev/null +++ b/accname/shadowdom/slot.html @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/accname/shadowdom/slot1.html b/accname/shadowdom/slot1.html deleted file mode 100644 index d08e797fae6a87..00000000000000 --- a/accname/shadowdom/slot1.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/accname/shadowdom/slot2.html b/accname/shadowdom/slot2.html deleted file mode 100644 index a3bdae18f991b3..00000000000000 --- a/accname/shadowdom/slot2.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/accname/shadowdom/slot3.html b/accname/shadowdom/slot3.html deleted file mode 100644 index 26f0bdfec59252..00000000000000 --- a/accname/shadowdom/slot3.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/accname/shadowdom/slot4.html b/accname/shadowdom/slot4.html deleted file mode 100644 index 4ccd590f691cc7..00000000000000 --- a/accname/shadowdom/slot4.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js index 41d8535f91be4d..63b80ac93feff8 100644 --- a/wai-aria/scripts/aria-utils.js +++ b/wai-aria/scripts/aria-utils.js @@ -57,5 +57,29 @@ const AriaUtils = { } }, + /* + Tests computed label of all elements matching the selector against the string value of their + data-expectedlabel attribute. + + Ex:
+ + AriaUtils.verifyLabelsBySelector('.foo') + + */ + verifyLabelsBySelector: function(selector) { + const els = document.querySelectorAll(selector); + for (const el of els) { + const expectedLabel = el.getAttribute('data-expectedlabel'); + const testName = el.getAttribute('data-testname') || expectedLabel; + + promise_test(async t => { + const computedLabel = await test_driver.get_computed_label(el); + assert_equals(computedLabel, expectedLabel); + }, `${testName}`); + } + }, + }; From aa5ba457bc950aee448cca5da953bc73f1df39f7 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Mon, 1 May 2023 16:12:31 -0700 Subject: [PATCH 5/6] refactor: move shadowdom dir into accname/name --- accname/{ => name}/shadowdom/basic.html | 0 accname/{ => name}/shadowdom/slot.html | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename accname/{ => name}/shadowdom/basic.html (100%) rename accname/{ => name}/shadowdom/slot.html (100%) diff --git a/accname/shadowdom/basic.html b/accname/name/shadowdom/basic.html similarity index 100% rename from accname/shadowdom/basic.html rename to accname/name/shadowdom/basic.html diff --git a/accname/shadowdom/slot.html b/accname/name/shadowdom/slot.html similarity index 100% rename from accname/shadowdom/slot.html rename to accname/name/shadowdom/slot.html From 91d96b4b92b4c55b6b76c28e77e3c6a792e46276 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Mon, 1 May 2023 17:04:03 -0700 Subject: [PATCH 6/6] fix: make test names more specific --- accname/name/shadowdom/basic.html | 4 ++-- accname/name/shadowdom/slot.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/accname/name/shadowdom/basic.html b/accname/name/shadowdom/basic.html index 7a561727e3ff96..ca60986d337ca3 100644 --- a/accname/name/shadowdom/basic.html +++ b/accname/name/shadowdom/basic.html @@ -14,7 +14,7 @@ type="button" aria-labelledby="label1" data-expectedlabel="foo" - data-testname="content inside shadow DOM"> + data-testname="aria-labelledby reference to element with text content inside shadow DOM">