From 89cadf04a44fea0f526ad37e459377c351f7602b Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Thu, 15 Aug 2024 16:38:20 -0700
Subject: [PATCH 1/5] First draft: tests using JSONs from manual test

---
 .../json-test-example/aria-autocomplete.html  |  45 ++++
 .../json-test-example/aria-braillelabel.html  |  28 +++
 .../json-test-example/aria-errormessage.html  |  30 +++
 core-aam/json-test-example/blockquote.html    |  23 ++
 ...es_for_aria-pressed_and_aria-haspopup.html |  55 +++++
 ...n_with_defined_value_for_aria-pressed.html |  32 +++
 ...ith_non_false_value_for_aria-haspopup.html |  62 ++++++
 .../json-test-example/scripts/aam-utils.js    | 107 +++++++++
 .../json-test-example/scripts/attr-map.js     | 114 ++++++++++
 .../json-test-example/scripts/role-map.js     | 186 ++++++++++++++++
 resources/testdriver.js                       |  20 ++
 .../wptrunner/wptrunner/executors/actions.py  |  17 +-
 .../wptrunner/executors/executoratspi.py      | 209 +++++++++++++++---
 .../executorplatformaccessibility.py          |  18 ++
 tools/wptrunner/wptrunner/testdriver-extra.js |   5 +
 15 files changed, 924 insertions(+), 27 deletions(-)
 create mode 100644 core-aam/json-test-example/aria-autocomplete.html
 create mode 100644 core-aam/json-test-example/aria-braillelabel.html
 create mode 100644 core-aam/json-test-example/aria-errormessage.html
 create mode 100644 core-aam/json-test-example/blockquote.html
 create mode 100644 core-aam/json-test-example/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
 create mode 100644 core-aam/json-test-example/button_with_defined_value_for_aria-pressed.html
 create mode 100644 core-aam/json-test-example/button_with_non_false_value_for_aria-haspopup.html
 create mode 100644 core-aam/json-test-example/scripts/aam-utils.js
 create mode 100644 core-aam/json-test-example/scripts/attr-map.js
 create mode 100644 core-aam/json-test-example/scripts/role-map.js
diff --git a/core-aam/json-test-example/aria-autocomplete.html b/core-aam/json-test-example/aria-autocomplete.html
new file mode 100644
index 00000000000000..86ec0a8ff2e6b8
--- /dev/null
+++ b/core-aam/json-test-example/aria-autocomplete.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>aria-braillelabel</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="scripts/attr-map.js"></script>
+  <script src="scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<input role='combobox' id='test1' aria-autocomplete='both'>
+<input role='combobox' id='test2' aria-autocomplete='inline'>
+<input role='combobox' id='test3' aria-autocomplete='list'>
+
+<script>
+  AAMUtils.verifyAttrAPI(
+    'test1',
+    'both',
+    attrmap['aria-autocomplete'],
+    'aria-autocomplete=both'
+  );
+
+  AAMUtils.verifyAttrAPI(
+    'test2',
+    'inline',
+    attrmap['aria-autocomplete'],
+    'aria-autocomplete=inline'
+  );
+
+  AAMUtils.verifyAttrAPI(
+    'test3',
+    'list',
+    attrmap['aria-autocomplete'],
+    'aria-autocomplete=list'
+  );
+
+</script>
+
+</body>
+</html>
diff --git a/core-aam/json-test-example/aria-braillelabel.html b/core-aam/json-test-example/aria-braillelabel.html
new file mode 100644
index 00000000000000..53621b04d1bb6d
--- /dev/null
+++ b/core-aam/json-test-example/aria-braillelabel.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>aria-braillelabel</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="scripts/attr-map.js"></script>
+  <script src="scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<button id=test aria-braillelabel=foobar>
+
+<script>
+  AAMUtils.verifyAttrAPI(
+    'test',
+    'foobar',
+    attrmap['aria-braillelabel'],
+    'aria-braillelabel'
+  );
+</script>
+
+</body>
+</html>
diff --git a/core-aam/json-test-example/aria-errormessage.html b/core-aam/json-test-example/aria-errormessage.html
new file mode 100644
index 00000000000000..4ff8e0e2fcd359
--- /dev/null
+++ b/core-aam/json-test-example/aria-errormessage.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>aria-flowto</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="scripts/attr-map.js"></script>
+  <script src="scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<div role='checkbox' id='test' aria-errormessage='error1 error2' aria-invalid='true'>content</div>
+<div id='error1'>hello</div>
+<div id='error2'>world</div>
+
+<script>
+  AAMUtils.verifyRelationAPI(
+    'test',
+    ['error1', 'error2'],
+    attrmap['aria-errormessage'],
+    'aria-flowto'
+  );
+</script>
+
+</body>
+</html>
diff --git a/core-aam/json-test-example/blockquote.html b/core-aam/json-test-example/blockquote.html
new file mode 100644
index 00000000000000..dfd1ba25a71bae
--- /dev/null
+++ b/core-aam/json-test-example/blockquote.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role blockquote</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="scripts/role-map.js"></script>
+  <script src="scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<div id=test role=blockquote>quote</div>
+
+<script>
+  AAMUtils.verifyAPI('test', rolemap['blockquote'], 'role=blockquote');
+</script>
+
+</body>
+</html>
diff --git a/core-aam/json-test-example/button_with_default_values_for_aria-pressed_and_aria-haspopup.html b/core-aam/json-test-example/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
new file mode 100644
index 00000000000000..91f5d7a1b19acb
--- /dev/null
+++ b/core-aam/json-test-example/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
@@ -0,0 +1,55 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role button with default values for aria-pressed and aria-hapopup</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="scripts/role-map.js"></script>
+  <script src="scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<div id=test1 role=button>click me</div>
+<div id=test2 role=button aria-pressed>click me</div>
+<div id=test3 role=button aria-pressed aria-haspopup>click me</div>
+<div id=test4 role=button aria-haspopup>click me</div>
+<div id=test5 role=button aria-haspopup=false>click me</div>
+
+<script>
+  AAMUtils.verifyAPI(
+    'test1',
+    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
+    'role=button'
+  );
+
+  AAMUtils.verifyAPI(
+    'test2',
+    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
+    'role=button aria-pressed'
+  );
+
+  AAMUtils.verifyAPI(
+    'test3',
+    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
+    'role=button aria-pressed aria-haspopup'
+  );
+
+  AAMUtils.verifyAPI(
+    'test4',
+    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
+    'role=button aria-haspopup'
+  );
+
+  AAMUtils.verifyAPI(
+    'test5',
+    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
+    'role=button aria-haspopup=false'
+  );
+</script>
+
+</body>
+</html>
diff --git a/core-aam/json-test-example/button_with_defined_value_for_aria-pressed.html b/core-aam/json-test-example/button_with_defined_value_for_aria-pressed.html
new file mode 100644
index 00000000000000..a2f0d24849d0be
--- /dev/null
+++ b/core-aam/json-test-example/button_with_defined_value_for_aria-pressed.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role button with defined value for aria-pressed</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="scripts/role-map.js"></script>
+  <script src="scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<div id=test1 role=button aria-pressed=true>press me</div>
+<div id=test2 role=button aria-pressed=false>press me</div>
+
+<script>
+  AAMUtils.verifyAPI(
+    'test1',
+    rolemap['button_with_defined_value_for_aria-pressed'],
+    'role=button aria-pressed=true'
+  );
+
+  AAMUtils.verifyAPI(
+    'test2',
+    rolemap['button_with_defined_value_for_aria-pressed'],
+    'role=button aria-pressed=false'
+  );
+</script>
+</body>
diff --git a/core-aam/json-test-example/button_with_non_false_value_for_aria-haspopup.html b/core-aam/json-test-example/button_with_non_false_value_for_aria-haspopup.html
new file mode 100644
index 00000000000000..a63ae1635b4bf2
--- /dev/null
+++ b/core-aam/json-test-example/button_with_non_false_value_for_aria-haspopup.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role button with non false value for aria-pressed</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="scripts/role-map.js"></script>
+  <script src="scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<div id=test1 role=button aria-haspopup=true>click me</div>
+<div id=test2 role=button aria-haspopup=menu>click me</div>
+<div id=test3 role=button aria-haspopup=listbox>click me</div>
+<div id=test4 role=button aria-haspopup=tree>click me</div>
+<div id=test5 role=button aria-haspopup=grid>click me</div>
+<div id=test6 role=button aria-haspopup=dialog>click me</div>
+
+<script>
+
+  AAMUtils.verifyAPI(
+    'test1',
+    rolemap['button_with_non_false_value_for_aria-haspopup'],
+    'role=button aria-haspopup=true'
+  );
+
+  AAMUtils.verifyAPI(
+    'test2',
+    rolemap['button_with_non_false_value_for_aria-haspopup'],
+    'role=button aria-haspopup=menu'
+  );
+
+  AAMUtils.verifyAPI(
+    'test3',
+    rolemap['button_with_non_false_value_for_aria-haspopup'],
+    'role=button aria-haspopup=listbox'
+  );
+
+  AAMUtils.verifyAPI(
+    'test4',
+    rolemap['button_with_non_false_value_for_aria-haspopup'],
+    'role=button aria-haspopup=tree'
+  );
+
+  AAMUtils.verifyAPI(
+    'test5',
+    rolemap['button_with_non_false_value_for_aria-haspopup'],
+    'role=button aria-haspopup=grid'
+  );
+
+  AAMUtils.verifyAPI(
+    'test6',
+    rolemap['button_with_non_false_value_for_aria-haspopup'],
+    'role=button aria-haspopup=dialog'
+  );
+
+</script>
+</body>
diff --git a/core-aam/json-test-example/scripts/aam-utils.js b/core-aam/json-test-example/scripts/aam-utils.js
new file mode 100644
index 00000000000000..5573525469ff3b
--- /dev/null
+++ b/core-aam/json-test-example/scripts/aam-utils.js
@@ -0,0 +1,107 @@
+/*
+  Utility files for platform specific accessibility API tests for the
+  Accessibility API Mappings (AAM) standards: Core-AAM and HTML-aam
+*/
+
+const AAMUtils = {
+
+  APIS: ['Atspi', 'AXAPI', 'IAccessible2', 'UIA'],
+
+  /*
+    Creates a subtest for each API. Runs no asserts for APIs not found.
+
+    id:     id of element to test the accessibility node of
+    map:    entry in role-map.js, or similar
+    name:   name of the test
+  */
+
+  verifyAPI: function(id, map, test_name) {
+    if (!map) {
+      throw "Error: missing accessibility API test map";
+    }
+
+    for (const api of this.APIS) {
+      if (map[api]) {
+        promise_test(async t => {
+          let result = await test_driver.test_accessibility_api(
+            id,
+            map,
+            api
+          );
+          if (result) {
+            assert_equals(result, "match");
+          }
+        }, `api: ${api}, ${test_name}`);
+      }
+    }
+  },
+
+  /*
+    Creates a subtest for each API. Runs no asserts for APIs not found.
+
+    id:         id of element to test the accessibility node of
+    value:      value of the attribute being tested
+    map:        entry in attr-map.js, or similar, with the string "<value>"
+                to be replaced by the value argument
+    test_name:  name of the test
+  */
+
+  verifyAttrAPI: function(id, value, map, test_name) {
+    if (!map) {
+      throw "Error: missing accessibility API test map";
+    }
+
+    let new_map = JSON.parse(
+      JSON.stringify(map).replaceAll("<value>", value)
+    );
+
+    for (const api of this.APIS) {
+      if (new_map[api]) {
+        promise_test(async t => {
+          let result = await test_driver.test_accessibility_api(
+            id,
+            new_map,
+            api
+          );
+          if (result) {
+            assert_equals(result, "match");
+          }
+        }, `api: ${api}, ${test_name}`);
+      }
+    }
+  },
+
+  /*
+    Creates a subtest for each API. Runs no asserts for APIs not found.
+
+    id:         id of element to test the accessibility node of
+    relations:  list of ids of "related" elements
+    map:        entry in attr-map.js, or similar
+    test_name:  name of the test
+  */
+
+  verifyRelationAPI: function(id, relations, map, test_name) {
+    if (!map) {
+      throw "Error: missing accessibility API test map";
+    }
+
+    let new_map = JSON.parse(
+      JSON.stringify(map).replaceAll("\"<id-list>\"", JSON.stringify(relations))
+    );
+
+    for (const api of this.APIS) {
+      if (new_map[api]) {
+        promise_test(async t => {
+          let result = await test_driver.test_accessibility_api(
+            id,
+            new_map,
+            api
+          );
+          if (result) {
+            assert_equals(result, "match");
+          }
+        }, `api: ${api}, ${test_name}`);
+      }
+    }
+  }
+}
diff --git a/core-aam/json-test-example/scripts/attr-map.js b/core-aam/json-test-example/scripts/attr-map.js
new file mode 100644
index 00000000000000..ecb96f8857bcf4
--- /dev/null
+++ b/core-aam/json-test-example/scripts/attr-map.js
@@ -0,0 +1,114 @@
+attrmap = {
+  "aria-autocomplete": {
+    "Atspi" : [
+       [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:<value>"
+       ],
+       [
+          "property",
+          "states",
+          "contains",
+          "STATE_SUPPORTS_AUTOCOMPLETION"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:<value>"
+       ],
+       [
+          "property",
+          "states",
+          "contains",
+          "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
+       ]
+    ]
+  },
+  "aria-braillelabel": {
+    "Atspi" : [
+       [
+          "property",
+          "objectAttributes",
+          "contains",
+          "braillelabel:<value>"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXBrailleLabel",
+          "is",
+          "<value>"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "objectAttributes",
+          "contains",
+          "braillelabel:<value>"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "AriaProperties.braillelabel",
+          "is",
+          "<value>"
+       ]
+    ]
+  },
+  "aria-errormessage": {
+    "Atspi" : [
+       [
+          "relation",
+          "RELATION_ERROR_MESSAGE",
+          "is",
+          "<id-list>"
+       ],
+       [
+          "reverseRelation",
+          "RELATION_ERROR_FOR",
+          "is",
+          "<id-list>"
+       ]
+
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXErrorMessageElements",
+          "is",
+          "<id-list>"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "relation",
+          "IA2_RELATION_ERROR",
+          "is",
+          "<id-list>"
+       ],
+       [
+          "reverseRelation",
+          "IA2_RELATION_ERROR_FOR",
+          "is",
+          "<is-list>"
+       ]
+
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControllerFor",
+          "is",
+          "<id-list>"
+       ]
+    ]
+  }
+}
diff --git a/core-aam/json-test-example/scripts/role-map.js b/core-aam/json-test-example/scripts/role-map.js
new file mode 100644
index 00000000000000..31808ffc02c0c6
--- /dev/null
+++ b/core-aam/json-test-example/scripts/role-map.js
@@ -0,0 +1,186 @@
+rolemap = {
+  "blockquote" : {
+    "Atspi" : [
+       [
+          "property",
+          "role",
+          "is",
+          "block quote"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXRole",
+          "is",
+          "AXGroup"
+       ],
+       [
+          "property",
+          "AXSubrole",
+          "is",
+          "<nil>"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "role",
+          "is",
+          "IA2_ROLE_BLOCK_QUOTE"
+       ],
+       [
+          "property",
+          "msaaRole",
+          "is",
+          "ROLE_SYSTEM_GROUPING"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControlType",
+          "is",
+          "Group"
+       ],
+       [
+          "property",
+          "LocalizedControlType",
+          "is",
+          "blockquote"
+       ]
+    ]
+  },
+  "button_with_default_values_for_aria-pressed_and_aria-haspopup": {
+    "Atspi" : [
+       [
+          "property",
+          "role",
+          "is",
+          "push button"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXRole",
+          "is",
+          "AXButton"
+       ],
+       [
+          "property",
+          "AXSubrole",
+          "is",
+          "<nil>"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "msaaRole",
+          "is",
+          "ROLE_SYSTEM_PUSHBUTTON"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControlType",
+          "is",
+          "Button"
+       ]
+    ]
+  },
+  "button_with_non_false_value_for_aria-haspopup" : {
+     "Atspi" : [
+        [
+           "property",
+           "role",
+           "is",
+           "push button"
+        ]
+     ],
+     "AXAPI" : [
+        [
+           "property",
+           "AXRole",
+           "is",
+           "AXPopUpButton"
+        ],
+        [
+           "property",
+           "AXSubrole",
+           "is",
+           "<nil>"
+        ],
+        [
+           "property",
+           "actions",
+           "contains",
+           "AXShowMenu"
+        ]
+     ],
+     "IAccessible2" : [
+        [
+           "property",
+           "msaaRole",
+           "is",
+           "ROLE_SYSTEM_PUSHBUTTON"
+        ]
+     ],
+     "UIA" : [
+        [
+           "property",
+           "ControlType",
+           "is",
+           "Button"
+        ]
+     ]
+  },
+  "button_with_defined_value_for_aria-pressed": {
+    "Atspi" : [
+       [
+          "property",
+          "role",
+          "is",
+          "toggle button"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXRole",
+          "is",
+          "AXCheckBox"
+       ],
+       [
+          "property",
+          "AXSubrole",
+          "is",
+          "AXToggle"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "role",
+          "is",
+          "IA2_ROLE_TOGGLE_BUTTON"
+       ],
+      [
+          "property",
+          "msaaRole",
+          "is",
+          "ROLE_SYSTEM_PUSHBUTTON"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControlType",
+          "is",
+          "Button"
+       ]
+    ]
+  }
+}
diff --git a/resources/testdriver.js b/resources/testdriver.js
index ac3ed65bd039f3..668c3b94ccceaf 100644
--- a/resources/testdriver.js
+++ b/resources/testdriver.js
@@ -1080,6 +1080,21 @@
                 .then((jsonresult) => {
                   return JSON.parse(jsonresult);
                 });
+        },
+
+        /**
+         * Test properties of API's accessibility node.
+         *
+         * @param {id}         id of element
+         * @param {test}       an object of tests
+         * @param {api}        string indicating the API to test
+         * @returns {Promise}  The string "match" when the test succeeds,
+         *                     a failure message otherwise
+         */
+        test_accessibility_api: async function(dom_id, test, api) {
+            return window.test_driver_internal.test_accessibility_api(
+              dom_id, test, api, location.href
+            );
         }
     };
 
@@ -1272,6 +1287,11 @@
 
         async get_accessibility_api_node(dom_id, url) {
             throw new Error("get_accessibility_api_node() is not available.");
+        },
+
+        async test_accessibility_api(dom_id, test, api, url) {
+            throw new Error("test_accessibility_api() is not available.");
         }
+
     };
 })();
diff --git a/tools/wptrunner/wptrunner/executors/actions.py b/tools/wptrunner/wptrunner/executors/actions.py
index 41c56585c70ce7..0ca0bc82f0efb3 100644
--- a/tools/wptrunner/wptrunner/executors/actions.py
+++ b/tools/wptrunner/wptrunner/executors/actions.py
@@ -476,6 +476,20 @@ def __call__(self, payload):
         url = payload["url"]
         return self.protocol.platform_accessibility.get_accessibility_api_node(dom_id, url)
 
+class TestAccessibilityAPIAction:
+    name = "test_accessibility_api"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        dom_id = payload["dom_id"]
+        test = payload["test"]
+        api = payload["api"]
+        url = payload["url"]
+        return self.protocol.platform_accessibility.test_accessibility_api(dom_id, test, api, url)
+
 
 actions = [ClickAction,
            DeleteAllCookiesAction,
@@ -513,4 +527,5 @@ def __call__(self, payload):
            GetVirtualSensorInformationAction,
            SetDevicePostureAction,
            ClearDevicePostureAction,
-           GetAccessibilityAPINodeAction]
+           GetAccessibilityAPINodeAction,
+           TestAccessibilityAPIAction]
diff --git a/tools/wptrunner/wptrunner/executors/executoratspi.py b/tools/wptrunner/wptrunner/executors/executoratspi.py
index c71caecb128d0f..0d3aa333cf191d 100644
--- a/tools/wptrunner/wptrunner/executors/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/executoratspi.py
@@ -55,15 +55,15 @@ def is_ready(tab, product, url):
         return True
     return False
 
-
-def serialize_node(node):
-    node_dictionary = {}
-    node_dictionary["API"] = "atspi"
-    node_dictionary["role"] = Atspi.Accessible.get_role_name(node)
-    node_dictionary["name"] = Atspi.Accessible.get_name(node)
-    node_dictionary["description"] = Atspi.Accessible.get_description(node)
-
-    return node_dictionary
+def find_browser(name):
+    desktop = Atspi.get_desktop(0)
+    child_count = Atspi.Accessible.get_child_count(desktop)
+    for i in range(child_count):
+        app = Atspi.Accessible.get_child_at_index(desktop, i)
+        full_app_name = Atspi.Accessible.get_name(app)
+        if name in full_app_name.lower():
+            return (app, full_app_name)
+    return (None, None)
 
 
 def find_node(root, dom_id):
@@ -73,7 +73,7 @@ def find_node(root, dom_id):
 
         attributes = Atspi.Accessible.get_attributes(node)
         if "id" in attributes and attributes["id"] == dom_id:
-            return node
+            return TestNode(root, dom_id, node)
 
         for i in range(Atspi.Accessible.get_child_count(node)):
             child = Atspi.Accessible.get_child_at_index(node, i)
@@ -82,17 +82,6 @@ def find_node(root, dom_id):
     return None
 
 
-def find_browser(name):
-    desktop = Atspi.get_desktop(0)
-    child_count = Atspi.Accessible.get_child_count(desktop)
-    for i in range(child_count):
-        app = Atspi.Accessible.get_child_at_index(desktop, i)
-        full_app_name = Atspi.Accessible.get_name(app)
-        if name in full_app_name.lower():
-            return (app, full_app_name)
-    return (None, None)
-
-
 class AtspiExecutorImpl:
     def setup(self, product_name, logger):
         self.logger = logger
@@ -108,8 +97,7 @@ def setup(self, product_name, logger):
                 f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Accessibility API queries will not succeeded."
             )
 
-
-    def get_accessibility_api_node(self, dom_id, url):
+    def __poll_for_tab_if_necessary(self, url):
         if not self.root:
             raise Exception(
                 f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Did you turn on accessibility?"
@@ -119,10 +107,179 @@ def get_accessibility_api_node(self, dom_id, url):
             self.test_url = url
             self.document = poll_for_tab(self.root, self.product_name, url)
 
-        node = find_node(self.document, dom_id)
-        if not node:
+    def get_accessibility_api_node(self, dom_id, url):
+        self.__poll_for_tab_if_necessary(url)
+
+        test_node = find_node(self.document, dom_id)
+        if not test_node:
             raise Exception(
                 f"Couldn't find node with id={dom_id} in accessibility API ATSPI."
             )
 
-        return json.dumps(serialize_node(node))
+        return json.dumps(test_node.serialize())
+
+    def test_accessibility_api(self, dom_id, test, api, url):
+        self.__poll_for_tab_if_necessary(url)
+
+        test_node = find_node(self.document, dom_id)
+
+        errors = []
+        for test_statement in test['Atspi']:
+            error = test_node.run_test_statement(TestStatement(test_statement));
+            if (error):
+                errors.append(error)
+
+        if len(errors):
+            return '; '.join(errors)
+
+        return "match"
+
+
+class TestNode():
+    """Wrapper around an Atspi Node for testing purposes"""
+    def __init__(self, root, dom_id, node):
+        self.root = root
+        self.dom_id = dom_id
+        self.node = node
+
+    def serialize(self):
+        node_dictionary = {}
+        node_dictionary["API"] = "atspi"
+        node_dictionary["role"] = Atspi.Accessible.get_role_name(self.node)
+        node_dictionary["name"] = Atspi.Accessible.get_name(self.node)
+        node_dictionary["description"] = Atspi.Accessible.get_description(self.node)
+        node_dictionary["states"] = self.get_state_list()
+        node_dictionary["objectAttributes"] = Atspi.Accessible.get_attributes_as_array(self.node)
+        node_dictionary["relations"] = self.get_relations_dictionary()
+
+        return node_dictionary
+
+    # Returns error or undefined
+    # 'statement' is a TestStatement object
+    def run_test_statement(self, statement):
+        if statement.type == 'property':
+            return self.run_property_test(statement)
+
+        if statement.type == 'relation':
+            return self.run_relation_test(statement)
+
+        if statement.type == 'reverseRelation':
+            return self.run_reverse_relation_test(statement)
+            return "not implemented reverse relations"
+
+        return f"Not implemented: {test}"
+
+    # Returns error or undefined
+    # 'statement' is a TestStatement object
+    def run_property_test(self, statement):
+        if statement.key == 'role':
+            role = Atspi.Accessible.get_role_name(self.node)
+            return statement.value_compare_with(role)
+
+        if statement.key == 'objectAttributes':
+            attributes = Atspi.Accessible.get_attributes_as_array(self.node)
+            return statement.value_contained_or_not_contained_in(attributes)
+
+        if statement.key == 'states':
+            states = self.get_state_list()
+            return statement.value_contained_or_not_contained_in(states)
+
+        return f"Not implemented: {statement}"
+
+
+    # Returns error or undefined
+    # 'statement' is a TestStatement object
+    def run_relation_test(self, statement):
+        expected_relation = statement.key
+        expected_ids = statement.value
+        relations_dict = self.get_relations_dictionary()
+        if expected_relation not in relations_dict:
+            return f"Node {self.dom_id} did not have relation {expected_relation}"
+
+        id_str = ','.join(relations_dict[expected_relation])
+        expected_ids.sort()
+        expected_id_str = ','.join(expected_ids)
+        if (id_str != expected_id_str):
+            return f"{expected_relation} should include elements with dom IDs {expected_ids}, but found only: {relations_dict[expected_relation]}"
+
+    # Returns error or undefined
+    # 'statement' is a TestStatement object
+    def run_reverse_relation_test(self, statement):
+        expected_relation = statement.key
+        # statement.value is also dom_ids, but representing the nodes that should have
+        # a reverse relation back to this node.
+        expected_elements = statement.value
+
+        for element in expected_elements:
+            test_node = find_node(self.root, element)
+            relation_dict = test_node.get_relations_dictionary()
+            if expected_relation not in relation_dict:
+                return f"Element with dom ID {element} should have relation {expected_relation}"
+            if self.dom_id not in relation_dict[expected_relation]:
+                return f"Element with dom ID {element} should have relation {expected_relation} pointing to {self.dom_id}, but found: {relation_dict[expected_relation]}"
+
+
+    # Returns dictionary where the keys are relation names and the values
+    # are a sorted list of dom IDs.
+    def get_relations_dictionary(self):
+        relations_dict = {}
+        relations = Atspi.Accessible.get_relation_set(self.node)
+        for relation in relations:
+            name = relation.get_relation_type().value_name.removeprefix('ATSPI_')
+            relations_dict[name] = []
+            num_targets = relation.get_n_targets()
+
+            for i in range(num_targets):
+                target = relation.get_target(i)
+                attributes = Atspi.Accessible.get_attributes(target)
+                if "id" in attributes:
+                    relations_dict[name].append(attributes["id"])
+                else:
+                    relations_dict[name].append("[unknown id]")
+        return relations_dict
+
+    def get_state_list(self):
+        state_list =  Atspi.Accessible.get_state_set(self.node).get_states()
+        state_string_list = []
+        for state in state_list:
+            state_string_list.append(state.value_name.replace('ATSPI_',''))
+        return state_string_list
+
+
+class TestStatement:
+    def __init__(self, test_statement_arr):
+        self.test_statement_arr = test_statement_arr
+
+        self.type = test_statement_arr[0];
+        self.key = test_statement_arr[1];
+        self.assertion = test_statement_arr[2];
+        self.value = test_statement_arr[3];
+
+    def __str__(self):
+        return str(self.test_statement_arrary)
+
+    # Returns error or undefined
+    def value_compare_with(self, value):
+        if self.assertion == 'is':
+            if self.value != value:
+                return f"{self.key} is {value}, but should be {self.value}"
+        elif self.assertion == 'isNot':
+            if self.value == value:
+                return f"{self.key} is {value}, but should not be {value}"
+        else:
+            return f"Test statement malformed, item 2 of '{self.test_statement_arr}' is not 'is' or 'isNot'."
+
+        return
+
+    # returns error undefined
+    def value_contained_or_not_contained_in(self, array):
+        if self.assertion == 'contains':
+            if self.value not in array:
+                return f"{self.key} {array} does not contain {self.value}"
+        elif self.assertion == 'doesNotContain':
+            if self.value in array:
+                return f"{self.key} {array} contains {self.value}"
+        else:
+            return f"Test statement malformed, item 2 of '{self.test_statement_arr}' is not 'contains' or 'doesNotContain'."
+
+        return
diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index f7868dc4c16a92..7a3cd2eba1dc9b 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -16,6 +16,15 @@
     windows = True
     from .executorwindowsaccessibility import WindowsAccessibilityExecutorImpl
 
+def valid_api_for_platform(api):
+    if (linux and api == "Atspi"):
+        return True
+    if (mac and api == "AXAPI"):
+        return True
+    if (windows and (api == "UIA" or api == "IAccessible2")):
+        return True
+    return False
+
 class PlatformAccessibilityProtocolPart(ProtocolPart):
     """Protocol part for platform accessibility introspection"""
     name = "platform_accessibility"
@@ -35,3 +44,12 @@ def setup(self):
 
     def get_accessibility_api_node(self, dom_id, url):
         return self.impl.get_accessibility_api_node(dom_id, url)
+
+    def test_accessibility_api(self, dom_id, test, api, url):
+        # TODO: this is a bit of a hack, it will cause the test to
+        # "pass" with no assertions ran. We will use this until WPT supports
+        # some kind of "not applicable" test result.
+        if not valid_api_for_platform(api):
+          return ""
+
+        return self.impl.test_accessibility_api(dom_id, test, api, url)
diff --git a/tools/wptrunner/wptrunner/testdriver-extra.js b/tools/wptrunner/wptrunner/testdriver-extra.js
index 9a5880b17a4713..e97f5d42fec37f 100644
--- a/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -339,4 +339,9 @@
     window.test_driver_internal.get_accessibility_api_node = function(dom_id, url) {
         return create_action("get_accessibility_api_node", {dom_id, url});
     };
+
+    window.test_driver_internal.test_accessibility_api = function(dom_id, test, api, url) {
+        return create_action("test_accessibility_api", {dom_id, test, api, url});
+    };
+
 })();

From 803e5caf4e8d359b7971efa2a010527c05df9f98 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 23 Aug 2024 10:41:12 -0700
Subject: [PATCH 2/5] Send back result for every test statement, remove 'match'
 concept

---
 .../json-test-example/scripts/aam-utils.js    | 43 ++++++++-----
 .../wptrunner/executors/executoratspi.py      | 61 ++++++++-----------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/core-aam/json-test-example/scripts/aam-utils.js b/core-aam/json-test-example/scripts/aam-utils.js
index 5573525469ff3b..d7aa33f2261580 100644
--- a/core-aam/json-test-example/scripts/aam-utils.js
+++ b/core-aam/json-test-example/scripts/aam-utils.js
@@ -4,9 +4,24 @@
 */
 
 const AAMUtils = {
-
   APIS: ['Atspi', 'AXAPI', 'IAccessible2', 'UIA'],
 
+  runAssertions: function(test_statements, results) {
+    // If the test was not run, the API doesn't apply to backend OS,
+    // pass with no asserts.
+    if (!results) {
+      return;
+    }
+
+    if (results.length !== test_statements.length)
+      assert_unreached(`Recieved a different number of results than test statements: ${results}`)
+
+    for (i = 0; i < results.length; i++) {
+      assert_equals(results[i], "Pass", `${test_statements[i].join(' ')}`)
+    }
+  },
+
+
   /*
     Creates a subtest for each API. Runs no asserts for APIs not found.
 
@@ -21,16 +36,16 @@ const AAMUtils = {
     }
 
     for (const api of this.APIS) {
-      if (map[api]) {
+      if (map[api] && map[api].length) {
         promise_test(async t => {
-          let result = await test_driver.test_accessibility_api(
+          let results = await test_driver.test_accessibility_api(
             id,
             map,
             api
           );
-          if (result) {
-            assert_equals(result, "match");
-          }
+
+          this.runAssertions(map[api], results);
+
         }, `api: ${api}, ${test_name}`);
       }
     }
@@ -58,14 +73,14 @@ const AAMUtils = {
     for (const api of this.APIS) {
       if (new_map[api]) {
         promise_test(async t => {
-          let result = await test_driver.test_accessibility_api(
+          let results = await test_driver.test_accessibility_api(
             id,
             new_map,
             api
           );
-          if (result) {
-            assert_equals(result, "match");
-          }
+
+          this.runAssertions(new_map[api], results);
+
         }, `api: ${api}, ${test_name}`);
       }
     }
@@ -92,14 +107,14 @@ const AAMUtils = {
     for (const api of this.APIS) {
       if (new_map[api]) {
         promise_test(async t => {
-          let result = await test_driver.test_accessibility_api(
+          let results = await test_driver.test_accessibility_api(
             id,
             new_map,
             api
           );
-          if (result) {
-            assert_equals(result, "match");
-          }
+
+          this.runAssertions(new_map[api], results);
+
         }, `api: ${api}, ${test_name}`);
       }
     }
diff --git a/tools/wptrunner/wptrunner/executors/executoratspi.py b/tools/wptrunner/wptrunner/executors/executoratspi.py
index 0d3aa333cf191d..21868934ab3e29 100644
--- a/tools/wptrunner/wptrunner/executors/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/executoratspi.py
@@ -123,16 +123,11 @@ def test_accessibility_api(self, dom_id, test, api, url):
 
         test_node = find_node(self.document, dom_id)
 
-        errors = []
+        results = []
         for test_statement in test['Atspi']:
-            error = test_node.run_test_statement(TestStatement(test_statement));
-            if (error):
-                errors.append(error)
+            results.append(test_node.run_test_statement(TestStatement(test_statement)));
 
-        if len(errors):
-            return '; '.join(errors)
-
-        return "match"
+        return results
 
 
 class TestNode():
@@ -154,7 +149,6 @@ def serialize(self):
 
         return node_dictionary
 
-    # Returns error or undefined
     # 'statement' is a TestStatement object
     def run_test_statement(self, statement):
         if statement.type == 'property':
@@ -167,9 +161,8 @@ def run_test_statement(self, statement):
             return self.run_reverse_relation_test(statement)
             return "not implemented reverse relations"
 
-        return f"Not implemented: {test}"
+        return "Error: not implemented ({statement.type})"
 
-    # Returns error or undefined
     # 'statement' is a TestStatement object
     def run_property_test(self, statement):
         if statement.key == 'role':
@@ -184,42 +177,41 @@ def run_property_test(self, statement):
             states = self.get_state_list()
             return statement.value_contained_or_not_contained_in(states)
 
-        return f"Not implemented: {statement}"
+        return f"Error: not implemented ({statement.key})"
 
-
-    # Returns error or undefined
     # 'statement' is a TestStatement object
     def run_relation_test(self, statement):
         expected_relation = statement.key
         expected_ids = statement.value
         relations_dict = self.get_relations_dictionary()
         if expected_relation not in relations_dict:
-            return f"Node {self.dom_id} did not have relation {expected_relation}"
-
+            return f"Fail: relation not in list: {list(relations_dict.keys())}"
         id_str = ','.join(relations_dict[expected_relation])
         expected_ids.sort()
         expected_id_str = ','.join(expected_ids)
         if (id_str != expected_id_str):
-            return f"{expected_relation} should include elements with dom IDs {expected_ids}, but found only: {relations_dict[expected_relation]}"
+            return f"Fail: {expected_relation}={relations_dict[expected_relation]}"
+        return "Pass"
 
-    # Returns error or undefined
     # 'statement' is a TestStatement object
     def run_reverse_relation_test(self, statement):
         expected_relation = statement.key
-        # statement.value is also dom_ids, but representing the nodes that should have
+        # statement.value is a list of dom_ids representing the nodes that should have
         # a reverse relation back to this node.
         expected_elements = statement.value
 
         for element in expected_elements:
             test_node = find_node(self.root, element)
-            relation_dict = test_node.get_relations_dictionary()
-            if expected_relation not in relation_dict:
-                return f"Element with dom ID {element} should have relation {expected_relation}"
-            if self.dom_id not in relation_dict[expected_relation]:
-                return f"Element with dom ID {element} should have relation {expected_relation} pointing to {self.dom_id}, but found: {relation_dict[expected_relation]}"
+            relations_dict = test_node.get_relations_dictionary()
+
+            if expected_relation not in relations_dict:
+                return f"Fail: element '{element}' does not have reverse relation, has relations: {list(relations_dict.keys())}"
 
+            if self.dom_id not in relations_dict[expected_relation]:
+                return f"Fail: element '{element}' {expected_relation}={relations_dict[expected_relation]}"
+
+        return "Pass"
 
-    # Returns dictionary where the keys are relation names and the values
     # are a sorted list of dom IDs.
     def get_relations_dictionary(self):
         relations_dict = {}
@@ -255,31 +247,28 @@ def __init__(self, test_statement_arr):
         self.assertion = test_statement_arr[2];
         self.value = test_statement_arr[3];
 
-    def __str__(self):
-        return str(self.test_statement_arrary)
-
     # Returns error or undefined
     def value_compare_with(self, value):
         if self.assertion == 'is':
             if self.value != value:
-                return f"{self.key} is {value}, but should be {self.value}"
+                return f"Fail: {self.key} is {value}"
         elif self.assertion == 'isNot':
             if self.value == value:
-                return f"{self.key} is {value}, but should not be {value}"
+                return f"Fail: {self.key} is {value}"
         else:
-            return f"Test statement malformed, item 2 of '{self.test_statement_arr}' is not 'is' or 'isNot'."
+            return f"Error: Test statement malformed, '{self.assertion}' must be 'is' or 'isNot'."
 
-        return
+        return "Pass"
 
     # returns error undefined
     def value_contained_or_not_contained_in(self, array):
         if self.assertion == 'contains':
             if self.value not in array:
-                return f"{self.key} {array} does not contain {self.value}"
+                return f"Fail: {array} does not contain {self.value}"
         elif self.assertion == 'doesNotContain':
             if self.value in array:
-                return f"{self.key} {array} contains {self.value}"
+                return f"Fail: {array} contains {self.value}"
         else:
-            return f"Test statement malformed, item 2 of '{self.test_statement_arr}' is not 'contains' or 'doesNotContain'."
+            return f"Error: Test statement malformed, '{self.assertion}' must be 'contains' or 'doesNotContain'."
 
-        return
+        return "Pass"

From 9ac10acfc20328e5453810363899a029289561bb Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Sun, 22 Sep 2024 16:04:20 -0700
Subject: [PATCH 3/5] Move tests around

---
 core-aam/acacia/{ => property-bag}/blockquote.html                | 0
 core-aam/acacia/{ => property-bag}/button.html                    | 0
 .../test-statements}/aria-autocomplete.html                       | 0
 .../test-statements}/aria-braillelabel.html                       | 0
 .../test-statements}/aria-errormessage.html                       | 0
 .../{json-test-example => acacia/test-statements}/blockquote.html | 0
 ...on_with_default_values_for_aria-pressed_and_aria-haspopup.html | 0
 .../button_with_defined_value_for_aria-pressed.html               | 0
 .../button_with_non_false_value_for_aria-haspopup.html            | 0
 .../test-statements}/scripts/aam-utils.js                         | 0
 .../test-statements}/scripts/attr-map.js                          | 0
 .../test-statements}/scripts/role-map.js                          | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename core-aam/acacia/{ => property-bag}/blockquote.html (100%)
 rename core-aam/acacia/{ => property-bag}/button.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/aria-autocomplete.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/aria-braillelabel.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/aria-errormessage.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/blockquote.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/button_with_default_values_for_aria-pressed_and_aria-haspopup.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/button_with_defined_value_for_aria-pressed.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/button_with_non_false_value_for_aria-haspopup.html (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/scripts/aam-utils.js (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/scripts/attr-map.js (100%)
 rename core-aam/{json-test-example => acacia/test-statements}/scripts/role-map.js (100%)

diff --git a/core-aam/acacia/blockquote.html b/core-aam/acacia/property-bag/blockquote.html
similarity index 100%
rename from core-aam/acacia/blockquote.html
rename to core-aam/acacia/property-bag/blockquote.html
diff --git a/core-aam/acacia/button.html b/core-aam/acacia/property-bag/button.html
similarity index 100%
rename from core-aam/acacia/button.html
rename to core-aam/acacia/property-bag/button.html
diff --git a/core-aam/json-test-example/aria-autocomplete.html b/core-aam/acacia/test-statements/aria-autocomplete.html
similarity index 100%
rename from core-aam/json-test-example/aria-autocomplete.html
rename to core-aam/acacia/test-statements/aria-autocomplete.html
diff --git a/core-aam/json-test-example/aria-braillelabel.html b/core-aam/acacia/test-statements/aria-braillelabel.html
similarity index 100%
rename from core-aam/json-test-example/aria-braillelabel.html
rename to core-aam/acacia/test-statements/aria-braillelabel.html
diff --git a/core-aam/json-test-example/aria-errormessage.html b/core-aam/acacia/test-statements/aria-errormessage.html
similarity index 100%
rename from core-aam/json-test-example/aria-errormessage.html
rename to core-aam/acacia/test-statements/aria-errormessage.html
diff --git a/core-aam/json-test-example/blockquote.html b/core-aam/acacia/test-statements/blockquote.html
similarity index 100%
rename from core-aam/json-test-example/blockquote.html
rename to core-aam/acacia/test-statements/blockquote.html
diff --git a/core-aam/json-test-example/button_with_default_values_for_aria-pressed_and_aria-haspopup.html b/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
similarity index 100%
rename from core-aam/json-test-example/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
rename to core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
diff --git a/core-aam/json-test-example/button_with_defined_value_for_aria-pressed.html b/core-aam/acacia/test-statements/button_with_defined_value_for_aria-pressed.html
similarity index 100%
rename from core-aam/json-test-example/button_with_defined_value_for_aria-pressed.html
rename to core-aam/acacia/test-statements/button_with_defined_value_for_aria-pressed.html
diff --git a/core-aam/json-test-example/button_with_non_false_value_for_aria-haspopup.html b/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
similarity index 100%
rename from core-aam/json-test-example/button_with_non_false_value_for_aria-haspopup.html
rename to core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
diff --git a/core-aam/json-test-example/scripts/aam-utils.js b/core-aam/acacia/test-statements/scripts/aam-utils.js
similarity index 100%
rename from core-aam/json-test-example/scripts/aam-utils.js
rename to core-aam/acacia/test-statements/scripts/aam-utils.js
diff --git a/core-aam/json-test-example/scripts/attr-map.js b/core-aam/acacia/test-statements/scripts/attr-map.js
similarity index 100%
rename from core-aam/json-test-example/scripts/attr-map.js
rename to core-aam/acacia/test-statements/scripts/attr-map.js
diff --git a/core-aam/json-test-example/scripts/role-map.js b/core-aam/acacia/test-statements/scripts/role-map.js
similarity index 100%
rename from core-aam/json-test-example/scripts/role-map.js
rename to core-aam/acacia/test-statements/scripts/role-map.js

From feb9a53e004eb9049a2bd74137670d5e4dbeae24 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Sun, 22 Sep 2024 16:39:51 -0700
Subject: [PATCH 4/5] Modify tests to not have seperate JSON file

---
 .../test-statements/aria-autocomplete.html    | 109 ++++++++--
 .../test-statements/aria-braillelabel.html    |  41 +++-
 .../test-statements/aria-errormessage.html    |  53 ++++-
 .../acacia/test-statements/blockquote.html    |  58 +++++-
 ...es_for_aria-pressed_and_aria-haspopup.html |  74 ++++---
 ...n_with_defined_value_for_aria-pressed.html |  58 +++++-
 ...ith_non_false_value_for_aria-haspopup.html |  73 +++++--
 .../test-statements/scripts/aam-utils.js      |  71 +------
 .../test-statements/scripts/attr-map.js       | 114 -----------
 .../test-statements/scripts/role-map.js       | 186 ------------------
 10 files changed, 390 insertions(+), 447 deletions(-)
 delete mode 100644 core-aam/acacia/test-statements/scripts/attr-map.js
 delete mode 100644 core-aam/acacia/test-statements/scripts/role-map.js

diff --git a/core-aam/acacia/test-statements/aria-autocomplete.html b/core-aam/acacia/test-statements/aria-autocomplete.html
index 86ec0a8ff2e6b8..db8bd74acb0ace 100644
--- a/core-aam/acacia/test-statements/aria-autocomplete.html
+++ b/core-aam/acacia/test-statements/aria-autocomplete.html
@@ -8,7 +8,6 @@
   <script src="/resources/testdriver.js"></script>
   <script src="/resources/testdriver-vendor.js"></script>
   <script src="/resources/testdriver-actions.js"></script>
-  <script src="scripts/attr-map.js"></script>
   <script src="scripts/aam-utils.js"></script>
 </head>
 <body>
@@ -18,25 +17,109 @@
 <input role='combobox' id='test3' aria-autocomplete='list'>
 
 <script>
-  AAMUtils.verifyAttrAPI(
+  AAMUtils.verifyAPI(
+    'aria-autocomplete=both',
     'test1',
-    'both',
-    attrmap['aria-autocomplete'],
-    'aria-autocomplete=both'
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:both"
+        ],
+        [
+          "property",
+          "states",
+          "contains",
+          "STATE_SUPPORTS_AUTOCOMPLETION"
+        ]
+      ],
+      "IAccessible2" : [
+         [
+           "property",
+           "objectAttributes",
+           "contains",
+           "autocomplete:both"
+         ],
+         [
+           "property",
+           "states",
+           "contains",
+           "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
+         ]
+      ]
+    }
   );
 
-  AAMUtils.verifyAttrAPI(
+  AAMUtils.verifyAPI(
+    'aria-autocomplete=inline',
     'test2',
-    'inline',
-    attrmap['aria-autocomplete'],
-    'aria-autocomplete=inline'
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:inline"
+        ],
+        [
+          "property",
+          "states",
+          "contains",
+          "STATE_SUPPORTS_AUTOCOMPLETION"
+        ]
+      ],
+      "IAccessible2" : [
+         [
+           "property",
+           "objectAttributes",
+           "contains",
+           "autocomplete:inline"
+         ],
+         [
+           "property",
+           "states",
+           "contains",
+           "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
+         ]
+      ]
+    }
   );
 
-  AAMUtils.verifyAttrAPI(
+  AAMUtils.verifyAPI(
+    'aria-autocomplete=list',
     'test3',
-    'list',
-    attrmap['aria-autocomplete'],
-    'aria-autocomplete=list'
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:list"
+        ],
+        [
+          "property",
+          "states",
+          "contains",
+          "STATE_SUPPORTS_AUTOCOMPLETION"
+        ]
+      ],
+      "IAccessible2" : [
+         [
+           "property",
+           "objectAttributes",
+           "contains",
+           "autocomplete:list"
+         ],
+         [
+           "property",
+           "states",
+           "contains",
+           "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
+         ]
+      ]
+    }
   );
 
 </script>
diff --git a/core-aam/acacia/test-statements/aria-braillelabel.html b/core-aam/acacia/test-statements/aria-braillelabel.html
index 53621b04d1bb6d..38662b73f4dc71 100644
--- a/core-aam/acacia/test-statements/aria-braillelabel.html
+++ b/core-aam/acacia/test-statements/aria-braillelabel.html
@@ -8,7 +8,6 @@
   <script src="/resources/testdriver.js"></script>
   <script src="/resources/testdriver-vendor.js"></script>
   <script src="/resources/testdriver-actions.js"></script>
-  <script src="scripts/attr-map.js"></script>
   <script src="scripts/aam-utils.js"></script>
 </head>
 <body>
@@ -16,11 +15,43 @@
 <button id=test aria-braillelabel=foobar>
 
 <script>
-  AAMUtils.verifyAttrAPI(
+  AAMUtils.verifyAPI(
+    'aria-braillelabel',
     'test',
-    'foobar',
-    attrmap['aria-braillelabel'],
-    'aria-braillelabel'
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "braillelabel:foobar"
+        ]
+      ],
+      "AXAPI" : [
+        [
+          "property",
+          "AXBrailleLabel",
+          "is",
+          "foobar"
+        ]
+      ],
+      "IAccessible2" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "braillelabel:foobar"
+        ]
+      ],
+      "UIA" : [
+        [
+          "property",
+          "AriaProperties.braillelabel",
+          "is",
+          "foobar"
+        ]
+      ]
+    },
   );
 </script>
 
diff --git a/core-aam/acacia/test-statements/aria-errormessage.html b/core-aam/acacia/test-statements/aria-errormessage.html
index 4ff8e0e2fcd359..4886231d87546d 100644
--- a/core-aam/acacia/test-statements/aria-errormessage.html
+++ b/core-aam/acacia/test-statements/aria-errormessage.html
@@ -8,7 +8,6 @@
   <script src="/resources/testdriver.js"></script>
   <script src="/resources/testdriver-vendor.js"></script>
   <script src="/resources/testdriver-actions.js"></script>
-  <script src="scripts/attr-map.js"></script>
   <script src="scripts/aam-utils.js"></script>
 </head>
 <body>
@@ -18,11 +17,55 @@
 <div id='error2'>world</div>
 
 <script>
-  AAMUtils.verifyRelationAPI(
+  AAMUtils.verifyAPI(
+    'aria-flowto',
     'test',
-    ['error1', 'error2'],
-    attrmap['aria-errormessage'],
-    'aria-flowto'
+    {
+      "Atspi" : [
+        [
+          "relation",
+          "RELATION_ERROR_MESSAGE",
+          "is",
+          ['error1', 'error2']
+        ],
+        [
+          "reverseRelation",
+          "RELATION_ERROR_FOR",
+          "is",
+          ['error1', 'error2']
+        ]
+      ],
+      "AXAPI" : [
+        [
+          "property",
+          "AXErrorMessageElements",
+          "is",
+          ['error1', 'error2']
+        ]
+      ],
+      "IAccessible2" : [
+        [
+          "relation",
+          "IA2_RELATION_ERROR",
+          "is",
+          ['error1', 'error2']
+        ],
+        [
+          "reverseRelation",
+          "IA2_RELATION_ERROR_FOR",
+          "is",
+          ['error1', 'error2']
+        ]
+      ],
+      "UIA" : [
+        [
+          "property",
+          "ControllerFor",
+          "is",
+          ['error1', 'error2']
+        ]
+      ]
+    }
   );
 </script>
 
diff --git a/core-aam/acacia/test-statements/blockquote.html b/core-aam/acacia/test-statements/blockquote.html
index dfd1ba25a71bae..80e3bc3893f81c 100644
--- a/core-aam/acacia/test-statements/blockquote.html
+++ b/core-aam/acacia/test-statements/blockquote.html
@@ -8,7 +8,6 @@
   <script src="/resources/testdriver.js"></script>
   <script src="/resources/testdriver-vendor.js"></script>
   <script src="/resources/testdriver-actions.js"></script>
-  <script src="scripts/role-map.js"></script>
   <script src="scripts/aam-utils.js"></script>
 </head>
 <body>
@@ -16,7 +15,62 @@
 <div id=test role=blockquote>quote</div>
 
 <script>
-  AAMUtils.verifyAPI('test', rolemap['blockquote'], 'role=blockquote');
+  AAMUtils.verifyAPI(
+    'role=blockquote',
+    'test',
+    {
+      "Atspi" : [
+         [
+            "property",
+            "role",
+            "is",
+            "block quote"
+         ]
+      ],
+      "AXAPI" : [
+         [
+            "property",
+            "AXRole",
+            "is",
+            "AXGroup"
+         ],
+         [
+            "property",
+            "AXSubrole",
+            "is",
+            "<nil>"
+         ]
+      ],
+      "IAccessible2" : [
+         [
+            "property",
+            "role",
+            "is",
+            "IA2_ROLE_BLOCK_QUOTE"
+         ],
+         [
+            "property",
+            "msaaRole",
+            "is",
+            "ROLE_SYSTEM_GROUPING"
+         ]
+      ],
+      "UIA" : [
+         [
+            "property",
+            "ControlType",
+            "is",
+            "Group"
+         ],
+         [
+            "property",
+            "LocalizedControlType",
+            "is",
+            "blockquote"
+         ]
+      ]
+    }
+  );
 </script>
 
 </body>
diff --git a/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html b/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
index 91f5d7a1b19acb..675aab4ddd1dbb 100644
--- a/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
+++ b/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
@@ -8,7 +8,6 @@
   <script src="/resources/testdriver.js"></script>
   <script src="/resources/testdriver-vendor.js"></script>
   <script src="/resources/testdriver-actions.js"></script>
-  <script src="scripts/role-map.js"></script>
   <script src="scripts/aam-utils.js"></script>
 </head>
 <body>
@@ -20,35 +19,52 @@
 <div id=test5 role=button aria-haspopup=false>click me</div>
 
 <script>
-  AAMUtils.verifyAPI(
-    'test1',
-    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
-    'role=button'
-  );
+  var test_statements = {
+    "Atspi" : [
+       [
+          "property",
+          "role",
+          "is",
+          "push button"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXRole",
+          "is",
+          "AXButton"
+       ],
+       [
+          "property",
+          "AXSubrole",
+          "is",
+          "<nil>"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "msaaRole",
+          "is",
+          "ROLE_SYSTEM_PUSHBUTTON"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControlType",
+          "is",
+          "Button"
+       ]
+    ]
+  };
 
-  AAMUtils.verifyAPI(
-    'test2',
-    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
-    'role=button aria-pressed'
-  );
-
-  AAMUtils.verifyAPI(
-    'test3',
-    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
-    'role=button aria-pressed aria-haspopup'
-  );
-
-  AAMUtils.verifyAPI(
-    'test4',
-    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
-    'role=button aria-haspopup'
-  );
-
-  AAMUtils.verifyAPI(
-    'test5',
-    rolemap['button_with_default_values_for_aria-pressed_and_aria-haspopup'],
-    'role=button aria-haspopup=false'
-  );
+  AAMUtils.verifyAPI('role=button', 'test1', test_statements);
+  AAMUtils.verifyAPI('role=button aria-pressed', 'test2', test_statements);
+  AAMUtils.verifyAPI('role=button aria-pressed aria-haspopup', 'test3', test_statements);
+  AAMUtils.verifyAPI('role=button aria-haspopup', 'test4', test_statements);
+  AAMUtils.verifyAPI('role=button aria-haspopup=false', 'test5', test_statements);
 </script>
 
 </body>
diff --git a/core-aam/acacia/test-statements/button_with_defined_value_for_aria-pressed.html b/core-aam/acacia/test-statements/button_with_defined_value_for_aria-pressed.html
index a2f0d24849d0be..fd84fec20d860b 100644
--- a/core-aam/acacia/test-statements/button_with_defined_value_for_aria-pressed.html
+++ b/core-aam/acacia/test-statements/button_with_defined_value_for_aria-pressed.html
@@ -17,16 +17,54 @@
 <div id=test2 role=button aria-pressed=false>press me</div>
 
 <script>
-  AAMUtils.verifyAPI(
-    'test1',
-    rolemap['button_with_defined_value_for_aria-pressed'],
-    'role=button aria-pressed=true'
-  );
+  var test_statements = {
+    "Atspi" : [
+       [
+          "property",
+          "role",
+          "is",
+          "toggle button"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXRole",
+          "is",
+          "AXCheckBox"
+       ],
+       [
+          "property",
+          "AXSubrole",
+          "is",
+          "AXToggle"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "role",
+          "is",
+          "IA2_ROLE_TOGGLE_BUTTON"
+       ],
+      [
+          "property",
+          "msaaRole",
+          "is",
+          "ROLE_SYSTEM_PUSHBUTTON"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControlType",
+          "is",
+          "Button"
+       ]
+    ]
+  };
 
-  AAMUtils.verifyAPI(
-    'test2',
-    rolemap['button_with_defined_value_for_aria-pressed'],
-    'role=button aria-pressed=false'
-  );
+  AAMUtils.verifyAPI('role=button aria-pressed=true', 'test1', test_statements);
+  AAMUtils.verifyAPI('role=button aria-pressed=false','test2', test_statements);
 </script>
 </body>
diff --git a/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html b/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
index a63ae1635b4bf2..6eb9a8f23714a3 100644
--- a/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
+++ b/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
@@ -8,7 +8,6 @@
   <script src="/resources/testdriver.js"></script>
   <script src="/resources/testdriver-vendor.js"></script>
   <script src="/resources/testdriver-actions.js"></script>
-  <script src="scripts/role-map.js"></script>
   <script src="scripts/aam-utils.js"></script>
 </head>
 <body>
@@ -21,41 +20,89 @@
 <div id=test6 role=button aria-haspopup=dialog>click me</div>
 
 <script>
+  var test_statements =  {
+     "Atspi" : [
+        [
+           "property",
+           "role",
+           "is",
+           "push button"
+        ]
+     ],
+     "AXAPI" : [
+        [
+           "property",
+           "AXRole",
+           "is",
+           "AXPopUpButton"
+        ],
+        [
+           "property",
+           "AXSubrole",
+           "is",
+           "<nil>"
+        ],
+        [
+           "property",
+           "actions",
+           "contains",
+           "AXShowMenu"
+        ]
+     ],
+     "IAccessible2" : [
+        [
+           "property",
+           "msaaRole",
+           "is",
+           "ROLE_SYSTEM_PUSHBUTTON"
+        ]
+     ],
+     "UIA" : [
+        [
+           "property",
+           "ControlType",
+           "is",
+           "Button"
+        ]
+     ]
+  };
+
+
 
   AAMUtils.verifyAPI(
+    'role=button aria-haspopup=true',
     'test1',
-    rolemap['button_with_non_false_value_for_aria-haspopup'],
-    'role=button aria-haspopup=true'
+    test_statements
   );
 
   AAMUtils.verifyAPI(
+    'role=button aria-haspopup=menu',
     'test2',
-    rolemap['button_with_non_false_value_for_aria-haspopup'],
-    'role=button aria-haspopup=menu'
+    test_statements
   );
 
   AAMUtils.verifyAPI(
+    'role=button aria-haspopup=listbox',
     'test3',
-    rolemap['button_with_non_false_value_for_aria-haspopup'],
-    'role=button aria-haspopup=listbox'
+    test_statements
   );
 
   AAMUtils.verifyAPI(
+    'role=button aria-haspopup=tree',
     'test4',
-    rolemap['button_with_non_false_value_for_aria-haspopup'],
-    'role=button aria-haspopup=tree'
+    test_statements
   );
 
   AAMUtils.verifyAPI(
+    'role=button aria-haspopup=grid',
     'test5',
-    rolemap['button_with_non_false_value_for_aria-haspopup'],
-    'role=button aria-haspopup=grid'
+    test_statements
   );
 
   AAMUtils.verifyAPI(
+    'role=button aria-haspopup=dialog',
     'test6',
-    rolemap['button_with_non_false_value_for_aria-haspopup'],
-    'role=button aria-haspopup=dialog'
+    test_statements
   );
 
 </script>
diff --git a/core-aam/acacia/test-statements/scripts/aam-utils.js b/core-aam/acacia/test-statements/scripts/aam-utils.js
index d7aa33f2261580..3bc0008b23bd20 100644
--- a/core-aam/acacia/test-statements/scripts/aam-utils.js
+++ b/core-aam/acacia/test-statements/scripts/aam-utils.js
@@ -30,7 +30,7 @@ const AAMUtils = {
     name:   name of the test
   */
 
-  verifyAPI: function(id, map, test_name) {
+  verifyAPI: function(test_name, id, map) {
     if (!map) {
       throw "Error: missing accessibility API test map";
     }
@@ -46,75 +46,6 @@ const AAMUtils = {
 
           this.runAssertions(map[api], results);
 
-        }, `api: ${api}, ${test_name}`);
-      }
-    }
-  },
-
-  /*
-    Creates a subtest for each API. Runs no asserts for APIs not found.
-
-    id:         id of element to test the accessibility node of
-    value:      value of the attribute being tested
-    map:        entry in attr-map.js, or similar, with the string "<value>"
-                to be replaced by the value argument
-    test_name:  name of the test
-  */
-
-  verifyAttrAPI: function(id, value, map, test_name) {
-    if (!map) {
-      throw "Error: missing accessibility API test map";
-    }
-
-    let new_map = JSON.parse(
-      JSON.stringify(map).replaceAll("<value>", value)
-    );
-
-    for (const api of this.APIS) {
-      if (new_map[api]) {
-        promise_test(async t => {
-          let results = await test_driver.test_accessibility_api(
-            id,
-            new_map,
-            api
-          );
-
-          this.runAssertions(new_map[api], results);
-
-        }, `api: ${api}, ${test_name}`);
-      }
-    }
-  },
-
-  /*
-    Creates a subtest for each API. Runs no asserts for APIs not found.
-
-    id:         id of element to test the accessibility node of
-    relations:  list of ids of "related" elements
-    map:        entry in attr-map.js, or similar
-    test_name:  name of the test
-  */
-
-  verifyRelationAPI: function(id, relations, map, test_name) {
-    if (!map) {
-      throw "Error: missing accessibility API test map";
-    }
-
-    let new_map = JSON.parse(
-      JSON.stringify(map).replaceAll("\"<id-list>\"", JSON.stringify(relations))
-    );
-
-    for (const api of this.APIS) {
-      if (new_map[api]) {
-        promise_test(async t => {
-          let results = await test_driver.test_accessibility_api(
-            id,
-            new_map,
-            api
-          );
-
-          this.runAssertions(new_map[api], results);
-
         }, `api: ${api}, ${test_name}`);
       }
     }
diff --git a/core-aam/acacia/test-statements/scripts/attr-map.js b/core-aam/acacia/test-statements/scripts/attr-map.js
deleted file mode 100644
index ecb96f8857bcf4..00000000000000
--- a/core-aam/acacia/test-statements/scripts/attr-map.js
+++ /dev/null
@@ -1,114 +0,0 @@
-attrmap = {
-  "aria-autocomplete": {
-    "Atspi" : [
-       [
-          "property",
-          "objectAttributes",
-          "contains",
-          "autocomplete:<value>"
-       ],
-       [
-          "property",
-          "states",
-          "contains",
-          "STATE_SUPPORTS_AUTOCOMPLETION"
-       ]
-    ],
-    "IAccessible2" : [
-       [
-          "property",
-          "objectAttributes",
-          "contains",
-          "autocomplete:<value>"
-       ],
-       [
-          "property",
-          "states",
-          "contains",
-          "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
-       ]
-    ]
-  },
-  "aria-braillelabel": {
-    "Atspi" : [
-       [
-          "property",
-          "objectAttributes",
-          "contains",
-          "braillelabel:<value>"
-       ]
-    ],
-    "AXAPI" : [
-       [
-          "property",
-          "AXBrailleLabel",
-          "is",
-          "<value>"
-       ]
-    ],
-    "IAccessible2" : [
-       [
-          "property",
-          "objectAttributes",
-          "contains",
-          "braillelabel:<value>"
-       ]
-    ],
-    "UIA" : [
-       [
-          "property",
-          "AriaProperties.braillelabel",
-          "is",
-          "<value>"
-       ]
-    ]
-  },
-  "aria-errormessage": {
-    "Atspi" : [
-       [
-          "relation",
-          "RELATION_ERROR_MESSAGE",
-          "is",
-          "<id-list>"
-       ],
-       [
-          "reverseRelation",
-          "RELATION_ERROR_FOR",
-          "is",
-          "<id-list>"
-       ]
-
-    ],
-    "AXAPI" : [
-       [
-          "property",
-          "AXErrorMessageElements",
-          "is",
-          "<id-list>"
-       ]
-    ],
-    "IAccessible2" : [
-       [
-          "relation",
-          "IA2_RELATION_ERROR",
-          "is",
-          "<id-list>"
-       ],
-       [
-          "reverseRelation",
-          "IA2_RELATION_ERROR_FOR",
-          "is",
-          "<is-list>"
-       ]
-
-    ],
-    "UIA" : [
-       [
-          "property",
-          "ControllerFor",
-          "is",
-          "<id-list>"
-       ]
-    ]
-  }
-}
diff --git a/core-aam/acacia/test-statements/scripts/role-map.js b/core-aam/acacia/test-statements/scripts/role-map.js
deleted file mode 100644
index 31808ffc02c0c6..00000000000000
--- a/core-aam/acacia/test-statements/scripts/role-map.js
+++ /dev/null
@@ -1,186 +0,0 @@
-rolemap = {
-  "blockquote" : {
-    "Atspi" : [
-       [
-          "property",
-          "role",
-          "is",
-          "block quote"
-       ]
-    ],
-    "AXAPI" : [
-       [
-          "property",
-          "AXRole",
-          "is",
-          "AXGroup"
-       ],
-       [
-          "property",
-          "AXSubrole",
-          "is",
-          "<nil>"
-       ]
-    ],
-    "IAccessible2" : [
-       [
-          "property",
-          "role",
-          "is",
-          "IA2_ROLE_BLOCK_QUOTE"
-       ],
-       [
-          "property",
-          "msaaRole",
-          "is",
-          "ROLE_SYSTEM_GROUPING"
-       ]
-    ],
-    "UIA" : [
-       [
-          "property",
-          "ControlType",
-          "is",
-          "Group"
-       ],
-       [
-          "property",
-          "LocalizedControlType",
-          "is",
-          "blockquote"
-       ]
-    ]
-  },
-  "button_with_default_values_for_aria-pressed_and_aria-haspopup": {
-    "Atspi" : [
-       [
-          "property",
-          "role",
-          "is",
-          "push button"
-       ]
-    ],
-    "AXAPI" : [
-       [
-          "property",
-          "AXRole",
-          "is",
-          "AXButton"
-       ],
-       [
-          "property",
-          "AXSubrole",
-          "is",
-          "<nil>"
-       ]
-    ],
-    "IAccessible2" : [
-       [
-          "property",
-          "msaaRole",
-          "is",
-          "ROLE_SYSTEM_PUSHBUTTON"
-       ]
-    ],
-    "UIA" : [
-       [
-          "property",
-          "ControlType",
-          "is",
-          "Button"
-       ]
-    ]
-  },
-  "button_with_non_false_value_for_aria-haspopup" : {
-     "Atspi" : [
-        [
-           "property",
-           "role",
-           "is",
-           "push button"
-        ]
-     ],
-     "AXAPI" : [
-        [
-           "property",
-           "AXRole",
-           "is",
-           "AXPopUpButton"
-        ],
-        [
-           "property",
-           "AXSubrole",
-           "is",
-           "<nil>"
-        ],
-        [
-           "property",
-           "actions",
-           "contains",
-           "AXShowMenu"
-        ]
-     ],
-     "IAccessible2" : [
-        [
-           "property",
-           "msaaRole",
-           "is",
-           "ROLE_SYSTEM_PUSHBUTTON"
-        ]
-     ],
-     "UIA" : [
-        [
-           "property",
-           "ControlType",
-           "is",
-           "Button"
-        ]
-     ]
-  },
-  "button_with_defined_value_for_aria-pressed": {
-    "Atspi" : [
-       [
-          "property",
-          "role",
-          "is",
-          "toggle button"
-       ]
-    ],
-    "AXAPI" : [
-       [
-          "property",
-          "AXRole",
-          "is",
-          "AXCheckBox"
-       ],
-       [
-          "property",
-          "AXSubrole",
-          "is",
-          "AXToggle"
-       ]
-    ],
-    "IAccessible2" : [
-       [
-          "property",
-          "role",
-          "is",
-          "IA2_ROLE_TOGGLE_BUTTON"
-       ],
-      [
-          "property",
-          "msaaRole",
-          "is",
-          "ROLE_SYSTEM_PUSHBUTTON"
-       ]
-    ],
-    "UIA" : [
-       [
-          "property",
-          "ControlType",
-          "is",
-          "Button"
-       ]
-    ]
-  }
-}

From cffec5d125e508c8902fad94cc072ee76aaa0ab7 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 27 Nov 2024 15:16:27 -0800
Subject: [PATCH 5/5] f

---
 core-aam/acacia/property-bag/button.html                        | 2 +-
 ..._with_default_values_for_aria-pressed_and_aria-haspopup.html | 2 +-
 .../button_with_non_false_value_for_aria-haspopup.html          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core-aam/acacia/property-bag/button.html b/core-aam/acacia/property-bag/button.html
index 5dc231526f14c8..a1e42a5f12c9b3 100644
--- a/core-aam/acacia/property-bag/button.html
+++ b/core-aam/acacia/property-bag/button.html
@@ -15,7 +15,7 @@
       const node = await test_driver.get_accessibility_api_node('test');
 
       if (node.API == 'atspi') {
-        assert_equals(node.role, 'push button', 'Atspi role');
+        assert_equals(node.role, 'button', 'Atspi role');
       }
       else if (node.API == 'axapi') {
         assert_equals(node.role, 'AXButton', 'AX API role');
diff --git a/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html b/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
index 675aab4ddd1dbb..b3f0ac91c0289a 100644
--- a/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
+++ b/core-aam/acacia/test-statements/button_with_default_values_for_aria-pressed_and_aria-haspopup.html
@@ -25,7 +25,7 @@
           "property",
           "role",
           "is",
-          "push button"
+          "button"
        ]
     ],
     "AXAPI" : [
diff --git a/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html b/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
index 6eb9a8f23714a3..a6e5126352ea8c 100644
--- a/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
+++ b/core-aam/acacia/test-statements/button_with_non_false_value_for_aria-haspopup.html
@@ -26,7 +26,7 @@
            "property",
            "role",
            "is",
-           "push button"
+           "button"
         ]
      ],
      "AXAPI" : [
