From 80f12462162f5d8b4baa1afeeddd9dc1448cebad Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 30 Apr 2024 17:18:04 -0700
Subject: [PATCH 01/14] Create new test type for accessibility API testing

---
 .taskcluster.yml                              |   2 +-
 lint.ignore                                   |   1 +
 tools/ci/tc/tasks/test.yml                    |   2 +-
 tools/docker/Dockerfile                       |   3 +
 tools/manifest/item.py                        |  16 ++
 tools/manifest/manifest.py                    |   4 +-
 tools/manifest/sourcefile.py                  |  27 +-
 tools/mypy.ini                                |   9 +
 tools/wpt/run.py                              |   4 +
 tools/wpt/testfiles.py                        |   2 +-
 .../requirements_platform_accessibility.txt   |   8 +
 tools/wptrunner/wptrunner/browsers/chrome.py  |  16 +-
 .../wptrunner/wptrunner/browsers/chromium.py  |   1 +
 tools/wptrunner/wptrunner/browsers/edge.py    |   1 +
 tools/wptrunner/wptrunner/browsers/firefox.py |  19 +-
 tools/wptrunner/wptrunner/browsers/servo.py   |   1 +
 tools/wptrunner/wptrunner/executors/base.py   |   2 +-
 .../executors/pytestrunner/runner.py          |   1 +
 tools/wptrunner/wptrunner/wpttest.py          |  22 +-
 wai-aria-aam/__init__.py                      |   0
 .../attribute/aria-autocomplete_tentative.py  |  33 +++
 .../attribute/aria-braillelabel_tentative.py  |  37 +++
 .../attribute/aria-errormessage_tentative.py  |  51 ++++
 wai-aria-aam/conftest.py                      |  11 +
 wai-aria-aam/role/__init__.py                 |   0
 wai-aria-aam/role/blockquote_tentative.py     |  44 ++++
 ...ria-pressed_and_aria-haspopup_tentative.py |  46 ++++
 ...efined_value_for_aria-pressed_tentative.py |  43 ++++
 ...false_value_for_aria-haspopup_tentative.py |  46 ++++
 wai-aria-aam/support/__init__.py              |   0
 wai-aria-aam/support/atspi_wrapper.py         | 236 ++++++++++++++++++
 wai-aria-aam/support/axapi_wrapper.py         | 128 ++++++++++
 wai-aria-aam/support/fixtures_a11y_api.py     |  54 ++++
 wai-aria-aam/support/ia2/constants.py         | 208 +++++++++++++++
 wai-aria-aam/support/ia2/ia2_api_all.tlb      | Bin 0 -> 29016 bytes
 wai-aria-aam/support/ia2_wrapper.py           | 165 ++++++++++++
 36 files changed, 1226 insertions(+), 17 deletions(-)
 create mode 100644 tools/wptrunner/requirements_platform_accessibility.txt
 create mode 100644 wai-aria-aam/__init__.py
 create mode 100644 wai-aria-aam/attribute/aria-autocomplete_tentative.py
 create mode 100644 wai-aria-aam/attribute/aria-braillelabel_tentative.py
 create mode 100644 wai-aria-aam/attribute/aria-errormessage_tentative.py
 create mode 100644 wai-aria-aam/conftest.py
 create mode 100644 wai-aria-aam/role/__init__.py
 create mode 100644 wai-aria-aam/role/blockquote_tentative.py
 create mode 100644 wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
 create mode 100644 wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
 create mode 100644 wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
 create mode 100644 wai-aria-aam/support/__init__.py
 create mode 100644 wai-aria-aam/support/atspi_wrapper.py
 create mode 100644 wai-aria-aam/support/axapi_wrapper.py
 create mode 100644 wai-aria-aam/support/fixtures_a11y_api.py
 create mode 100644 wai-aria-aam/support/ia2/constants.py
 create mode 100644 wai-aria-aam/support/ia2/ia2_api_all.tlb
 create mode 100644 wai-aria-aam/support/ia2_wrapper.py

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 5bef41d7d97406..d120d54d3960f1 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -57,7 +57,7 @@ tasks:
             owner: ${owner}
             source: ${event.repository.clone_url}
           payload:
-            image: ghcr.io/web-platform-tests/wpt:2
+            image: ghcr.io/web-platform-tests/wpt:3
             maxRunTime: 7200
             artifacts:
               public/results:
diff --git a/lint.ignore b/lint.ignore
index a7c03c52572fef..1e5bb0f53fdd8f 100644
--- a/lint.ignore
+++ b/lint.ignore
@@ -52,6 +52,7 @@ TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.wbn
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.avif
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.annexb
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.crx
+TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.tlb
 
 ## .gitignore
 W3C-TEST.ORG: .gitignore
diff --git a/tools/ci/tc/tasks/test.yml b/tools/ci/tc/tasks/test.yml
index ee65c513dbc5fe..1926dbe89995a0 100644
--- a/tools/ci/tc/tasks/test.yml
+++ b/tools/ci/tc/tasks/test.yml
@@ -4,7 +4,7 @@ components:
     workerType: ci
     schedulerId: taskcluster-github
     deadline: "24 hours"
-    image: ghcr.io/web-platform-tests/wpt:2
+    image: ghcr.io/web-platform-tests/wpt:3
     maxRunTime: 7200
     artifacts:
       public/results:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index a936ad9167f058..53f1c9f3d7a5be 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,6 +20,9 @@ RUN apt-get -qqy update \
     glib-networking-services \
     gstreamer1.0-plugins-bad \
     gstreamer1.0-gl \
+    libatspi2.0-dev \
+    libcairo2-dev \
+    libgirepository1.0-dev \
     libosmesa6-dev \
     libproxy1-plugin-webkit \
     libvirt-daemon-system \
diff --git a/tools/manifest/item.py b/tools/manifest/item.py
index 99df09d1320dc9..597a27a9b821d4 100644
--- a/tools/manifest/item.py
+++ b/tools/manifest/item.py
@@ -354,6 +354,22 @@ def to_json(self) -> Tuple[Optional[Text], Dict[Text, Any]]:
         return rv
 
 
+class AccessibilityAPIMappingTest(URLManifestItem):
+    __slots__ = ()
+
+    item_type = "aamtest"
+
+    @property
+    def timeout(self) -> Optional[Text]:
+        return self._extras.get("timeout")
+
+    def to_json(self) -> Tuple[Optional[Text], Dict[Text, Any]]:
+        rv = super().to_json()
+        if self.timeout is not None:
+            rv[-1]["timeout"] = self.timeout
+        return rv
+
+
 class SupportFile(ManifestItem):
     __slots__ = ()
 
diff --git a/tools/manifest/manifest.py b/tools/manifest/manifest.py
index c4eca5f26eb77c..ce4c5ed0b98d1c 100644
--- a/tools/manifest/manifest.py
+++ b/tools/manifest/manifest.py
@@ -8,7 +8,8 @@
 
 from . import jsonlib
 from . import vcs
-from .item import (ConformanceCheckerTest,
+from .item import (AccessibilityAPIMappingTest,
+                   ConformanceCheckerTest,
                    CrashTest,
                    ManifestItem,
                    ManualTest,
@@ -46,6 +47,7 @@ class InvalidCacheError(Exception):
                                                 "crashtest": CrashTest,
                                                 "manual": ManualTest,
                                                 "wdspec": WebDriverSpecTest,
+                                                "aamtest": AccessibilityAPIMappingTest,
                                                 "conformancechecker": ConformanceCheckerTest,
                                                 "visual": VisualTest,
                                                 "spec": SpecItem,
diff --git a/tools/manifest/sourcefile.py b/tools/manifest/sourcefile.py
index 3628105006c972..dd739f7c7c0c3f 100644
--- a/tools/manifest/sourcefile.py
+++ b/tools/manifest/sourcefile.py
@@ -16,7 +16,8 @@
 import html5lib
 
 from . import XMLParser
-from .item import (ConformanceCheckerTest,
+from .item import (AccessibilityAPIMappingTest,
+                   ConformanceCheckerTest,
                    CrashTest,
                    ManifestItem,
                    ManualTest,
@@ -397,6 +398,15 @@ def name_is_webdriver(self) -> bool:
                 self.filename not in ("__init__.py", "conftest.py") and
                 fnmatch(self.filename, wd_pattern))
 
+    @property
+    def name_is_wai_aria_aam(self) -> bool:
+        """Check if the file name matches the conditions for the file to
+        be a WAI-ARIA AAM spec test file"""
+        rel_path_parts = self.rel_path_parts
+        return ((rel_path_parts[0] == "wai-aria-aam" and len(rel_path_parts) > 1) and
+                self.filename not in ("__init__.py", "conftest.py") and
+                fnmatch(self.filename, wd_pattern))
+
     @property
     def name_is_reference(self) -> bool:
         """Check if the file name matches the conditions for the file to
@@ -474,7 +484,7 @@ def pac_nodes(self) -> List[ElementTree.Element]:
     def script_metadata(self) -> Optional[List[Tuple[Text, Text]]]:
         if self.name_is_worker or self.name_is_multi_global or self.name_is_window or self.name_is_extension:
             regexp = js_meta_re
-        elif self.name_is_webdriver:
+        elif self.name_is_webdriver or self.name_is_wai_aria_aam:
             regexp = python_meta_re
         else:
             return None
@@ -899,6 +909,9 @@ def possible_types(self) -> Set[Text]:
         if self.name_is_webdriver:
             return {WebDriverSpecTest.item_type}
 
+        if self.name_is_wai_aria_aam:
+            return {AccessibilityAPIMappingTest.item_type}
+
         if self.name_is_visual:
             return {VisualTest.item_type}
 
@@ -986,6 +999,16 @@ def manifest_items(self) -> Tuple[Text, List[ManifestItem]]:
                     timeout=self.timeout
                 )]
 
+        elif self.name_is_wai_aria_aam:
+            rv = AccessibilityAPIMappingTest.item_type, [
+                AccessibilityAPIMappingTest(
+                    self.tests_root,
+                    self.rel_path,
+                    self.url_base,
+                    self.rel_url,
+                    timeout=self.timeout
+                )]
+
         elif self.name_is_visual:
             rv = VisualTest.item_type, [
                 VisualTest(
diff --git a/tools/mypy.ini b/tools/mypy.ini
index 34b796cdfc9a10..d4c177c35931f4 100644
--- a/tools/mypy.ini
+++ b/tools/mypy.ini
@@ -42,6 +42,9 @@ follow_imports = silent
 follow_imports = silent
 
 # Ignore missing or untyped libraries.
+[mypy-ApplicationServices.*]
+ignore_missing_imports = True
+
 [mypy-Cocoa.*]
 ignore_missing_imports = True
 
@@ -51,9 +54,15 @@ ignore_missing_imports = True
 [mypy-Quartz.*]
 ignore_missing_imports = True
 
+[mypy-comtypes.*]
+ignore_missing_imports = True
+
 [mypy-dnslib.*]
 ignore_missing_imports = True
 
+[mypy-gi.*]
+ignore_missing_imports = True
+
 [mypy-marionette_driver.*]
 ignore_missing_imports = True
 
diff --git a/tools/wpt/run.py b/tools/wpt/run.py
index 7bc9572ad73c9f..b858d667d11888 100644
--- a/tools/wpt/run.py
+++ b/tools/wpt/run.py
@@ -904,6 +904,10 @@ def setup_wptrunner(venv, **kwargs):
     if not venv.skip_virtualenv_setup:
         requirements = [os.path.join(wpt_root, "tools", "wptrunner", "requirements.txt")]
         requirements.extend(setup_cls.requirements())
+
+        if "aamtest" in kwargs["test_types"]:
+            requirements.append(os.path.join(wpt_root, "tools", "wptrunner", "requirements_platform_accessibility.txt"))
+
         venv.install_requirements(*requirements)
 
     affected_revish = kwargs.get("affected")
diff --git a/tools/wpt/testfiles.py b/tools/wpt/testfiles.py
index 833e144f5a0def..df79e2702d3193 100644
--- a/tools/wpt/testfiles.py
+++ b/tools/wpt/testfiles.py
@@ -238,7 +238,7 @@ def affected_testfiles(files_changed: Iterable[Text],
     nontests_changed = set(files_changed)
     wpt_manifest = load_manifest(manifest_path, manifest_update)
 
-    test_types = ["crashtest", "print-reftest", "reftest", "testharness", "wdspec"]
+    test_types = ["crashtest", "print-reftest", "reftest", "testharness", "wdspec", "aamtest"]
     support_files = {os.path.join(wpt_root, path)
                      for _, path, _ in wpt_manifest.itertypes("support")}
     wdspec_test_files = {os.path.join(wpt_root, path)
diff --git a/tools/wptrunner/requirements_platform_accessibility.txt b/tools/wptrunner/requirements_platform_accessibility.txt
new file mode 100644
index 00000000000000..b14331f7e25e93
--- /dev/null
+++ b/tools/wptrunner/requirements_platform_accessibility.txt
@@ -0,0 +1,8 @@
+comtypes==1.4.11; sys_platform == 'win32'
+PyGObject==3.50.1; sys_platform == 'linux' and python_version >= '3.9'
+PyGObject==3.48.2; sys_platform == 'linux' and python_version < '3.9'
+pyobjc-framework-Accessibility==11.1; sys_platform == 'darwin' and python_version >= '3.9'
+pyobjc-framework-ApplicationServices==11.1; sys_platform == 'darwin' and python_version >= '3.9'
+pyobjc==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
+pyobjc-framework-Accessibility==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
+pyobjc-framework-ApplicationServices==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
diff --git a/tools/wptrunner/wptrunner/browsers/chrome.py b/tools/wptrunner/wptrunner/browsers/chrome.py
index a490a07ac00a00..ef6a32e0dbe7c8 100644
--- a/tools/wptrunner/wptrunner/browsers/chrome.py
+++ b/tools/wptrunner/wptrunner/browsers/chrome.py
@@ -1,5 +1,6 @@
 # mypy: allow-untyped-defs
 
+import os
 import re
 import time
 
@@ -33,6 +34,7 @@
                               "reftest": "ChromeDriverRefTestExecutor",
                               "print-reftest": "ChromeDriverPrintRefTestExecutor",
                               "wdspec": "WdspecExecutor",
+                              "aamtest": "WdspecExecutor",
                               "crashtest": "ChromeDriverCrashTestExecutor"},
                  "browser_kwargs": "browser_kwargs",
                  "executor_kwargs": "executor_kwargs",
@@ -222,6 +224,13 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data, subsuite
     if test_type == "wdspec":
         executor_kwargs["binary_args"] = chrome_options["args"]
 
+    if test_type == "aamtest":
+        # Necessary to force chrome to register in AT-SPI2.
+        os.environ["ACCESSIBILITY_ENABLED"] = "1"
+        if "--force-renderer-accessibility" not in chrome_options["args"]:
+            chrome_options["args"].append("--force-renderer-accessibility")
+            executor_kwargs["binary_args"] = chrome_options["args"]
+
     executor_kwargs["capabilities"] = capabilities
 
     return executor_kwargs
@@ -256,9 +265,10 @@ def __init__(self,
         self._require_webdriver_bidi: Optional[bool] = None
 
     def restart_on_test_type_change(self, new_test_type: str, old_test_type: str) -> bool:
-        # Restart the test runner when switch from/to wdspec tests. Wdspec test
-        # is using a different protocol class so a restart is always needed.
-        if "wdspec" in [old_test_type, new_test_type]:
+        # Restart the test runner when switch from/to wdspec or aamtest tests.
+        # These tests use a different protocol class so a restart is always needed.
+        wdspec_types = {"wdspec", "aamtest"}
+        if old_test_type in wdspec_types or new_test_type in wdspec_types:
             return True
         return False
 
diff --git a/tools/wptrunner/wptrunner/browsers/chromium.py b/tools/wptrunner/wptrunner/browsers/chromium.py
index 13cb49aed21087..26b7b8a4842450 100644
--- a/tools/wptrunner/wptrunner/browsers/chromium.py
+++ b/tools/wptrunner/wptrunner/browsers/chromium.py
@@ -17,6 +17,7 @@
                               "reftest": "WebDriverRefTestExecutor",
                               "print-reftest": "ChromeDriverPrintRefTestExecutor",
                               "wdspec": "WdspecExecutor",
+                              "aamtest": "WdspecExecutor",
                               "crashtest": "WebDriverCrashtestExecutor"},
                  "browser_kwargs": "browser_kwargs",
                  "executor_kwargs": "executor_kwargs",
diff --git a/tools/wptrunner/wptrunner/browsers/edge.py b/tools/wptrunner/wptrunner/browsers/edge.py
index 82597c9312a4ad..6d399cbbb5c773 100644
--- a/tools/wptrunner/wptrunner/browsers/edge.py
+++ b/tools/wptrunner/wptrunner/browsers/edge.py
@@ -19,6 +19,7 @@
                               "reftest": "EdgeDriverRefTestExecutor",
                               "print-reftest": "EdgeDriverPrintRefTestExecutor",
                               "wdspec": "WdspecExecutor",
+                              "aamtest": "WdspecExecutor",
                               "crashtest": "WebDriverCrashtestExecutor"},
                  "browser_kwargs": "browser_kwargs",
                  "executor_kwargs": "executor_kwargs",
diff --git a/tools/wptrunner/wptrunner/browsers/firefox.py b/tools/wptrunner/wptrunner/browsers/firefox.py
index 3e92fafbbc5633..e4b1a3f22a8086 100644
--- a/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -40,12 +40,14 @@
 __wptrunner__ = {"product": "firefox",
                  "check_args": "check_args",
                  "browser": {None: "FirefoxBrowser",
-                             "wdspec": "FirefoxWdSpecBrowser"},
+                             "wdspec": "FirefoxWdSpecBrowser",
+                             "aamtest": "FirefoxWdSpecBrowser"},
                  "executor": {"crashtest": "MarionetteCrashtestExecutor",
                               "testharness": "MarionetteTestharnessExecutor",
                               "reftest": "MarionetteRefTestExecutor",
                               "print-reftest": "MarionettePrintRefTestExecutor",
-                              "wdspec": "MarionetteWdspecExecutor"},
+                              "wdspec": "MarionetteWdspecExecutor",
+                              "aamtest": "MarionetteWdspecExecutor",},
                  "browser_kwargs": "browser_kwargs",
                  "executor_kwargs": "executor_kwargs",
                  "env_extras": "env_extras",
@@ -71,7 +73,7 @@ def get_timeout_multiplier(test_type, run_info_data, **kwargs):
             return 4 * multiplier
         else:
             return 2 * multiplier
-    elif test_type == "wdspec":
+    elif test_type in ("wdspec", "aamtest"):
         if (run_info_data.get("asan") or
             run_info_data.get("ccov") or
             run_info_data.get("debug")):
@@ -126,7 +128,7 @@ def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs)
                       "gmp_path": kwargs["gmp_path"] if "gmp_path" in kwargs else None,
                       "debug_test": kwargs["debug_test"]}
 
-    if test_type == "wdspec":
+    if test_type in ("wdspec", "aamtest"):
         browser_kwargs["webdriver_binary"] = kwargs["webdriver_binary"]
         browser_kwargs["webdriver_args"] = kwargs["webdriver_args"].copy()
 
@@ -145,6 +147,9 @@ def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs)
         browser_kwargs["test_type"] = test_type
         browser_kwargs["timeout_multiplier"] = get_timeout_multiplier(test_type, run_info_data, **kwargs)
 
+    if test_type == "aamtest" and ('accessibility.force_disabled', '-1') not in browser_kwargs["extra_prefs"]:
+        browser_kwargs["extra_prefs"].append(('accessibility.force_disabled', '-1'))
+
     browser_kwargs["extra_prefs"].extend(subsuite.config.get("prefs", []))
     return browser_kwargs
 
@@ -172,7 +177,8 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data,
             else:
                 cache_screenshots = major_version < 14
         executor_kwargs["cache_screenshots"] = cache_screenshots
-    if test_type == "wdspec":
+
+    if test_type in ("wdspec", "aamtest"):
         options = {"args": []}
         if kwargs["binary"]:
             executor_kwargs["webdriver_args"].extend(["--binary", kwargs["binary"]])
@@ -775,7 +781,7 @@ def _get_default_prefs(self):
         if self.test_type == "print-reftest":
             prefs["print.always_print_silent"] = True
 
-        if self.test_type == "wdspec":
+        if self.test_type in ("wdspec", "aamtest"):
             prefs.update(
                 {
                     "remote.prefs.recommended": True,
@@ -978,6 +984,7 @@ def __init__(self, logger, binary, package_name, prefs_root, webdriver_binary, w
 
         self.env = self.get_env(binary, debug_info, headless, gmp_path, chaos_mode_flags, e10s)
 
+        # Todo: need test type to use "aam" test in profile_creator_cls
         profile_creator = profile_creator_cls(logger,
                                               prefs_root,
                                               config,
diff --git a/tools/wptrunner/wptrunner/browsers/servo.py b/tools/wptrunner/wptrunner/browsers/servo.py
index 8893f01103ae43..66e8fe6af8cf4c 100644
--- a/tools/wptrunner/wptrunner/browsers/servo.py
+++ b/tools/wptrunner/wptrunner/browsers/servo.py
@@ -27,6 +27,7 @@
         "reftest": "ServoRefTestExecutor",
         "crashtest": "ServoCrashtestExecutor",
         "wdspec": "WdspecExecutor",
+        "aamtest": "WdspecExecutor",
     },
     "browser_kwargs": "browser_kwargs",
     "executor_kwargs": "executor_kwargs",
diff --git a/tools/wptrunner/wptrunner/executors/base.py b/tools/wptrunner/wptrunner/executors/base.py
index dd10aca589c72f..6ef8fd5691ac16 100644
--- a/tools/wptrunner/wptrunner/executors/base.py
+++ b/tools/wptrunner/wptrunner/executors/base.py
@@ -39,7 +39,7 @@ def executor_kwargs(test_type, test_environment, run_info_data, subsuite, **kwar
         executor_kwargs["screenshot_cache"] = screenshot_cache
         executor_kwargs["reftest_screenshot"] = kwargs["reftest_screenshot"]
 
-    if test_type == "wdspec":
+    if test_type in ("wdspec", "aamtest"):
         executor_kwargs["binary"] = kwargs["binary"]
         executor_kwargs["binary_args"] = kwargs["binary_args"].copy()
         executor_kwargs["webdriver_binary"] = kwargs["webdriver_binary"]
diff --git a/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py b/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
index df7b7c40132267..57eab56082dfa5 100644
--- a/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
+++ b/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
@@ -52,6 +52,7 @@ def run(path, server_config, session_config, timeout=0):
 
             config = session_config.copy()
             config["wptserve"] = server_config.as_dict()
+            config["timeout"] = timeout
 
             with open(config_path, "w") as f:
                 json.dump(config, f)
diff --git a/tools/wptrunner/wptrunner/wpttest.py b/tools/wptrunner/wptrunner/wpttest.py
index 9616f9c429f309..c7b7cb912f7080 100644
--- a/tools/wptrunner/wptrunner/wpttest.py
+++ b/tools/wptrunner/wptrunner/wpttest.py
@@ -10,7 +10,7 @@
 from .wptmanifest.parser import atoms
 
 atom_reset = atoms["Reset"]
-enabled_tests = {"testharness", "reftest", "wdspec", "crashtest", "print-reftest"}
+enabled_tests = {"testharness", "reftest", "wdspec", "crashtest", "print-reftest", "aamtest"}
 
 
 class Result(ABC):
@@ -78,6 +78,16 @@ class WdspecSubtestResult(SubtestResult):
     statuses = {"PASS", "FAIL", "ERROR"}
 
 
+class AamSpecResult(Result):
+    default_expected = "OK"
+    statuses = {"OK", "ERROR", "INTERNAL-ERROR", "TIMEOUT", "EXTERNAL-TIMEOUT", "CRASH"}
+
+
+class AamSpecSubtestResult(SubtestResult):
+    default_expected = "PASS"
+    statuses = {"PASS", "FAIL", "ERROR"}
+
+
 class CrashtestResult(Result):
     default_expected = "PASS"
     statuses = {"PASS", "ERROR", "INTERNAL-ERROR", "TIMEOUT", "EXTERNAL-TIMEOUT",
@@ -735,6 +745,15 @@ class WdspecTest(Test):
     long_timeout = 180  # 3 minutes
 
 
+class AamSpecTest(Test):
+    result_cls = AamSpecResult
+    subtest_result_cls = AamSpecSubtestResult
+    test_type = "aamtest"
+
+    default_timeout = 25
+    long_timeout = 180  # 3 minutes
+
+
 class CrashTest(Test):
     result_cls = CrashtestResult
     test_type = "crashtest"
@@ -764,6 +783,7 @@ def from_manifest(cls, manifest_file, manifest_item, inherit_metadata, test_meta
                      "print-reftest": PrintReftestTest,
                      "testharness": TestharnessTest,
                      "wdspec": WdspecTest,
+                     "aamtest": AamSpecTest,
                      "crashtest": CrashTest}
 
 
diff --git a/wai-aria-aam/__init__.py b/wai-aria-aam/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/wai-aria-aam/attribute/aria-autocomplete_tentative.py b/wai-aria-aam/attribute/aria-autocomplete_tentative.py
new file mode 100644
index 00000000000000..eb87d2db6d5166
--- /dev/null
+++ b/wai-aria-aam/attribute/aria-autocomplete_tentative.py
@@ -0,0 +1,33 @@
+import pytest
+
+TEST_HTML = {
+    "both": "<input role='combobox' id='test' aria-autocomplete='both'>",
+    "inline": "<input role='combobox' id='test' aria-autocomplete='inline'>",
+    "list": "<input role='combobox' id='test' aria-autocomplete='list'>",
+}
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_atspi(atspi, session, inline, test_name):
+    if not atspi:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    node = atspi.find_node("test", session.url)
+    assert f"autocomplete:{test_name}" in atspi.Accessible.get_attributes_as_array(node)
+    assert "STATE_SUPPORTS_AUTOCOMPLETION" in atspi.get_state_list_helper(node)
+
+
+# Intentionally no AX API test, AX API does not map.
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_ia2(ia2, session, inline, test_name):
+    if not ia2:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for IA2.
+
+
+# Intentionally no UIA test, UIA does not map.
diff --git a/wai-aria-aam/attribute/aria-braillelabel_tentative.py b/wai-aria-aam/attribute/aria-braillelabel_tentative.py
new file mode 100644
index 00000000000000..26031b46554b01
--- /dev/null
+++ b/wai-aria-aam/attribute/aria-braillelabel_tentative.py
@@ -0,0 +1,37 @@
+
+TEST_HTML = '<button id=test aria-braillelabel=foobar>'
+
+def test_atspi(atspi, session, inline):
+    if not atspi:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    node = atspi.find_node('test', session.url)
+    assert "braillelabel:foobar" in atspi.Accessible.get_attributes_as_array(node)
+
+def test_axapi(axapi, session, inline):
+    if not axapi:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # Todo: Add test for AX API.
+
+
+def test_ia2(ia2, session, inline):
+    if not ia2:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # Todo: Add test for IA2.
+
+
+def test_uia(uia, session, inline):
+    if not uia:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # Todo: Add test for UIA.
diff --git a/wai-aria-aam/attribute/aria-errormessage_tentative.py b/wai-aria-aam/attribute/aria-errormessage_tentative.py
new file mode 100644
index 00000000000000..6047af8bab78e7
--- /dev/null
+++ b/wai-aria-aam/attribute/aria-errormessage_tentative.py
@@ -0,0 +1,51 @@
+
+TEST_HTML = '''<div role='checkbox' id='test' aria-errormessage='error1 error2' aria-invalid='true'>content</div>
+<div id='error1'>hello</div>
+<div id='error2'>world</div>'''
+
+def test_atspi(atspi, session, inline):
+    if not atspi:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # Relation
+    node = atspi.find_node('test', session.url)
+    relations = atspi.get_relations_dictionary_helper(node)
+    assert 'RELATION_ERROR_MESSAGE' in relations
+    assert 'error1' in relations['RELATION_ERROR_MESSAGE']
+    assert 'error2' in relations['RELATION_ERROR_MESSAGE']
+
+    # Reverse Relation
+    for error_id in ['error1', 'error2']:
+        error_node = atspi.find_node(error_id, session.url)
+        error_relations = atspi.get_relations_dictionary_helper(error_node)
+        assert 'RELATION_ERROR_FOR' in error_relations
+        assert 'test' in error_relations['RELATION_ERROR_FOR']
+
+
+def test_axapi(axapi, session, inline):
+    if not axapi:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # Todo: Add test for AX API.
+
+
+def test_ia2(ia2, session, inline):
+    if not ia2:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # Todo: Add test for IA2.
+
+
+def test_uia(uia, session, inline):
+    if not uia:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # Todo: Add test for UIA.
diff --git a/wai-aria-aam/conftest.py b/wai-aria-aam/conftest.py
new file mode 100644
index 00000000000000..ece894c923f333
--- /dev/null
+++ b/wai-aria-aam/conftest.py
@@ -0,0 +1,11 @@
+import sys
+from pathlib import Path
+
+# Add webdriver to the Python path so we can import the fixtures
+webdriver_tests_path = Path(__file__).parent.parent / "webdriver"
+sys.path.insert(0, str(webdriver_tests_path))
+
+pytest_plugins = (
+    "tests.support.fixtures",
+    "support.fixtures_a11y_api",
+)
diff --git a/wai-aria-aam/role/__init__.py b/wai-aria-aam/role/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/wai-aria-aam/role/blockquote_tentative.py b/wai-aria-aam/role/blockquote_tentative.py
new file mode 100644
index 00000000000000..7b3b2706bde215
--- /dev/null
+++ b/wai-aria-aam/role/blockquote_tentative.py
@@ -0,0 +1,44 @@
+
+TEST_HTML = "<div role=blockquote id=test></div>"
+
+def test_atspi(atspi, session, inline):
+    if not atspi:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    node = atspi.find_node("test", session.url)
+    assert atspi.Accessible.get_role_name(node) == "block quote"
+
+def test_axapi(axapi, session, inline):
+    if not axapi:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    node = axapi.find_node("test", session.url)
+    role = axapi.AXUIElementCopyAttributeValue(node, "AXRole", None)
+    assert role == "AXGroup"
+    role = axapi.AXUIElementCopyAttributeValue(node, "AXSubrole", None)
+    assert role == ""
+
+def test_ia2(ia2, session, inline):
+    if not ia2:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    node = ia2.find_node("test", session.url)
+    assert ia2.get_role(node) == "IA2_ROLE_BLOCK_QUOTE"
+    assert ia2.get_msaa_role(node) == "ROLE_SYSTEM_GROUPING"
+
+def test_uia(uia, session, inline):
+    if not uia:
+        return
+
+    session.url = inline(TEST_HTML)
+
+    # This is an example, because the `uia` fixture is not implemented.
+    node = uia.find_node("test", session.url)
+    assert node.ControlType == "Group"
+    assert node.LocalizedControlType == "blockquote"
diff --git a/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
new file mode 100644
index 00000000000000..db69cf791e2c87
--- /dev/null
+++ b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
@@ -0,0 +1,46 @@
+import pytest
+
+TEST_HTML = {
+    "no-attributes": "<div id=test role=button>click me</div>",
+    "aria-pressed": "<div id=test role=button aria-pressed>click me</div>",
+    "aria-pressed-and-aria-haspopup": "<div id=test role=button aria-pressed aria-haspopup>click me</div>",
+    "aria-haspopup": "<div id=test role=button aria-haspopup>click me</div>",
+    "aria-haspopup-false": "<div id=test role=button aria-haspopup=false>click me</div>",
+}
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_atspi(atspi, session, inline, test_name):
+    if not atspi:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    node = atspi.find_node("test", session.url)
+    assert atspi.Accessible.get_role_name(node) == "button"
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_axapi(axapi, session, inline, test_name):
+    if not axapi:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for AX API.
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_ia2(ia2, session, inline, test_name):
+    if not ia2:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for IA2.
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_uia(uia, session, inline, test_name):
+    if not uia:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for UIA.
diff --git a/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
new file mode 100644
index 00000000000000..155a2d2461ae45
--- /dev/null
+++ b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
@@ -0,0 +1,43 @@
+import pytest
+
+TEST_HTML = {
+    "true": "<div id=test role=button aria-pressed=true>press me</div>",
+    "false": "<div id=test role=button aria-pressed=false>press me</div>"
+}
+
+@pytest.mark.parametrize("test_name", TEST_HTML)
+def test_atspi(atspi, session, inline, test_name):
+    if not atspi:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    node = atspi.find_node("test", session.url)
+    assert atspi.Accessible.get_role_name(node) == "toggle button"
+
+@pytest.mark.parametrize("test_name", TEST_HTML)
+def test_axapi(axapi, session, inline, test_name):
+    if not axapi:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for AX API.
+
+@pytest.mark.parametrize("test_name", TEST_HTML)
+def test_ia2(ia2, session, inline, test_name):
+    if not ia2:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for IA2.
+
+@pytest.mark.parametrize("test_name", TEST_HTML)
+def test_uia(uia, session, inline, test_name):
+    if not uia:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for UIA.
diff --git a/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
new file mode 100644
index 00000000000000..38805a11546625
--- /dev/null
+++ b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
@@ -0,0 +1,46 @@
+import pytest
+
+TEST_HTML = {
+    "true": "<div id=test role=button aria-haspopup=true>click me</div>",
+    "menu": "<div id=test role=button aria-haspopup=menu>click me</div>",
+    "listbox": "<div id=test role=button aria-haspopup=listbox>click me</div>",
+    "tree": "<div id=test role=button aria-haspopup=tree>click me</div>",
+    "grid": "<div id=test role=button aria-haspopup=grid>click me</div>",
+    "dialog": "<div id=test role=button aria-haspopup=dialog>click me</div>"
+}
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_atspi(atspi, session, inline, test_name):
+    if not atspi:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+    node = atspi.find_node("test", session.url)
+    assert atspi.Accessible.get_role_name(node) == "button"
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_axapi(axapi, session, inline, test_name):
+    if not axapi:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for AX API.
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_ia2(ia2, session, inline, test_name):
+    if not ia2:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for IA2.
+
+@pytest.mark.parametrize("test_name", TEST_HTML.keys())
+def test_uia(uia, session, inline, test_name):
+    if not uia:
+        return
+
+    session.url = inline(TEST_HTML[test_name])
+
+    # Todo: Add test for UIA.
diff --git a/wai-aria-aam/support/__init__.py b/wai-aria-aam/support/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
new file mode 100644
index 00000000000000..abbdb9aca1d6c3
--- /dev/null
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -0,0 +1,236 @@
+from __future__ import annotations
+
+import time
+from typing import Optional, List, Dict
+import warnings
+
+import gi
+
+gi.require_version("Atspi", "2.0")
+from gi.repository import Atspi
+
+def poll_for_tab(root: Atspi.Accessible, product: str, url: str, timeout: float) -> Atspi.Accessible:
+    """Poll until the tab with the test url is loaded and available in the
+       accessibility API. Assumes wptrunner has already started a browser
+       process and navigated to the test page.
+
+    :param root: The node in the accessibility API representing the browser process.
+    :param product: The name of the browser.
+    :param url: The url of the test.
+    :param timeout: How long to look for the tab, in seconds.
+    :return: Atspi.Accessible representing test document.
+    """
+
+    tab = find_tab(root, product, url)
+    stop = time.time() + timeout
+    while not tab:
+        if time.time() > stop:
+            raise TimeoutError(f"Timeout looking for url: {url}")
+        time.sleep(0.01)
+        tab = find_tab(root, product, url)
+
+    return tab
+
+
+def find_tab(
+    root: Atspi.Accessible, product: str, url: str
+) -> Optional[Atspi.Accessible]:
+    """Find the tab with the test url.
+
+    :param root: The node in the accessibility API representing the browser process.
+    :param product: The name of the browser.
+    :param url: The url of the test.
+    :return: Atspi.Accessible representing test document or None.
+    """
+
+    stack = [root]
+    while stack:
+        node = stack.pop()
+        if Atspi.Accessible.get_role_name(node) == "frame":
+            relationset = Atspi.Accessible.get_relation_set(node)
+            for relation in relationset:
+                if relation.get_relation_type() == Atspi.RelationType.EMBEDS:
+                    tab = relation.get_target(0)
+                    if is_ready(tab, product, url):
+                        return tab
+                    else:
+                        return None
+            continue
+
+        for i in range(Atspi.Accessible.get_child_count(node)):
+            child = Atspi.Accessible.get_child_at_index(node, i)
+            stack.append(child)
+
+    return None
+
+
+def is_ready(tab: Atspi.Accessible, product: str, url: str) -> bool:
+    """Test whether tab is fully loaded.
+
+    :param tab: Atspi.Accessible representing test document.
+    :param product: The name of the browser.
+    :param url: The url of the test.
+    :return: Boolean.
+    """
+
+    # Firefox uses the "BUSY" state to indicate the page is not ready.
+    if product == "firefox":
+        state_set = Atspi.Accessible.get_state_set(tab)
+        return not Atspi.StateSet.contains(state_set, Atspi.StateType.BUSY)
+
+    # Chromium family browsers do not use "BUSY", but you can
+    # tell if the document can be queried by URL attribute. If the 'URI'
+    # attribute is not here, we need to query for a new accessible object.
+    document = Atspi.Accessible.get_document_iface(tab)
+    document_attributes = Atspi.Document.get_document_attributes(document)
+
+    return "URI" in document_attributes and document_attributes["URI"] == url
+
+
+def find_browser(pid: int) -> Optional[Atspi.Accessible]:
+    """Find the Atspi.Accessible representing the browser.
+
+    :param pid: The PID of the browser.
+    :return: Atspi.Accessible or None.
+    """
+
+    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)
+        if pid == Atspi.Accessible.get_process_id(app):
+            return app
+    return None
+
+
+def find_browser_by_name(name: str) -> Optional[Atspi.Accessible]:
+    """Find the Atspi.Accessible representing the browser.
+
+    :param name: The name of the browser.
+    :return: Atspi.Accessible or None.
+    """
+
+    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
+    return None
+
+
+def find_node(root: Atspi.Accessible, dom_id: str) -> Optional[Atspi.Accessible]:
+    """Find the Atspi.Accessible with a specified dom_id.
+
+    :dom_id: The dom ID.
+    :return: TestNode or None if not found.
+    """
+
+    stack = [root]
+    while stack:
+        node = stack.pop()
+
+        attributes = Atspi.Accessible.get_attributes(node)
+        if "id" in attributes and attributes["id"] == dom_id:
+            return node
+
+        for i in range(Atspi.Accessible.get_child_count(node)):
+            child = Atspi.Accessible.get_child_at_index(node, i)
+            stack.append(child)
+
+    return None
+
+
+class AtspiWrapper:
+    def __init__(self, pid: int, product_name: str, timeout: float) -> None:
+        """Setup for accessibility API testing.
+
+        :pid: The PID of the process which exposes the accessibility API.
+        :product_name: The name of the browser, used to find the browser in the accessibility API.
+        :timeout: The timeout the test harness has set for this test, local timeouts can be set based on it.
+        """
+        self.product_name: str = product_name
+        self.pid: int = pid
+        self.root: Optional[Atspi.Accessible] = None
+        self.document: Optional[Atspi.Accessible] = None
+        self.test_url: Optional[str] = None
+        self.timeout: float = timeout
+
+        if self.pid and self.pid != 0:
+            self.root = find_browser(self.pid)
+        else:
+            self.root = find_browser_by_name(self.product_name)
+
+        if not self.root:
+            warnings.warn(
+                f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Accessibility API queries will not succeed."
+            )
+
+
+    @property
+    def Accessible(self):
+        return Atspi.Accessible
+
+    def _poll_for_tab_if_necessary(self, url: str) -> None:
+        """If accessible node representing the test document for this URL has
+           not been found, find it and set self.document.
+
+        :param url: The url of the test.
+        """
+        if not self.root:
+            raise Exception(
+                f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Did you turn on accessibility?"
+            )
+
+        if self.test_url != url or not self.document:
+            self.test_url = url
+            self.document = poll_for_tab(self.root, self.product_name, url, self.timeout)
+
+
+    def find_node(self, dom_id: str, url: str) -> Atspi.Accessible:
+        """
+        :param dom_id: The dom id of the node to test.
+        :param url: The url of the test.
+        """
+        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 test_node
+
+
+    def get_relations_dictionary_helper(self, node: Atspi.Accessible) -> Dict[str, List[str]]:
+        """
+        :returns: A dictionary with relations as keys and the values, DOM ids.
+        """
+        relations_dict: Dict[str, List[str]] = {}
+        relations = Atspi.Accessible.get_relation_set(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_helper(self, node: Atspi.Accessible) -> List[str]:
+        """
+        :returns: A list of states for this Atspi.Accessible.
+        """
+        state_list = Atspi.Accessible.get_state_set(node).get_states()
+        state_string_list = []
+        for state in state_list:
+            state_string_list.append(state.value_name.removeprefix("ATSPI_"))
+        return state_string_list
diff --git a/wai-aria-aam/support/axapi_wrapper.py b/wai-aria-aam/support/axapi_wrapper.py
new file mode 100644
index 00000000000000..2748741a42d4c8
--- /dev/null
+++ b/wai-aria-aam/support/axapi_wrapper.py
@@ -0,0 +1,128 @@
+from typing import Optional, Any
+
+import warnings
+
+from ApplicationServices import (
+    AXUIElementCopyAttributeNames,
+    AXUIElementCopyAttributeValue,
+    AXUIElementCreateApplication,
+)
+
+from Cocoa import (
+    NSApplicationActivationPolicyRegular,
+    NSPredicate,
+    NSWorkspace,
+)
+
+def find_browser(name: str) -> Optional[Any]:
+    """Find the AXUIElement representing the browser.
+
+    :param name: The name of the browser.
+    :return: AXUIElement or None.
+    """
+
+    ws = NSWorkspace.sharedWorkspace()
+    regular_predicate = NSPredicate.predicateWithFormat_(
+        f"activationPolicy == {NSApplicationActivationPolicyRegular}"
+    )
+    running_apps = ws.runningApplications().filteredArrayUsingPredicate_(
+        regular_predicate
+    )
+    name_predicate = NSPredicate.predicateWithFormat_(
+        f"localizedName contains[c] '{name}'"
+    )
+    filtered_apps = running_apps.filteredArrayUsingPredicate_(name_predicate)
+    if filtered_apps.count() == 0:
+        return None
+    app = filtered_apps[0]
+    pid = app.processIdentifier()
+    if pid == -1:
+        return None
+    return AXUIElementCreateApplication(pid)
+
+
+def find_active_tab(browser: Any) -> Optional[Any]:
+    """Find the active tab of the browser.
+
+    :param browser: The name of the browser.
+    :return: AXUIElement representing test document or None.
+    """
+
+    stack = [browser]
+    while stack:
+        node = stack.pop()
+
+        err, role = AXUIElementCopyAttributeValue(node, "AXRole", None)
+        if err:
+            continue
+        if role == "AXWebArea":
+            return node
+
+        err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+        if err:
+            continue
+        stack.extend(children)
+
+    return None
+
+
+def find_node(root: Any, attribute: str, expected_value: str) -> Optional[Any]:
+    """Find the AXUIElement with a specified dom_id.
+
+    :root: The root of a subtree to search.
+    :attribute: Any AXAPI attribute.
+    :param expected_value: The expected value of the attribute.
+    :return: AXUIElement or None if not found.
+    """
+
+    stack = [root]
+    while stack:
+        node = stack.pop()
+
+        err, attributes = AXUIElementCopyAttributeNames(node, None)
+        if err:
+            continue
+        if attribute in attributes:
+            err, value = AXUIElementCopyAttributeValue(node, attribute, None)
+            if err:
+                continue
+            if value == expected_value:
+                return node
+
+        err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+        if err:
+            continue
+        stack.extend(children)
+    return None
+
+
+class AxapiWrapper:
+    def __init__(self, pid: int, product_name: str, timeout: float) -> None:
+
+        """Setup for accessibility API testing.
+
+        :pid: The PID of the process which exposes the accessibility API.
+        :product_name: The name of the browser, used to find the browser in the accessibility API.
+        :timeout: The timeout the test harness has set for this test, local timeouts can be set based on it.
+        """
+        self.product_name = product_name
+        self.root: Optional[Any] = find_browser(self.product_name)
+        self.timeout: float = timeout
+
+        if not self.root:
+            warnings.warn(
+                f"Couldn't find browser {self.product_name} in accessibility API AX API. Accessibility API queries will not succeed."
+            )
+
+    @property
+    def AXUIElementCopyAttributeValue(self):
+        return AXUIElementCopyAttributeValue
+
+    def find_node(self, dom_id: str, url: str) -> Optional[Any]:
+        tab = find_active_tab(self.root)
+        node = find_node(tab, "AXDOMIdentifier", dom_id)
+        if not node:
+            raise Exception(
+                f"Couldn't find node with ID {dom_id} in accessibility API AXAPI."
+            )
+        return node
diff --git a/wai-aria-aam/support/fixtures_a11y_api.py b/wai-aria-aam/support/fixtures_a11y_api.py
new file mode 100644
index 00000000000000..2cb5cdfc64f78a
--- /dev/null
+++ b/wai-aria-aam/support/fixtures_a11y_api.py
@@ -0,0 +1,54 @@
+import pytest
+from sys import platform
+
+def pid_from(capabilities):
+    if capabilities['browserName'] == "chrome":
+        return capabilities["goog:processID"], "chrome"
+    if capabilities['browserName'] == "firefox":
+        return capabilities["moz:processID"], "firefox"
+    if capabilities['browserName'] == "servo":
+        return 0, "servo"
+
+@pytest.fixture
+def default_timeout(full_configuration):
+    if not full_configuration['timeout'] or full_configuration['timeout'] == 0:
+        return 60
+    return full_configuration['timeout'] * .5
+
+@pytest.fixture
+def atspi(session, default_timeout):
+    if platform != "linux":
+        return
+
+    from .atspi_wrapper import AtspiWrapper
+
+    pid, product_name = pid_from(session.capabilities)
+    return AtspiWrapper(pid, product_name, default_timeout)
+
+@pytest.fixture
+def axapi(session, default_timeout):
+    if platform != "darwin":
+        return
+
+    from .axapi_wrapper import AxapiWrapper
+
+    pid, product_name = pid_from(session.capabilities)
+    return AxapiWrapper(pid, product_name, default_timeout)
+
+@pytest.fixture
+def uia(session):
+    if platform != "win32":
+        return
+
+    # TODO: Make UiaWrapper and return it
+
+
+@pytest.fixture
+def ia2(session, default_timeout):
+    if platform != "win32":
+        return
+
+    from .ia2_wrapper import Ia2Wrapper
+
+    pid, product_name = pid_from(session.capabilities)
+    return Ia2Wrapper(pid, product_name, default_timeout)
diff --git a/wai-aria-aam/support/ia2/constants.py b/wai-aria-aam/support/ia2/constants.py
new file mode 100644
index 00000000000000..4f87122cf3983a
--- /dev/null
+++ b/wai-aria-aam/support/ia2/constants.py
@@ -0,0 +1,208 @@
+# type: ignore
+
+import enum
+import os
+import comtypes.client
+
+# Get IAccessible2 constants for helper functions below
+ia2_tlb = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    "ia2_api_all.tlb",
+)
+ia2_mod = comtypes.client.GetModule(ia2_tlb)
+# Add to globals the many IAccessible2 constants. These will also be imported
+# when this file is imported.
+globals().update((k, getattr(ia2_mod, k)) for k in ia2_mod.__all__)
+
+class Role(enum.IntEnum):
+    # MSAA roles - constants not provided via oleacc
+    ROLE_SYSTEM_TITLEBAR = 1
+    ROLE_SYSTEM_MENUBAR = 2
+    ROLE_SYSTEM_SCROLLBAR = 3
+    ROLE_SYSTEM_GRIP = 4
+    ROLE_SYSTEM_SOUND = 5
+    ROLE_SYSTEM_CURSOR = 6
+    ROLE_SYSTEM_CARET = 7
+    ROLE_SYSTEM_ALERT = 8
+    ROLE_SYSTEM_WINDOW = 9
+    ROLE_SYSTEM_CLIENT = 10
+    ROLE_SYSTEM_MENUPOPUP = 11
+    ROLE_SYSTEM_MENUITEM = 12
+    ROLE_SYSTEM_TOOLTIP = 13
+    ROLE_SYSTEM_APPLICATION = 14
+    ROLE_SYSTEM_DOCUMENT = 15
+    ROLE_SYSTEM_PANE = 16
+    ROLE_SYSTEM_CHART = 17
+    ROLE_SYSTEM_DIALOG = 18
+    ROLE_SYSTEM_BORDER = 19
+    ROLE_SYSTEM_GROUPING = 20
+    ROLE_SYSTEM_SEPARATOR = 21
+    ROLE_SYSTEM_TOOLBAR = 22
+    ROLE_SYSTEM_STATUSBAR = 23
+    ROLE_SYSTEM_TABLE = 24
+    ROLE_SYSTEM_COLUMNHEADER = 25
+    ROLE_SYSTEM_ROWHEADER = 26
+    ROLE_SYSTEM_COLUMN = 27
+    ROLE_SYSTEM_ROW = 28
+    ROLE_SYSTEM_CELL = 29
+    ROLE_SYSTEM_LINK = 30
+    ROLE_SYSTEM_HELPBALLOON = 31
+    ROLE_SYSTEM_CHARACTER = 32
+    ROLE_SYSTEM_LIST = 33
+    ROLE_SYSTEM_LISTITEM = 34
+    ROLE_SYSTEM_OUTLINE = 35
+    ROLE_SYSTEM_OUTLINEITEM = 36
+    ROLE_SYSTEM_PAGETAB = 37
+    ROLE_SYSTEM_PROPERTYPAGE = 38
+    ROLE_SYSTEM_INDICATOR = 39
+    ROLE_SYSTEM_GRAPHIC = 40
+    ROLE_SYSTEM_STATICTEXT = 41
+    ROLE_SYSTEM_TEXT = 42
+    ROLE_SYSTEM_PUSHBUTTON = 43
+    ROLE_SYSTEM_CHECKBUTTON = 44
+    ROLE_SYSTEM_RADIOBUTTON = 45
+    ROLE_SYSTEM_COMBOBOX = 46
+    ROLE_SYSTEM_DROPLIST = 47
+    ROLE_SYSTEM_PROGRESSBAR = 48
+    ROLE_SYSTEM_DIAL = 49
+    ROLE_SYSTEM_HOTKEYFIELD = 50
+    ROLE_SYSTEM_SLIDER = 51
+    ROLE_SYSTEM_SPINBUTTON = 52
+    ROLE_SYSTEM_DIAGRAM = 53
+    ROLE_SYSTEM_ANIMATION = 54
+    ROLE_SYSTEM_EQUATION = 55
+    ROLE_SYSTEM_BUTTONDROPDOWN = 56
+    ROLE_SYSTEM_BUTTONMENU = 57
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID = 58
+    ROLE_SYSTEM_WHITESPACE = 59
+    ROLE_SYSTEM_PAGETABLIST = 60
+    ROLE_SYSTEM_CLOCK = 61
+    ROLE_SYSTEM_SPLITBUTTON = 62
+    ROLE_SYSTEM_IPADDRESS = 63
+    ROLE_SYSTEM_OUTLINEBUTTON = 64
+    # IAccessible2 roles
+    IA2_ROLE_CANVAS = ia2_mod.IA2_ROLE_CANVAS
+    IA2_ROLE_CAPTION = ia2_mod.IA2_ROLE_CAPTION
+    IA2_ROLE_CHECK_MENU_ITEM = ia2_mod.IA2_ROLE_CHECK_MENU_ITEM
+    IA2_ROLE_COLOR_CHOOSER = ia2_mod.IA2_ROLE_COLOR_CHOOSER
+    IA2_ROLE_DATE_EDITOR = ia2_mod.IA2_ROLE_DATE_EDITOR
+    IA2_ROLE_DESKTOP_ICON = ia2_mod.IA2_ROLE_DESKTOP_ICON
+    IA2_ROLE_DESKTOP_PANE = ia2_mod.IA2_ROLE_DESKTOP_PANE
+    IA2_ROLE_DIRECTORY_PANE = ia2_mod.IA2_ROLE_DIRECTORY_PANE
+    IA2_ROLE_EDITBAR = ia2_mod.IA2_ROLE_EDITBAR
+    IA2_ROLE_EMBEDDED_OBJECT = ia2_mod.IA2_ROLE_EMBEDDED_OBJECT
+    IA2_ROLE_ENDNOTE = ia2_mod.IA2_ROLE_ENDNOTE
+    IA2_ROLE_FILE_CHOOSER = ia2_mod.IA2_ROLE_FILE_CHOOSER
+    IA2_ROLE_FONT_CHOOSER = ia2_mod.IA2_ROLE_FONT_CHOOSER
+    IA2_ROLE_FOOTER = ia2_mod.IA2_ROLE_FOOTER
+    IA2_ROLE_FOOTNOTE = ia2_mod.IA2_ROLE_FOOTNOTE
+    IA2_ROLE_FORM = ia2_mod.IA2_ROLE_FORM
+    IA2_ROLE_FRAME = ia2_mod.IA2_ROLE_FRAME
+    IA2_ROLE_GLASS_PANE = ia2_mod.IA2_ROLE_GLASS_PANE
+    IA2_ROLE_HEADER = ia2_mod.IA2_ROLE_HEADER
+    IA2_ROLE_HEADING = ia2_mod.IA2_ROLE_HEADING
+    IA2_ROLE_ICON = ia2_mod.IA2_ROLE_ICON
+    IA2_ROLE_IMAGE_MAP = ia2_mod.IA2_ROLE_IMAGE_MAP
+    IA2_ROLE_INPUT_METHOD_WINDOW = ia2_mod.IA2_ROLE_INPUT_METHOD_WINDOW
+    IA2_ROLE_INTERNAL_FRAME = ia2_mod.IA2_ROLE_INTERNAL_FRAME
+    IA2_ROLE_LABEL = ia2_mod.IA2_ROLE_LABEL
+    IA2_ROLE_LAYERED_PANE = ia2_mod.IA2_ROLE_LAYERED_PANE
+    IA2_ROLE_NOTE = ia2_mod.IA2_ROLE_NOTE
+    IA2_ROLE_OPTION_PANE = ia2_mod.IA2_ROLE_OPTION_PANE
+    IA2_ROLE_PAGE = ia2_mod.IA2_ROLE_PAGE
+    IA2_ROLE_PARAGRAPH = ia2_mod.IA2_ROLE_PARAGRAPH
+    IA2_ROLE_RADIO_MENU_ITEM = ia2_mod.IA2_ROLE_RADIO_MENU_ITEM
+    IA2_ROLE_REDUNDANT_OBJECT = ia2_mod.IA2_ROLE_REDUNDANT_OBJECT
+    IA2_ROLE_ROOT_PANE = ia2_mod.IA2_ROLE_ROOT_PANE
+    IA2_ROLE_RULER = ia2_mod.IA2_ROLE_RULER
+    IA2_ROLE_SCROLL_PANE = ia2_mod.IA2_ROLE_SCROLL_PANE
+    IA2_ROLE_SECTION = ia2_mod.IA2_ROLE_SECTION
+    IA2_ROLE_SHAPE = ia2_mod.IA2_ROLE_SHAPE
+    IA2_ROLE_SPLIT_PANE = ia2_mod.IA2_ROLE_SPLIT_PANE
+    IA2_ROLE_TEAR_OFF_MENU = ia2_mod.IA2_ROLE_TEAR_OFF_MENU
+    IA2_ROLE_TERMINAL = ia2_mod.IA2_ROLE_TERMINAL
+    IA2_ROLE_TEXT_FRAME = ia2_mod.IA2_ROLE_TEXT_FRAME
+    IA2_ROLE_TOGGLE_BUTTON = ia2_mod.IA2_ROLE_TOGGLE_BUTTON
+    IA2_ROLE_UNKNOWN = ia2_mod.IA2_ROLE_UNKNOWN
+    IA2_ROLE_VIEW_PORT = ia2_mod.IA2_ROLE_VIEW_PORT
+    IA2_ROLE_COMPLEMENTARY_CONTENT = ia2_mod.IA2_ROLE_COMPLEMENTARY_CONTENT
+    IA2_ROLE_LANDMARK = ia2_mod.IA2_ROLE_LANDMARK
+    IA2_ROLE_LEVEL_BAR = ia2_mod.IA2_ROLE_LEVEL_BAR
+    IA2_ROLE_CONTENT_DELETION = ia2_mod.IA2_ROLE_CONTENT_DELETION
+    IA2_ROLE_CONTENT_INSERTION = ia2_mod.IA2_ROLE_CONTENT_INSERTION
+    IA2_ROLE_BLOCK_QUOTE = ia2_mod.IA2_ROLE_BLOCK_QUOTE
+    IA2_ROLE_MARK = ia2_mod.IA2_ROLE_MARK
+    IA2_ROLE_SUGGESTION = ia2_mod.IA2_ROLE_SUGGESTION
+    IA2_ROLE_COMMENT = ia2_mod.IA2_ROLE_COMMENT
+
+
+class MsaaState(enum.IntFlag):
+    STATE_SYSTEM_UNAVAILABLE = 0x00000001
+    STATE_SYSTEM_SELECTED = 0x00000002
+    STATE_SYSTEM_FOCUSED = 0x00000004
+    STATE_SYSTEM_PRESSED = 0x00000008
+    STATE_SYSTEM_CHECKED = 0x00000010
+    STATE_SYSTEM_MIXED = 0x00000020
+    STATE_SYSTEM_READONLY = 0x00000040
+    STATE_SYSTEM_HOTTRACKED = 0x00000080
+    STATE_SYSTEM_DEFAULT = 0x00000100
+    STATE_SYSTEM_EXPANDED = 0x00000200
+    STATE_SYSTEM_COLLAPSED = 0x00000400
+    STATE_SYSTEM_BUSY = 0x00000800
+    STATE_SYSTEM_FLOATING = 0x00001000
+    STATE_SYSTEM_MARQUEED = 0x00002000
+    STATE_SYSTEM_ANIMATED = 0x00004000
+    STATE_SYSTEM_INVISIBLE = 0x00008000
+    STATE_SYSTEM_OFFSCREEN = 0x00010000
+    STATE_SYSTEM_SIZEABLE = 0x00020000
+    STATE_SYSTEM_MOVEABLE = 0x00040000
+    STATE_SYSTEM_SELFVOICING = 0x00080000
+    STATE_SYSTEM_FOCUSABLE = 0x00100000
+    STATE_SYSTEM_SELECTABLE = 0x00200000
+    STATE_SYSTEM_LINKED = 0x00400000
+    STATE_SYSTEM_TRAVERSED = 0x00800000
+    STATE_SYSTEM_MULTISELECTABLE = 0x01000000
+    STATE_SYSTEM_EXTSELECTABLE = 0x02000000
+    STATE_SYSTEM_ALERT_LOW = 0x04000000
+    STATE_SYSTEM_ALERT_MEDIUM = 0x08000000
+    STATE_SYSTEM_ALERT_HIGH = 0x10000000
+    STATE_SYSTEM_PROTECTED = 0x20000000
+    STATE_SYSTEM_HASPOPUP = 0x40000000
+
+
+class Ia2State(enum.IntFlag):
+    IA2_STATE_ACTIVE = ia2_mod.IA2_STATE_ACTIVE
+    IA2_STATE_ARMED = ia2_mod.IA2_STATE_ARMED
+    IA2_STATE_CHECKABLE = ia2_mod.IA2_STATE_CHECKABLE
+    IA2_STATE_DEFUNCT = ia2_mod.IA2_STATE_DEFUNCT
+    IA2_STATE_EDITABLE = ia2_mod.IA2_STATE_EDITABLE
+    IA2_STATE_HORIZONTAL = ia2_mod.IA2_STATE_HORIZONTAL
+    IA2_STATE_ICONIFIED = ia2_mod.IA2_STATE_ICONIFIED
+    IA2_STATE_INVALID_ENTRY = ia2_mod.IA2_STATE_INVALID_ENTRY
+    IA2_STATE_MANAGES_DESCENDANTS = ia2_mod.IA2_STATE_MANAGES_DESCENDANTS
+    IA2_STATE_MODAL = ia2_mod.IA2_STATE_MODAL
+    IA2_STATE_MULTI_LINE = ia2_mod.IA2_STATE_MULTI_LINE
+    IA2_STATE_OPAQUE = ia2_mod.IA2_STATE_OPAQUE
+    IA2_STATE_PINNED = ia2_mod.IA2_STATE_PINNED
+    IA2_STATE_REQUIRED = ia2_mod.IA2_STATE_REQUIRED
+    IA2_STATE_SELECTABLE_TEXT = ia2_mod.IA2_STATE_SELECTABLE_TEXT
+    IA2_STATE_SINGLE_LINE = ia2_mod.IA2_STATE_SINGLE_LINE
+    IA2_STATE_STALE = ia2_mod.IA2_STATE_STALE
+    IA2_STATE_SUPPORTS_AUTOCOMPLETION = ia2_mod.IA2_STATE_SUPPORTS_AUTOCOMPLETION
+    IA2_STATE_TRANSIENT = ia2_mod.IA2_STATE_TRANSIENT
+    IA2_STATE_VERTICAL = ia2_mod.IA2_STATE_VERTICAL
+
+
+def msaa_state_list_to_string(states):
+    state_strings = []
+    for state in MsaaState:
+        if states & state:
+            state_strings.append(state.name.replace("STATE_SYSTEM_", ""))
+    return state_strings
+
+def state_list_to_string(states):
+    state_strings = []
+    for state in Ia2State:
+        if states & state:
+            state_strings.append(state.name.replace("IA2_STATE_", ""))
+    return state_strings
diff --git a/wai-aria-aam/support/ia2/ia2_api_all.tlb b/wai-aria-aam/support/ia2/ia2_api_all.tlb
new file mode 100644
index 0000000000000000000000000000000000000000..449c10b258dd7bcab244cd7279af1886da146da9
GIT binary patch
literal 29016
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%0DP@Pz0KN=
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
BD0Tn<

literal 0
HcmV?d00001

diff --git a/wai-aria-aam/support/ia2_wrapper.py b/wai-aria-aam/support/ia2_wrapper.py
new file mode 100644
index 00000000000000..087552d688b7a8
--- /dev/null
+++ b/wai-aria-aam/support/ia2_wrapper.py
@@ -0,0 +1,165 @@
+from __future__ import annotations
+
+import time
+from typing import Any, List, Optional
+
+import ctypes
+from ctypes import POINTER, byref
+from ctypes.wintypes import BOOL, HWND, LPARAM
+
+# Type aliases for COM interface pointers.
+# These are dynamically generated by comtypes at runtime.
+IAccessiblePtr = Any
+IAccessible2Ptr = Any
+
+import comtypes.client
+from comtypes import IServiceProvider
+
+from ..platformaccessibility.ia2.constants import (  # type: ignore[attr-defined]
+    IAccessible2_2,
+    Role,
+    msaa_state_list_to_string,
+    state_list_to_string,
+)
+
+CHILDID_SELF = 0
+OBJID_CLIENT = -4
+
+user32 = ctypes.windll.user32  # type: ignore
+oleacc = ctypes.oledll.oleacc  # type: ignore
+oleacc_mod = comtypes.client.GetModule("oleacc.dll")
+IAccessible = oleacc_mod.IAccessible  # noqa: N816
+
+def accessible_object_from_window(hwnd: HWND) -> IAccessiblePtr:
+    p = POINTER(IAccessible)()
+    oleacc.AccessibleObjectFromWindow(
+        hwnd, OBJID_CLIENT, byref(IAccessible._iid_), byref(p)
+    )
+    return p
+
+
+def name_from_hwnd(hwnd: HWND) -> str:
+    MAX_CHARS = 257
+    buffer = ctypes.create_unicode_buffer(MAX_CHARS)
+    user32.GetWindowTextW(hwnd, buffer, MAX_CHARS)
+    return buffer.value
+
+
+def get_browser_hwnd(product_name: str) -> HWND:
+    found: List[HWND] = []
+
+    @ctypes.WINFUNCTYPE(BOOL, HWND, LPARAM)  # type: ignore[attr-defined, misc]
+    def check_window_name(hwnd: HWND, lParam: LPARAM) -> bool:  # noqa: N803
+        window_name = name_from_hwnd(hwnd)
+        if product_name not in window_name.lower():
+            # EnumWindows should continue enumerating
+            return True
+        found.append(hwnd)
+        # EnumWindows should stop enumerating (since we found the right window)
+        return False
+
+    user32.EnumWindows(check_window_name, LPARAM(0))
+    if not found:
+        raise LookupError(f"Couldn't find {product_name} HWND")
+    return found[0]
+
+
+def to_ia2(node: IAccessiblePtr) -> IAccessible2Ptr:
+    service = node.QueryInterface(IServiceProvider)
+    return service.QueryService(IAccessible._iid_, IAccessible2_2)
+
+
+def find_browser(product_name: str) -> IAccessible2Ptr:
+    hwnd = get_browser_hwnd(product_name)
+    root = accessible_object_from_window(hwnd)
+    return to_ia2(root)
+
+
+def poll_for_tab(url: str, root: IAccessible2Ptr, timeout: float) -> IAccessible2Ptr:
+    tab = find_tab(url, root)
+    stop = time.time() + timeout
+    while not tab:
+        if time.time() > stop:
+            raise TimeoutError(f"Timeout looking for url: {url}")
+        time.sleep(0.01)
+        tab = find_tab(url, root)
+    return tab
+
+
+def find_tab(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
+    targets, count = root.relationTargetsOfType("embeds", 1)
+    if count >= 1:
+        ia2 = to_ia2(targets[0])
+        if ia2.accValue(CHILDID_SELF) == url:
+            return ia2
+
+    return find_tab_by_searching_tree(url, root)
+
+
+def find_tab_by_searching_tree(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
+    for i in range(1, root.accChildCount + 1):
+        child = to_ia2(root.accChild(i))
+        if child.accRole(CHILDID_SELF) == Role.ROLE_SYSTEM_DOCUMENT:
+            if child.accValue(CHILDID_SELF) == url:
+                return child
+            # No need to search within documents.
+            return None
+        descendant = find_tab_by_searching_tree(url, child)
+        if descendant:
+            return descendant
+    return None
+
+
+def find_ia2_node(root: IAccessible2Ptr, dom_id: str) -> Optional[IAccessible2Ptr]:
+    id_attribute = f"id:{dom_id};"
+    for i in range(1, root.accChildCount + 1):
+        child = to_ia2(root.accChild(i))
+        if child.attributes and id_attribute in child.attributes:
+            return child
+        descendant = find_ia2_node(child, dom_id)
+        if descendant:
+            return descendant
+    return None
+
+
+class Ia2Wrapper:
+    def __init__(self, pid: int, product_name: str, timeout: float) -> None:
+        """Setup for accessibility API testing.
+
+        :pid: The PID of the process which exposes the accessibility API.
+        :product_name: The name of the browser, used to find the browser in the accessibility API.
+        :timeout: The timeout the test harness has set for this test, local timeouts can be set based on it.
+        """
+        self.product_name: str = product_name
+        self.pid: int = pid
+        self.test_url: Optional[str] = None
+        self.timeout: float = timeout
+
+        self.root: Optional[IAccessible2Ptr] = find_browser(self.product_name)
+        if not self.root:
+            raise Exception(f"Couldn't find browser {self.product_name}.")
+
+    def find_node(self, dom_id: str, url: str) -> IAccessible2Ptr:
+        """
+        :param dom_id: The dom id of the node to test.
+        :param url: The url of the test.
+        """
+
+        tab = poll_for_tab(url, self.root)
+        node = find_ia2_node(tab, dom_id)
+        if not node:
+            raise Exception(f"Couldn't find node with ID {dom_id}.")
+
+        return node
+
+    def get_role(self, node: IAccessible2Ptr) -> str:
+        return Role(node.role()).name
+
+    def get_msaa_role(self, node: IAccessible2Ptr) -> str:
+        return Role(node.accRole(CHILDID_SELF)).name
+
+    def get_state_list(self, node: IAccessible2Ptr) -> str:
+        return state_list_to_string(node.states)
+
+    def get_msaa_state_list(self, node: IAccessible2Ptr) -> str:
+        return msaa_state_list_to_string(node.accState(CHILDID_SELF))

From a45d66b5838de72fd9e25983a148ca4cfd500f3b Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 17 Feb 2026 14:24:13 -0800
Subject: [PATCH 02/14] Fix mac tests

---
 wai-aria-aam/role/blockquote_tentative.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/wai-aria-aam/role/blockquote_tentative.py b/wai-aria-aam/role/blockquote_tentative.py
index 7b3b2706bde215..cd12106f2e36a6 100644
--- a/wai-aria-aam/role/blockquote_tentative.py
+++ b/wai-aria-aam/role/blockquote_tentative.py
@@ -10,6 +10,7 @@ def test_atspi(atspi, session, inline):
     node = atspi.find_node("test", session.url)
     assert atspi.Accessible.get_role_name(node) == "block quote"
 
+
 def test_axapi(axapi, session, inline):
     if not axapi:
         return
@@ -17,10 +18,11 @@ def test_axapi(axapi, session, inline):
     session.url = inline(TEST_HTML)
 
     node = axapi.find_node("test", session.url)
-    role = axapi.AXUIElementCopyAttributeValue(node, "AXRole", None)
+    role = axapi.AXUIElementCopyAttributeValue(node, "AXRole", None)[1]
     assert role == "AXGroup"
-    role = axapi.AXUIElementCopyAttributeValue(node, "AXSubrole", None)
-    assert role == ""
+    role = axapi.AXUIElementCopyAttributeValue(node, "AXSubrole", None)[1]
+    assert role == None
+
 
 def test_ia2(ia2, session, inline):
     if not ia2:
@@ -32,6 +34,7 @@ def test_ia2(ia2, session, inline):
     assert ia2.get_role(node) == "IA2_ROLE_BLOCK_QUOTE"
     assert ia2.get_msaa_role(node) == "ROLE_SYSTEM_GROUPING"
 
+
 def test_uia(uia, session, inline):
     if not uia:
         return

From 389751ba7ab52d8a5ca1f25f8828569f34d1aecc Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 18 Feb 2026 15:15:53 -0800
Subject: [PATCH 03/14] Fix windows

---
 wai-aria-aam/support/ia2/__init__.py | 0
 wai-aria-aam/support/ia2_wrapper.py  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 wai-aria-aam/support/ia2/__init__.py

diff --git a/wai-aria-aam/support/ia2/__init__.py b/wai-aria-aam/support/ia2/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/wai-aria-aam/support/ia2_wrapper.py b/wai-aria-aam/support/ia2_wrapper.py
index 087552d688b7a8..985809dc03935a 100644
--- a/wai-aria-aam/support/ia2_wrapper.py
+++ b/wai-aria-aam/support/ia2_wrapper.py
@@ -15,7 +15,7 @@
 import comtypes.client
 from comtypes import IServiceProvider
 
-from ..platformaccessibility.ia2.constants import (  # type: ignore[attr-defined]
+from .ia2.constants import (  # type: ignore[attr-defined]
     IAccessible2_2,
     Role,
     msaa_state_list_to_string,
@@ -146,7 +146,7 @@ def find_node(self, dom_id: str, url: str) -> IAccessible2Ptr:
         """
 
         tab = poll_for_tab(url, self.root)
-        node = find_ia2_node(tab, dom_id)
+        node = find_ia2_node(tab, dom_id, self.timeout)
         if not node:
             raise Exception(f"Couldn't find node with ID {dom_id}.")
 

From 94cf02c09bfdf345c5e876d7a7d9d0e9bd0ac991 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 18 Feb 2026 16:56:58 -0800
Subject: [PATCH 04/14] Refactor atspi_wrapper and fix flake

---
 wai-aria-aam/support/atspi_wrapper.py | 294 ++++++++++++--------------
 1 file changed, 132 insertions(+), 162 deletions(-)

diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
index abbdb9aca1d6c3..a734df051167dc 100644
--- a/wai-aria-aam/support/atspi_wrapper.py
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import time
-from typing import Optional, List, Dict
+from typing import Any, Callable, Optional, List, Dict
 import warnings
 
 import gi
@@ -9,138 +9,6 @@
 gi.require_version("Atspi", "2.0")
 from gi.repository import Atspi
 
-def poll_for_tab(root: Atspi.Accessible, product: str, url: str, timeout: float) -> Atspi.Accessible:
-    """Poll until the tab with the test url is loaded and available in the
-       accessibility API. Assumes wptrunner has already started a browser
-       process and navigated to the test page.
-
-    :param root: The node in the accessibility API representing the browser process.
-    :param product: The name of the browser.
-    :param url: The url of the test.
-    :param timeout: How long to look for the tab, in seconds.
-    :return: Atspi.Accessible representing test document.
-    """
-
-    tab = find_tab(root, product, url)
-    stop = time.time() + timeout
-    while not tab:
-        if time.time() > stop:
-            raise TimeoutError(f"Timeout looking for url: {url}")
-        time.sleep(0.01)
-        tab = find_tab(root, product, url)
-
-    return tab
-
-
-def find_tab(
-    root: Atspi.Accessible, product: str, url: str
-) -> Optional[Atspi.Accessible]:
-    """Find the tab with the test url.
-
-    :param root: The node in the accessibility API representing the browser process.
-    :param product: The name of the browser.
-    :param url: The url of the test.
-    :return: Atspi.Accessible representing test document or None.
-    """
-
-    stack = [root]
-    while stack:
-        node = stack.pop()
-        if Atspi.Accessible.get_role_name(node) == "frame":
-            relationset = Atspi.Accessible.get_relation_set(node)
-            for relation in relationset:
-                if relation.get_relation_type() == Atspi.RelationType.EMBEDS:
-                    tab = relation.get_target(0)
-                    if is_ready(tab, product, url):
-                        return tab
-                    else:
-                        return None
-            continue
-
-        for i in range(Atspi.Accessible.get_child_count(node)):
-            child = Atspi.Accessible.get_child_at_index(node, i)
-            stack.append(child)
-
-    return None
-
-
-def is_ready(tab: Atspi.Accessible, product: str, url: str) -> bool:
-    """Test whether tab is fully loaded.
-
-    :param tab: Atspi.Accessible representing test document.
-    :param product: The name of the browser.
-    :param url: The url of the test.
-    :return: Boolean.
-    """
-
-    # Firefox uses the "BUSY" state to indicate the page is not ready.
-    if product == "firefox":
-        state_set = Atspi.Accessible.get_state_set(tab)
-        return not Atspi.StateSet.contains(state_set, Atspi.StateType.BUSY)
-
-    # Chromium family browsers do not use "BUSY", but you can
-    # tell if the document can be queried by URL attribute. If the 'URI'
-    # attribute is not here, we need to query for a new accessible object.
-    document = Atspi.Accessible.get_document_iface(tab)
-    document_attributes = Atspi.Document.get_document_attributes(document)
-
-    return "URI" in document_attributes and document_attributes["URI"] == url
-
-
-def find_browser(pid: int) -> Optional[Atspi.Accessible]:
-    """Find the Atspi.Accessible representing the browser.
-
-    :param pid: The PID of the browser.
-    :return: Atspi.Accessible or None.
-    """
-
-    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)
-        if pid == Atspi.Accessible.get_process_id(app):
-            return app
-    return None
-
-
-def find_browser_by_name(name: str) -> Optional[Atspi.Accessible]:
-    """Find the Atspi.Accessible representing the browser.
-
-    :param name: The name of the browser.
-    :return: Atspi.Accessible or None.
-    """
-
-    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
-    return None
-
-
-def find_node(root: Atspi.Accessible, dom_id: str) -> Optional[Atspi.Accessible]:
-    """Find the Atspi.Accessible with a specified dom_id.
-
-    :dom_id: The dom ID.
-    :return: TestNode or None if not found.
-    """
-
-    stack = [root]
-    while stack:
-        node = stack.pop()
-
-        attributes = Atspi.Accessible.get_attributes(node)
-        if "id" in attributes and attributes["id"] == dom_id:
-            return node
-
-        for i in range(Atspi.Accessible.get_child_count(node)):
-            child = Atspi.Accessible.get_child_at_index(node, i)
-            stack.append(child)
-
-    return None
-
 
 class AtspiWrapper:
     def __init__(self, pid: int, product_name: str, timeout: float) -> None:
@@ -158,53 +26,42 @@ def __init__(self, pid: int, product_name: str, timeout: float) -> None:
         self.timeout: float = timeout
 
         if self.pid and self.pid != 0:
-            self.root = find_browser(self.pid)
+            self.root = self._find_browser_by_pid(self.pid)
         else:
-            self.root = find_browser_by_name(self.product_name)
+            self.root = self._find_browser_by_name(self.product_name)
 
         if not self.root:
-            warnings.warn(
-                f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Accessibility API queries will not succeed."
+            raise Exception(
+                f"Couldn't find browser {self.product_name} in accessibility API ATSPI."
             )
 
-
     @property
     def Accessible(self):
         return Atspi.Accessible
 
-    def _poll_for_tab_if_necessary(self, url: str) -> None:
-        """If accessible node representing the test document for this URL has
-           not been found, find it and set self.document.
-
-        :param url: The url of the test.
-        """
-        if not self.root:
-            raise Exception(
-                f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Did you turn on accessibility?"
-            )
-
-        if self.test_url != url or not self.document:
-            self.test_url = url
-            self.document = poll_for_tab(self.root, self.product_name, url, self.timeout)
-
-
     def find_node(self, dom_id: str, url: str) -> Atspi.Accessible:
         """
         :param dom_id: The dom id of the node to test.
         :param url: The url of the test.
         """
-        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."
+        if self.test_url != url or not self.document:
+            self.test_url = url
+            self.document = self._poll_for(
+                self._find_fully_loaded_tab, f"Timeout looking for url: {self.test_url}"
             )
 
-        return test_node
+        # Polling for the node with ID because in Firefox the node's
+        # id attribute may be set after the tab is ready, leading to flakes.
+        test_node = self._poll_for(
+            lambda: self._find_node_by_id(self.document, dom_id),
+            f"Timout looking for node with id {dom_id} in accessibility API ATSPI.",
+        )
 
+        return test_node
 
-    def get_relations_dictionary_helper(self, node: Atspi.Accessible) -> Dict[str, List[str]]:
+    def get_relations_dictionary_helper(
+        self, node: Atspi.Accessible
+    ) -> Dict[str, List[str]]:
         """
         :returns: A dictionary with relations as keys and the values, DOM ids.
         """
@@ -234,3 +91,116 @@ def get_state_list_helper(self, node: Atspi.Accessible) -> List[str]:
         for state in state_list:
             state_string_list.append(state.value_name.removeprefix("ATSPI_"))
         return state_string_list
+
+    def _find_browser_by_pid(self, pid: int) -> Optional[Atspi.Accessible]:
+        """Find the Atspi.Accessible representing the browser.
+
+        :param pid: The PID of the browser.
+        :return: Atspi.Accessible or None.
+        """
+        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)
+            if pid == Atspi.Accessible.get_process_id(app):
+                return app
+        return None
+
+    def _find_browser_by_name(self, name: str) -> Optional[Atspi.Accessible]:
+        """Find the Atspi.Accessible representing the browser.
+
+        :param name: The name of the browser.
+        :return: Atspi.Accessible or None.
+        """
+        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
+        return None
+
+    def _poll_for(self, find: Callable[[], Any], error: str) -> Atspi.Accessible:
+        """Poll until the `find` function returns something.
+
+        :param url: The url of the test.
+        :return: Atspi.Accessible representing test document.
+        """
+        found = find()
+        stop = time.time() + self.timeout
+        while not found:
+            if time.time() > stop:
+                raise TimeoutError(error)
+            time.sleep(0.01)
+            found = find()
+
+        return found
+
+    def _find_fully_loaded_tab(self) -> Optional[Atspi.Accessible]:
+        """Find the tab with the test url. Only returns the tab when the tab is ready.
+
+        :param url: The url of the test.
+        :return: Atspi.Accessible representing test document or None.
+        """
+        stack = [self.root]
+        while stack:
+            node = stack.pop()
+            if Atspi.Accessible.get_role_name(node) == "frame":
+                relationset = Atspi.Accessible.get_relation_set(node)
+                for relation in relationset:
+                    if relation.get_relation_type() == Atspi.RelationType.EMBEDS:
+                        tab = relation.get_target(0)
+                        if self._is_ready(tab, self.test_url):
+                            return tab
+                        else:
+                            return None
+                continue
+
+            for i in range(Atspi.Accessible.get_child_count(node)):
+                child = Atspi.Accessible.get_child_at_index(node, i)
+                stack.append(child)
+
+        return None
+
+    def _is_ready(self, tab: Atspi.Accessible, url: str) -> bool:
+        """Test whether tab is fully loaded.
+
+        :param tab: Atspi.Accessible representing test document.
+        :param url: The url of the test.
+        :return: Boolean.
+        """
+        # Firefox uses the "BUSY" state to indicate the page is not ready.
+        if self.product_name == "firefox":
+            state_set = Atspi.Accessible.get_state_set(tab)
+            return not Atspi.StateSet.contains(state_set, Atspi.StateType.BUSY)
+
+        # Chromium family browsers do not use "BUSY", but you can
+        # tell if the document can be queried by URL attribute. If the 'URI'
+        # attribute is not here, we need to query for a new accessible object.
+        document = Atspi.Accessible.get_document_iface(tab)
+        document_attributes = Atspi.Document.get_document_attributes(document)
+
+        return "URI" in document_attributes and document_attributes["URI"] == url
+
+    def _find_node_by_id(
+        self, root: Atspi.Accessible, dom_id: str
+    ) -> Optional[Atspi.Accessible]:
+        """Find the Atspi.Accessible with a specified dom_id.
+
+        :param root: The root node to search from.
+        :param dom_id: The dom ID.
+        :return: Atspi.Accessible or None if not found.
+        """
+        stack = [root]
+        while stack:
+            node = stack.pop()
+            attributes = Atspi.Accessible.get_attributes(node)
+            if "id" in attributes and attributes["id"] == dom_id:
+                return node
+
+            for i in range(Atspi.Accessible.get_child_count(node)):
+                child = Atspi.Accessible.get_child_at_index(node, i)
+                stack.append(child)
+
+        return None

From 8765a3a3fd90a722ad806742fa94c7fc94cdcbf9 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 18 Feb 2026 17:20:25 -0800
Subject: [PATCH 05/14] Refactor wrappers, formatting

---
 wai-aria-aam/support/api_wrapper.py       |  44 ++++++
 wai-aria-aam/support/atspi_wrapper.py     |  62 ++------
 wai-aria-aam/support/axapi_wrapper.py     | 181 +++++++++++-----------
 wai-aria-aam/support/fixtures_a11y_api.py |  15 +-
 wai-aria-aam/support/ia2/constants.py     |   2 +
 wai-aria-aam/support/ia2_wrapper.py       | 152 +++++++++---------
 6 files changed, 237 insertions(+), 219 deletions(-)
 create mode 100644 wai-aria-aam/support/api_wrapper.py

diff --git a/wai-aria-aam/support/api_wrapper.py b/wai-aria-aam/support/api_wrapper.py
new file mode 100644
index 00000000000000..4650828b8ed1e1
--- /dev/null
+++ b/wai-aria-aam/support/api_wrapper.py
@@ -0,0 +1,44 @@
+import time
+from typing import Any, Callable, Optional
+
+
+class ApiWrapper:
+    def __init__(self, pid: int, product_name: str, timeout: float) -> None:
+        """Setup for accessibility API testing.
+
+        :pid: The PID of the process which exposes the accessibility API.
+        :product_name: The name of the browser, used to find the browser in the accessibility API.
+        :timeout: The timeout the test harness has set for this test, local timeouts can be set based on it.
+        """
+        self.product_name: str = product_name
+        self.pid: int = pid
+        self.root: Optional[Any] = None
+        self.document: Optional[Any] = None
+        self.test_url: Optional[str] = None
+        self.timeout: float = timeout
+
+        self.root = self._find_browser()
+
+        if not self.root:
+            raise Exception(
+                f"Couldn't find browser {self.product_name} in accessibility API {self.ApiName}."
+            )
+
+    def _find_browser(self) -> Any:
+        pass
+
+    def _poll_for(self, find: Callable[[], Any], error: str) -> Any:
+        """Poll until the `find` function returns something.
+
+        :param url: The url of the test.
+        :return: Whatever find returns.
+        """
+        found = find()
+        stop = time.time() + self.timeout
+        while not found:
+            if time.time() > stop:
+                raise TimeoutError(error)
+            time.sleep(0.01)
+            found = find()
+
+        return found
diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
index a734df051167dc..14d092de4c7f7b 100644
--- a/wai-aria-aam/support/atspi_wrapper.py
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -1,39 +1,19 @@
 from __future__ import annotations
-
-import time
-from typing import Any, Callable, Optional, List, Dict
-import warnings
+from typing import Optional, List, Dict
 
 import gi
 
 gi.require_version("Atspi", "2.0")
 from gi.repository import Atspi
 
+from .api_wrapper import ApiWrapper
 
-class AtspiWrapper:
-    def __init__(self, pid: int, product_name: str, timeout: float) -> None:
-        """Setup for accessibility API testing.
 
-        :pid: The PID of the process which exposes the accessibility API.
-        :product_name: The name of the browser, used to find the browser in the accessibility API.
-        :timeout: The timeout the test harness has set for this test, local timeouts can be set based on it.
-        """
-        self.product_name: str = product_name
-        self.pid: int = pid
-        self.root: Optional[Atspi.Accessible] = None
-        self.document: Optional[Atspi.Accessible] = None
-        self.test_url: Optional[str] = None
-        self.timeout: float = timeout
+class AtspiWrapper(ApiWrapper):
 
-        if self.pid and self.pid != 0:
-            self.root = self._find_browser_by_pid(self.pid)
-        else:
-            self.root = self._find_browser_by_name(self.product_name)
-
-        if not self.root:
-            raise Exception(
-                f"Couldn't find browser {self.product_name} in accessibility API ATSPI."
-            )
+    @property
+    def ApiName(self):
+        return "ATSPI"
 
     @property
     def Accessible(self):
@@ -92,7 +72,13 @@ def get_state_list_helper(self, node: Atspi.Accessible) -> List[str]:
             state_string_list.append(state.value_name.removeprefix("ATSPI_"))
         return state_string_list
 
-    def _find_browser_by_pid(self, pid: int) -> Optional[Atspi.Accessible]:
+    def _find_browser(self):
+        if self.pid and self.pid != 0:
+            return self._find_browser_by_pid()
+        else:
+            return self._find_browser_by_name()
+
+    def _find_browser_by_pid(self) -> Optional[Atspi.Accessible]:
         """Find the Atspi.Accessible representing the browser.
 
         :param pid: The PID of the browser.
@@ -102,11 +88,11 @@ def _find_browser_by_pid(self, pid: int) -> Optional[Atspi.Accessible]:
         child_count = Atspi.Accessible.get_child_count(desktop)
         for i in range(child_count):
             app = Atspi.Accessible.get_child_at_index(desktop, i)
-            if pid == Atspi.Accessible.get_process_id(app):
+            if self.pid == Atspi.Accessible.get_process_id(app):
                 return app
         return None
 
-    def _find_browser_by_name(self, name: str) -> Optional[Atspi.Accessible]:
+    def _find_browser_by_name(self) -> Optional[Atspi.Accessible]:
         """Find the Atspi.Accessible representing the browser.
 
         :param name: The name of the browser.
@@ -117,26 +103,10 @@ def _find_browser_by_name(self, name: str) -> Optional[Atspi.Accessible]:
         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():
+            if self.product_name in full_app_name.lower():
                 return app
         return None
 
-    def _poll_for(self, find: Callable[[], Any], error: str) -> Atspi.Accessible:
-        """Poll until the `find` function returns something.
-
-        :param url: The url of the test.
-        :return: Atspi.Accessible representing test document.
-        """
-        found = find()
-        stop = time.time() + self.timeout
-        while not found:
-            if time.time() > stop:
-                raise TimeoutError(error)
-            time.sleep(0.01)
-            found = find()
-
-        return found
-
     def _find_fully_loaded_tab(self) -> Optional[Atspi.Accessible]:
         """Find the tab with the test url. Only returns the tab when the tab is ready.
 
diff --git a/wai-aria-aam/support/axapi_wrapper.py b/wai-aria-aam/support/axapi_wrapper.py
index 2748741a42d4c8..e69eb68ace7400 100644
--- a/wai-aria-aam/support/axapi_wrapper.py
+++ b/wai-aria-aam/support/axapi_wrapper.py
@@ -1,6 +1,6 @@
-from typing import Optional, Any
+from __future__ import annotations
 
-import warnings
+from typing import Any, Optional
 
 from ApplicationServices import (
     AXUIElementCopyAttributeNames,
@@ -14,115 +14,108 @@
     NSWorkspace,
 )
 
-def find_browser(name: str) -> Optional[Any]:
-    """Find the AXUIElement representing the browser.
-
-    :param name: The name of the browser.
-    :return: AXUIElement or None.
-    """
-
-    ws = NSWorkspace.sharedWorkspace()
-    regular_predicate = NSPredicate.predicateWithFormat_(
-        f"activationPolicy == {NSApplicationActivationPolicyRegular}"
-    )
-    running_apps = ws.runningApplications().filteredArrayUsingPredicate_(
-        regular_predicate
-    )
-    name_predicate = NSPredicate.predicateWithFormat_(
-        f"localizedName contains[c] '{name}'"
-    )
-    filtered_apps = running_apps.filteredArrayUsingPredicate_(name_predicate)
-    if filtered_apps.count() == 0:
-        return None
-    app = filtered_apps[0]
-    pid = app.processIdentifier()
-    if pid == -1:
-        return None
-    return AXUIElementCreateApplication(pid)
-
-
-def find_active_tab(browser: Any) -> Optional[Any]:
-    """Find the active tab of the browser.
+from .api_wrapper import ApiWrapper
 
-    :param browser: The name of the browser.
-    :return: AXUIElement representing test document or None.
-    """
 
-    stack = [browser]
-    while stack:
-        node = stack.pop()
+class AxapiWrapper(ApiWrapper):
 
-        err, role = AXUIElementCopyAttributeValue(node, "AXRole", None)
-        if err:
-            continue
-        if role == "AXWebArea":
-            return node
+    @property
+    def ApiName(self):
+        return "AXAPI"
 
-        err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
-        if err:
-            continue
-        stack.extend(children)
+    @property
+    def AXUIElementCopyAttributeValue(self):
+        return AXUIElementCopyAttributeValue
 
-    return None
+    def find_node(self, dom_id: str, url: str) -> Any:
+        """
+        :param dom_id: The dom id of the node to test.
+        :param url: The url of the test.
+        """
+        if self.test_url != url or not self.document:
+            self.test_url = url
+            self.document = self._poll_for(
+                self._find_tab,
+                f"Timeout looking for url: {self.test_url}",
+            )
 
+        test_node = self._poll_for(
+            lambda: self._find_node_by_id(self.document, dom_id),
+            f"Timeout looking for node with id {dom_id} in accessibility API AXAPI.",
+        )
 
-def find_node(root: Any, attribute: str, expected_value: str) -> Optional[Any]:
-    """Find the AXUIElement with a specified dom_id.
+        return test_node
 
-    :root: The root of a subtree to search.
-    :attribute: Any AXAPI attribute.
-    :param expected_value: The expected value of the attribute.
-    :return: AXUIElement or None if not found.
-    """
+    def _find_browser(self) -> Optional[Any]:
+        """Find the AXUIElement representing the browser.
 
-    stack = [root]
-    while stack:
-        node = stack.pop()
+        :return: AXUIElement or None.
+        """
+        ws = NSWorkspace.sharedWorkspace()
+        regular_predicate = NSPredicate.predicateWithFormat_(
+            f"activationPolicy == {NSApplicationActivationPolicyRegular}"
+        )
+        running_apps = ws.runningApplications().filteredArrayUsingPredicate_(
+            regular_predicate
+        )
+        name_predicate = NSPredicate.predicateWithFormat_(
+            f"localizedName contains[c] '{self.product_name}'"
+        )
+        filtered_apps = running_apps.filteredArrayUsingPredicate_(name_predicate)
+        if filtered_apps.count() == 0:
+            return None
+        app = filtered_apps[0]
+        pid = app.processIdentifier()
+        if pid == -1:
+            return None
+        return AXUIElementCreateApplication(pid)
+
+    def _find_tab(self) -> Optional[Any]:
+        """Find the active tab of the browser.
+
+        :return: AXUIElement representing test document or None.
+        """
+        stack = [self.root]
+        while stack:
+            node = stack.pop()
 
-        err, attributes = AXUIElementCopyAttributeNames(node, None)
-        if err:
-            continue
-        if attribute in attributes:
-            err, value = AXUIElementCopyAttributeValue(node, attribute, None)
+            err, role = AXUIElementCopyAttributeValue(node, "AXRole", None)
             if err:
                 continue
-            if value == expected_value:
+            if role == "AXWebArea":
                 return node
 
-        err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
-        if err:
-            continue
-        stack.extend(children)
-    return None
-
+            err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+            if err:
+                continue
+            stack.extend(children)
 
-class AxapiWrapper:
-    def __init__(self, pid: int, product_name: str, timeout: float) -> None:
+        return None
 
-        """Setup for accessibility API testing.
+    def _find_node_by_id(self, root: Any, dom_id: str) -> Optional[Any]:
+        """Find the AXUIElement with a specified dom_id.
 
-        :pid: The PID of the process which exposes the accessibility API.
-        :product_name: The name of the browser, used to find the browser in the accessibility API.
-        :timeout: The timeout the test harness has set for this test, local timeouts can be set based on it.
+        :param root: The root node to search from.
+        :param dom_id: The dom ID.
+        :return: AXUIElement or None if not found.
         """
-        self.product_name = product_name
-        self.root: Optional[Any] = find_browser(self.product_name)
-        self.timeout: float = timeout
+        stack = [root]
+        while stack:
+            node = stack.pop()
 
-        if not self.root:
-            warnings.warn(
-                f"Couldn't find browser {self.product_name} in accessibility API AX API. Accessibility API queries will not succeed."
-            )
-
-    @property
-    def AXUIElementCopyAttributeValue(self):
-        return AXUIElementCopyAttributeValue
+            err, attributes = AXUIElementCopyAttributeNames(node, None)
+            if err:
+                continue
+            if "AXDOMIdentifier" in attributes:
+                err, value = AXUIElementCopyAttributeValue(
+                    node, "AXDOMIdentifier", None
+                )
+                if not err and value == dom_id:
+                    return node
+
+            err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+            if err:
+                continue
+            stack.extend(children)
 
-    def find_node(self, dom_id: str, url: str) -> Optional[Any]:
-        tab = find_active_tab(self.root)
-        node = find_node(tab, "AXDOMIdentifier", dom_id)
-        if not node:
-            raise Exception(
-                f"Couldn't find node with ID {dom_id} in accessibility API AXAPI."
-            )
-        return node
+        return None
diff --git a/wai-aria-aam/support/fixtures_a11y_api.py b/wai-aria-aam/support/fixtures_a11y_api.py
index 2cb5cdfc64f78a..a58e42355a7fe2 100644
--- a/wai-aria-aam/support/fixtures_a11y_api.py
+++ b/wai-aria-aam/support/fixtures_a11y_api.py
@@ -1,19 +1,22 @@
 import pytest
 from sys import platform
 
+
 def pid_from(capabilities):
-    if capabilities['browserName'] == "chrome":
+    if capabilities["browserName"] == "chrome":
         return capabilities["goog:processID"], "chrome"
-    if capabilities['browserName'] == "firefox":
+    if capabilities["browserName"] == "firefox":
         return capabilities["moz:processID"], "firefox"
-    if capabilities['browserName'] == "servo":
+    if capabilities["browserName"] == "servo":
         return 0, "servo"
 
+
 @pytest.fixture
 def default_timeout(full_configuration):
-    if not full_configuration['timeout'] or full_configuration['timeout'] == 0:
+    if not full_configuration["timeout"] or full_configuration["timeout"] == 0:
         return 60
-    return full_configuration['timeout'] * .5
+    return full_configuration["timeout"] * 0.5
+
 
 @pytest.fixture
 def atspi(session, default_timeout):
@@ -25,6 +28,7 @@ def atspi(session, default_timeout):
     pid, product_name = pid_from(session.capabilities)
     return AtspiWrapper(pid, product_name, default_timeout)
 
+
 @pytest.fixture
 def axapi(session, default_timeout):
     if platform != "darwin":
@@ -35,6 +39,7 @@ def axapi(session, default_timeout):
     pid, product_name = pid_from(session.capabilities)
     return AxapiWrapper(pid, product_name, default_timeout)
 
+
 @pytest.fixture
 def uia(session):
     if platform != "win32":
diff --git a/wai-aria-aam/support/ia2/constants.py b/wai-aria-aam/support/ia2/constants.py
index 4f87122cf3983a..ef4cca981152d7 100644
--- a/wai-aria-aam/support/ia2/constants.py
+++ b/wai-aria-aam/support/ia2/constants.py
@@ -14,6 +14,7 @@
 # when this file is imported.
 globals().update((k, getattr(ia2_mod, k)) for k in ia2_mod.__all__)
 
+
 class Role(enum.IntEnum):
     # MSAA roles - constants not provided via oleacc
     ROLE_SYSTEM_TITLEBAR = 1
@@ -200,6 +201,7 @@ def msaa_state_list_to_string(states):
             state_strings.append(state.name.replace("STATE_SYSTEM_", ""))
     return state_strings
 
+
 def state_list_to_string(states):
     state_strings = []
     for state in Ia2State:
diff --git a/wai-aria-aam/support/ia2_wrapper.py b/wai-aria-aam/support/ia2_wrapper.py
index 985809dc03935a..f17cda4c9f1cfc 100644
--- a/wai-aria-aam/support/ia2_wrapper.py
+++ b/wai-aria-aam/support/ia2_wrapper.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import time
 from typing import Any, List, Optional
 
 import ctypes
@@ -15,6 +14,7 @@
 import comtypes.client
 from comtypes import IServiceProvider
 
+from .api_wrapper import ApiWrapper
 from .ia2.constants import (  # type: ignore[attr-defined]
     IAccessible2_2,
     Role,
@@ -30,6 +30,7 @@
 oleacc_mod = comtypes.client.GetModule("oleacc.dll")
 IAccessible = oleacc_mod.IAccessible  # noqa: N816
 
+
 def accessible_object_from_window(hwnd: HWND) -> IAccessiblePtr:
     p = POINTER(IAccessible)()
     oleacc.AccessibleObjectFromWindow(
@@ -69,88 +70,30 @@ def to_ia2(node: IAccessiblePtr) -> IAccessible2Ptr:
     return service.QueryService(IAccessible._iid_, IAccessible2_2)
 
 
-def find_browser(product_name: str) -> IAccessible2Ptr:
-    hwnd = get_browser_hwnd(product_name)
-    root = accessible_object_from_window(hwnd)
-    return to_ia2(root)
-
-
-def poll_for_tab(url: str, root: IAccessible2Ptr, timeout: float) -> IAccessible2Ptr:
-    tab = find_tab(url, root)
-    stop = time.time() + timeout
-    while not tab:
-        if time.time() > stop:
-            raise TimeoutError(f"Timeout looking for url: {url}")
-        time.sleep(0.01)
-        tab = find_tab(url, root)
-    return tab
-
-
-def find_tab(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
-    targets, count = root.relationTargetsOfType("embeds", 1)
-    if count >= 1:
-        ia2 = to_ia2(targets[0])
-        if ia2.accValue(CHILDID_SELF) == url:
-            return ia2
-
-    return find_tab_by_searching_tree(url, root)
+class Ia2Wrapper(ApiWrapper):
 
-
-def find_tab_by_searching_tree(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
-    for i in range(1, root.accChildCount + 1):
-        child = to_ia2(root.accChild(i))
-        if child.accRole(CHILDID_SELF) == Role.ROLE_SYSTEM_DOCUMENT:
-            if child.accValue(CHILDID_SELF) == url:
-                return child
-            # No need to search within documents.
-            return None
-        descendant = find_tab_by_searching_tree(url, child)
-        if descendant:
-            return descendant
-    return None
-
-
-def find_ia2_node(root: IAccessible2Ptr, dom_id: str) -> Optional[IAccessible2Ptr]:
-    id_attribute = f"id:{dom_id};"
-    for i in range(1, root.accChildCount + 1):
-        child = to_ia2(root.accChild(i))
-        if child.attributes and id_attribute in child.attributes:
-            return child
-        descendant = find_ia2_node(child, dom_id)
-        if descendant:
-            return descendant
-    return None
-
-
-class Ia2Wrapper:
-    def __init__(self, pid: int, product_name: str, timeout: float) -> None:
-        """Setup for accessibility API testing.
-
-        :pid: The PID of the process which exposes the accessibility API.
-        :product_name: The name of the browser, used to find the browser in the accessibility API.
-        :timeout: The timeout the test harness has set for this test, local timeouts can be set based on it.
-        """
-        self.product_name: str = product_name
-        self.pid: int = pid
-        self.test_url: Optional[str] = None
-        self.timeout: float = timeout
-
-        self.root: Optional[IAccessible2Ptr] = find_browser(self.product_name)
-        if not self.root:
-            raise Exception(f"Couldn't find browser {self.product_name}.")
+    @property
+    def ApiName(self):
+        return "IA2"
 
     def find_node(self, dom_id: str, url: str) -> IAccessible2Ptr:
         """
         :param dom_id: The dom id of the node to test.
         :param url: The url of the test.
         """
+        if self.test_url != url or not self.document:
+            self.test_url = url
+            self.document = self._poll_for(
+                self._find_tab,
+                f"Timeout looking for url: {self.test_url}",
+            )
 
-        tab = poll_for_tab(url, self.root)
-        node = find_ia2_node(tab, dom_id, self.timeout)
-        if not node:
-            raise Exception(f"Couldn't find node with ID {dom_id}.")
+        test_node = self._poll_for(
+            lambda: self._find_node_by_id(self.document, dom_id),
+            f"Timeout looking for node with id {dom_id} in accessibility API IA2.",
+        )
 
-        return node
+        return test_node
 
     def get_role(self, node: IAccessible2Ptr) -> str:
         return Role(node.role()).name
@@ -163,3 +106,64 @@ def get_state_list(self, node: IAccessible2Ptr) -> str:
 
     def get_msaa_state_list(self, node: IAccessible2Ptr) -> str:
         return msaa_state_list_to_string(node.accState(CHILDID_SELF))
+
+    def _find_browser(self) -> IAccessible2Ptr:
+        """Find the IAccessible2 node representing the browser.
+
+        :return: IAccessible2Ptr.
+        """
+        hwnd = get_browser_hwnd(self.product_name)
+        root = accessible_object_from_window(hwnd)
+        return to_ia2(root)
+
+    def _find_tab(self) -> Optional[IAccessible2Ptr]:
+        """Find the tab with the test url. Only returns the tab when the tab is ready.
+
+        :return: IAccessible2Ptr representing test document or None.
+        """
+        targets, count = self.root.relationTargetsOfType("embeds", 1)
+        if count >= 1:
+            ia2 = to_ia2(targets[0])
+            if ia2.accValue(CHILDID_SELF) == self.test_url:
+                return ia2
+
+        return self._find_tab_by_searching_tree(self.root)
+
+    def _find_tab_by_searching_tree(
+        self, root: IAccessible2Ptr
+    ) -> Optional[IAccessible2Ptr]:
+        """Find the tab by searching the accessibility tree.
+
+        :param root: The root node to search from.
+        :return: IAccessible2Ptr representing test document or None.
+        """
+        for i in range(1, root.accChildCount + 1):
+            child = to_ia2(root.accChild(i))
+            if child.accRole(CHILDID_SELF) == Role.ROLE_SYSTEM_DOCUMENT:
+                if child.accValue(CHILDID_SELF) == self.test_url:
+                    return child
+                # No need to search within documents.
+                return None
+            descendant = self._find_tab_by_searching_tree(child)
+            if descendant:
+                return descendant
+        return None
+
+    def _find_node_by_id(
+        self, root: IAccessible2Ptr, dom_id: str
+    ) -> Optional[IAccessible2Ptr]:
+        """Find the IAccessible2 node with a specified dom_id.
+
+        :param root: The root node to search from.
+        :param dom_id: The dom ID.
+        :return: IAccessible2Ptr or None if not found.
+        """
+        id_attribute = f"id:{dom_id};"
+        for i in range(1, root.accChildCount + 1):
+            child = to_ia2(root.accChild(i))
+            if child.attributes and id_attribute in child.attributes:
+                return child
+            descendant = self._find_node_by_id(child, dom_id)
+            if descendant:
+                return descendant
+        return None

From 4cf35c7c80597ae4cdc60b05ea822a8ba839d1cb Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 20 Feb 2026 09:37:43 -0800
Subject: [PATCH 06/14] Enable firefox caching and don't poll for id

---
 tools/wptrunner/wptrunner/browsers/firefox.py | 10 ++++++++--
 wai-aria-aam/support/atspi_wrapper.py         | 17 +++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tools/wptrunner/wptrunner/browsers/firefox.py b/tools/wptrunner/wptrunner/browsers/firefox.py
index e4b1a3f22a8086..7167240d1744b6 100644
--- a/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -147,8 +147,14 @@ def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs)
         browser_kwargs["test_type"] = test_type
         browser_kwargs["timeout_multiplier"] = get_timeout_multiplier(test_type, run_info_data, **kwargs)
 
-    if test_type == "aamtest" and ('accessibility.force_disabled', '-1') not in browser_kwargs["extra_prefs"]:
-        browser_kwargs["extra_prefs"].append(('accessibility.force_disabled', '-1'))
+    if test_type == "aamtest":
+        # Enable accessibility in the browser.
+        if ('accessibility.force_disabled', '-1') not in browser_kwargs["extra_prefs"]:
+            browser_kwargs["extra_prefs"].append(('accessibility.force_disabled', '-1'))
+        # Cache all attributes immediately for testing.
+        if ('accessibility.enable_all_cache_domains', 'true') not in browser_kwargs["extra_prefs"]:
+            browser_kwargs["extra_prefs"].append(('accessibility.enable_all_cache_domains', 'true'))
+
 
     browser_kwargs["extra_prefs"].extend(subsuite.config.get("prefs", []))
     return browser_kwargs
diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
index 14d092de4c7f7b..5b75c18e927cd0 100644
--- a/wai-aria-aam/support/atspi_wrapper.py
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -30,12 +30,17 @@ def find_node(self, dom_id: str, url: str) -> Atspi.Accessible:
                 self._find_fully_loaded_tab, f"Timeout looking for url: {self.test_url}"
             )
 
-        # Polling for the node with ID because in Firefox the node's
-        # id attribute may be set after the tab is ready, leading to flakes.
-        test_node = self._poll_for(
-            lambda: self._find_node_by_id(self.document, dom_id),
-            f"Timout looking for node with id {dom_id} in accessibility API ATSPI.",
-        )
+        test_node = self._find_node_by_id(self.document, dom_id);
+
+        if not test_node:
+            raise Exception(f"Did not find node with id '{dom_id}' in accessibility API ATSPI.")
+
+        # # Polling for the node with ID because in Firefox the node's
+        # # id attribute may be set after the tab is ready, leading to flakes.
+        # test_node = self._poll_for(
+        #     lambda: self._find_node_by_id(self.document, dom_id),
+        #     f"Timout looking for node with id '{dom_id}' in accessibility API ATSPI.",
+        # )
 
         return test_node
 

From 81691a3e174c71d893f1253c739e78c686d1de64 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 20 Feb 2026 10:44:24 -0800
Subject: [PATCH 07/14] Add back polling for firefox

---
 wai-aria-aam/support/atspi_wrapper.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
index 5b75c18e927cd0..958fdc259d0cf6 100644
--- a/wai-aria-aam/support/atspi_wrapper.py
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -30,17 +30,12 @@ def find_node(self, dom_id: str, url: str) -> Atspi.Accessible:
                 self._find_fully_loaded_tab, f"Timeout looking for url: {self.test_url}"
             )
 
-        test_node = self._find_node_by_id(self.document, dom_id);
-
-        if not test_node:
-            raise Exception(f"Did not find node with id '{dom_id}' in accessibility API ATSPI.")
-
-        # # Polling for the node with ID because in Firefox the node's
-        # # id attribute may be set after the tab is ready, leading to flakes.
-        # test_node = self._poll_for(
-        #     lambda: self._find_node_by_id(self.document, dom_id),
-        #     f"Timout looking for node with id '{dom_id}' in accessibility API ATSPI.",
-        # )
+        # Polling for the node with ID because in Firefox the node's
+        # id attribute may be set after the tab is ready, leading to flakes.
+        test_node = self._poll_for(
+            lambda: self._find_node_by_id(self.document, dom_id),
+            f"Timout looking for node with id '{dom_id}' in accessibility API ATSPI.",
+        )
 
         return test_node
 

From 963752553680f1b4a98f635c9fe312d635b2271e Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 25 Feb 2026 17:28:36 -0800
Subject: [PATCH 08/14] Use test result 'PRECONDITION_FAILED' for tests on
 wrong platform

---
 .../wptrunner/executors/pytestrunner/runner.py    | 15 +++++++++------
 tools/wptrunner/wptrunner/wpttest.py              |  4 ++--
 .../attribute/aria-autocomplete_tentative.py      |  6 ------
 .../attribute/aria-braillelabel_tentative.py      | 13 -------------
 .../attribute/aria-errormessage_tentative.py      | 13 -------------
 wai-aria-aam/role/blockquote_tentative.py         | 13 -------------
 ...or_aria-pressed_and_aria-haspopup_tentative.py | 12 ------------
 ...th_defined_value_for_aria-pressed_tentative.py | 12 ------------
 ...non_false_value_for_aria-haspopup_tentative.py | 12 ------------
 wai-aria-aam/support/fixtures_a11y_api.py         |  8 ++++----
 wai-aria-aam/support/platform.py                  |  8 ++++++++
 11 files changed, 23 insertions(+), 93 deletions(-)
 create mode 100644 wai-aria-aam/support/platform.py

diff --git a/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py b/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
index 57eab56082dfa5..fba164d3fed1db 100644
--- a/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
+++ b/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
@@ -145,12 +145,15 @@ def record_error(self, report, message):
         self.record(report.nodeid, "ERROR", message, report.longrepr)
 
     def record_skip(self, report):
-        self.record(
-            report.nodeid,
-            "ERROR",
-            "In-test skip decorators are disallowed, "
-            "please use WPT metadata to ignore tests.",
-        )
+        if "PRECONDITION_FAILED" in report.longrepr[2]:
+            self.record(report.nodeid, "PRECONDITION_FAILED")
+        else:
+            self.record(
+                report.nodeid,
+                "ERROR",
+                "In-test skip decorators are disallowed, "
+                "please use WPT metadata to ignore tests.",
+            )
 
     def record(self, test, status, message=None, stack=None):
         if stack is not None:
diff --git a/tools/wptrunner/wptrunner/wpttest.py b/tools/wptrunner/wptrunner/wpttest.py
index c7b7cb912f7080..128946f5ae886c 100644
--- a/tools/wptrunner/wptrunner/wpttest.py
+++ b/tools/wptrunner/wptrunner/wpttest.py
@@ -75,7 +75,7 @@ class WdspecResult(Result):
 
 class WdspecSubtestResult(SubtestResult):
     default_expected = "PASS"
-    statuses = {"PASS", "FAIL", "ERROR"}
+    statuses = {"PASS", "FAIL", "ERROR", "PRECONDITION_FAILED"}
 
 
 class AamSpecResult(Result):
@@ -85,7 +85,7 @@ class AamSpecResult(Result):
 
 class AamSpecSubtestResult(SubtestResult):
     default_expected = "PASS"
-    statuses = {"PASS", "FAIL", "ERROR"}
+    statuses = {"PASS", "FAIL", "ERROR", "PRECONDITION_FAILED"}
 
 
 class CrashtestResult(Result):
diff --git a/wai-aria-aam/attribute/aria-autocomplete_tentative.py b/wai-aria-aam/attribute/aria-autocomplete_tentative.py
index eb87d2db6d5166..8ecf643f33f399 100644
--- a/wai-aria-aam/attribute/aria-autocomplete_tentative.py
+++ b/wai-aria-aam/attribute/aria-autocomplete_tentative.py
@@ -8,9 +8,6 @@
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_atspi(atspi, session, inline, test_name):
-    if not atspi:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     node = atspi.find_node("test", session.url)
@@ -22,9 +19,6 @@ def test_atspi(atspi, session, inline, test_name):
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_ia2(ia2, session, inline, test_name):
-    if not ia2:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for IA2.
diff --git a/wai-aria-aam/attribute/aria-braillelabel_tentative.py b/wai-aria-aam/attribute/aria-braillelabel_tentative.py
index 26031b46554b01..14a8dcd212d846 100644
--- a/wai-aria-aam/attribute/aria-braillelabel_tentative.py
+++ b/wai-aria-aam/attribute/aria-braillelabel_tentative.py
@@ -1,37 +1,24 @@
-
 TEST_HTML = '<button id=test aria-braillelabel=foobar>'
 
 def test_atspi(atspi, session, inline):
-    if not atspi:
-        return
-
     session.url = inline(TEST_HTML)
 
     node = atspi.find_node('test', session.url)
     assert "braillelabel:foobar" in atspi.Accessible.get_attributes_as_array(node)
 
 def test_axapi(axapi, session, inline):
-    if not axapi:
-        return
-
     session.url = inline(TEST_HTML)
 
     # Todo: Add test for AX API.
 
 
 def test_ia2(ia2, session, inline):
-    if not ia2:
-        return
-
     session.url = inline(TEST_HTML)
 
     # Todo: Add test for IA2.
 
 
 def test_uia(uia, session, inline):
-    if not uia:
-        return
-
     session.url = inline(TEST_HTML)
 
     # Todo: Add test for UIA.
diff --git a/wai-aria-aam/attribute/aria-errormessage_tentative.py b/wai-aria-aam/attribute/aria-errormessage_tentative.py
index 6047af8bab78e7..b4f4757cfca41e 100644
--- a/wai-aria-aam/attribute/aria-errormessage_tentative.py
+++ b/wai-aria-aam/attribute/aria-errormessage_tentative.py
@@ -1,12 +1,8 @@
-
 TEST_HTML = '''<div role='checkbox' id='test' aria-errormessage='error1 error2' aria-invalid='true'>content</div>
 <div id='error1'>hello</div>
 <div id='error2'>world</div>'''
 
 def test_atspi(atspi, session, inline):
-    if not atspi:
-        return
-
     session.url = inline(TEST_HTML)
 
     # Relation
@@ -25,27 +21,18 @@ def test_atspi(atspi, session, inline):
 
 
 def test_axapi(axapi, session, inline):
-    if not axapi:
-        return
-
     session.url = inline(TEST_HTML)
 
     # Todo: Add test for AX API.
 
 
 def test_ia2(ia2, session, inline):
-    if not ia2:
-        return
-
     session.url = inline(TEST_HTML)
 
     # Todo: Add test for IA2.
 
 
 def test_uia(uia, session, inline):
-    if not uia:
-        return
-
     session.url = inline(TEST_HTML)
 
     # Todo: Add test for UIA.
diff --git a/wai-aria-aam/role/blockquote_tentative.py b/wai-aria-aam/role/blockquote_tentative.py
index cd12106f2e36a6..f3607d441e425b 100644
--- a/wai-aria-aam/role/blockquote_tentative.py
+++ b/wai-aria-aam/role/blockquote_tentative.py
@@ -1,10 +1,6 @@
-
 TEST_HTML = "<div role=blockquote id=test></div>"
 
 def test_atspi(atspi, session, inline):
-    if not atspi:
-        return
-
     session.url = inline(TEST_HTML)
 
     node = atspi.find_node("test", session.url)
@@ -12,9 +8,6 @@ def test_atspi(atspi, session, inline):
 
 
 def test_axapi(axapi, session, inline):
-    if not axapi:
-        return
-
     session.url = inline(TEST_HTML)
 
     node = axapi.find_node("test", session.url)
@@ -25,9 +18,6 @@ def test_axapi(axapi, session, inline):
 
 
 def test_ia2(ia2, session, inline):
-    if not ia2:
-        return
-
     session.url = inline(TEST_HTML)
 
     node = ia2.find_node("test", session.url)
@@ -36,9 +26,6 @@ def test_ia2(ia2, session, inline):
 
 
 def test_uia(uia, session, inline):
-    if not uia:
-        return
-
     session.url = inline(TEST_HTML)
 
     # This is an example, because the `uia` fixture is not implemented.
diff --git a/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
index db69cf791e2c87..1075985fb402fc 100644
--- a/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
+++ b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
@@ -10,9 +10,6 @@
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_atspi(atspi, session, inline, test_name):
-    if not atspi:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     node = atspi.find_node("test", session.url)
@@ -20,27 +17,18 @@ def test_atspi(atspi, session, inline, test_name):
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_axapi(axapi, session, inline, test_name):
-    if not axapi:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for AX API.
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_ia2(ia2, session, inline, test_name):
-    if not ia2:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for IA2.
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_uia(uia, session, inline, test_name):
-    if not uia:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for UIA.
diff --git a/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
index 155a2d2461ae45..08c13448b14b50 100644
--- a/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
+++ b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
@@ -7,9 +7,6 @@
 
 @pytest.mark.parametrize("test_name", TEST_HTML)
 def test_atspi(atspi, session, inline, test_name):
-    if not atspi:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     node = atspi.find_node("test", session.url)
@@ -17,27 +14,18 @@ def test_atspi(atspi, session, inline, test_name):
 
 @pytest.mark.parametrize("test_name", TEST_HTML)
 def test_axapi(axapi, session, inline, test_name):
-    if not axapi:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for AX API.
 
 @pytest.mark.parametrize("test_name", TEST_HTML)
 def test_ia2(ia2, session, inline, test_name):
-    if not ia2:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for IA2.
 
 @pytest.mark.parametrize("test_name", TEST_HTML)
 def test_uia(uia, session, inline, test_name):
-    if not uia:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for UIA.
diff --git a/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
index 38805a11546625..ade6805c829a45 100644
--- a/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
+++ b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
@@ -11,36 +11,24 @@
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_atspi(atspi, session, inline, test_name):
-    if not atspi:
-        return
-
     session.url = inline(TEST_HTML[test_name])
     node = atspi.find_node("test", session.url)
     assert atspi.Accessible.get_role_name(node) == "button"
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_axapi(axapi, session, inline, test_name):
-    if not axapi:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for AX API.
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_ia2(ia2, session, inline, test_name):
-    if not ia2:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for IA2.
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_uia(uia, session, inline, test_name):
-    if not uia:
-        return
-
     session.url = inline(TEST_HTML[test_name])
 
     # Todo: Add test for UIA.
diff --git a/wai-aria-aam/support/fixtures_a11y_api.py b/wai-aria-aam/support/fixtures_a11y_api.py
index a58e42355a7fe2..edad97be1e4666 100644
--- a/wai-aria-aam/support/fixtures_a11y_api.py
+++ b/wai-aria-aam/support/fixtures_a11y_api.py
@@ -21,7 +21,7 @@ def default_timeout(full_configuration):
 @pytest.fixture
 def atspi(session, default_timeout):
     if platform != "linux":
-        return
+        pytest.skip("PRECONDITION_FAILED")
 
     from .atspi_wrapper import AtspiWrapper
 
@@ -32,7 +32,7 @@ def atspi(session, default_timeout):
 @pytest.fixture
 def axapi(session, default_timeout):
     if platform != "darwin":
-        return
+        pytest.skip("PRECONDITION_FAILED")
 
     from .axapi_wrapper import AxapiWrapper
 
@@ -43,7 +43,7 @@ def axapi(session, default_timeout):
 @pytest.fixture
 def uia(session):
     if platform != "win32":
-        return
+        pytest.skip("PRECONDITION_FAILED")
 
     # TODO: Make UiaWrapper and return it
 
@@ -51,7 +51,7 @@ def uia(session):
 @pytest.fixture
 def ia2(session, default_timeout):
     if platform != "win32":
-        return
+        pytest.skip("PRECONDITION_FAILED")
 
     from .ia2_wrapper import Ia2Wrapper
 
diff --git a/wai-aria-aam/support/platform.py b/wai-aria-aam/support/platform.py
new file mode 100644
index 00000000000000..ac69b184744f8c
--- /dev/null
+++ b/wai-aria-aam/support/platform.py
@@ -0,0 +1,8 @@
+import pytest
+from sys import platform
+
+linux = pytest.mark.skipif(platform != "linux", reason="PRECONDITION_FAILED")
+
+mac = pytest.mark.skipif(platform != "darwin", reason="PRECONDITION_FAILED")
+
+windows = pytest.mark.skipif(platform != "win32", reason="PRECONDITION_FAILED")

From 5d4e2f7a14afea511901c811c8b11e5e11d540f6 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Mon, 2 Mar 2026 13:46:39 -0800
Subject: [PATCH 09/14] Update Atspi role inspection

---
 wai-aria-aam/role/blockquote_tentative.py                    | 2 +-
 ...lt_values_for_aria-pressed_and_aria-haspopup_tentative.py | 2 +-
 .../button_with_defined_value_for_aria-pressed_tentative.py  | 2 +-
 ...utton_with_non_false_value_for_aria-haspopup_tentative.py | 3 ++-
 wai-aria-aam/support/atspi_wrapper.py                        | 5 ++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wai-aria-aam/role/blockquote_tentative.py b/wai-aria-aam/role/blockquote_tentative.py
index f3607d441e425b..90f13fc04ce684 100644
--- a/wai-aria-aam/role/blockquote_tentative.py
+++ b/wai-aria-aam/role/blockquote_tentative.py
@@ -4,7 +4,7 @@ def test_atspi(atspi, session, inline):
     session.url = inline(TEST_HTML)
 
     node = atspi.find_node("test", session.url)
-    assert atspi.Accessible.get_role_name(node) == "block quote"
+    assert atspi.Accessible.get_role(node) == atspi.Role.BLOCK_QUOTE
 
 
 def test_axapi(axapi, session, inline):
diff --git a/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
index 1075985fb402fc..54862f4e76da37 100644
--- a/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
+++ b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
@@ -13,7 +13,7 @@ def test_atspi(atspi, session, inline, test_name):
     session.url = inline(TEST_HTML[test_name])
 
     node = atspi.find_node("test", session.url)
-    assert atspi.Accessible.get_role_name(node) == "button"
+    assert atspi.Accessible.get_role(node) == atspi.Role.PUSH_BUTTON
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_axapi(axapi, session, inline, test_name):
diff --git a/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
index 08c13448b14b50..382f7bc9385c66 100644
--- a/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
+++ b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
@@ -10,7 +10,7 @@ def test_atspi(atspi, session, inline, test_name):
     session.url = inline(TEST_HTML[test_name])
 
     node = atspi.find_node("test", session.url)
-    assert atspi.Accessible.get_role_name(node) == "toggle button"
+    assert atspi.Accessible.get_role(node) == atspi.Role.TOGGLE_BUTTON
 
 @pytest.mark.parametrize("test_name", TEST_HTML)
 def test_axapi(axapi, session, inline, test_name):
diff --git a/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
index ade6805c829a45..9e13e0604a6d8a 100644
--- a/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
+++ b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
@@ -12,8 +12,9 @@
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_atspi(atspi, session, inline, test_name):
     session.url = inline(TEST_HTML[test_name])
+
     node = atspi.find_node("test", session.url)
-    assert atspi.Accessible.get_role_name(node) == "button"
+    assert atspi.Accessible.get_role(node) == atspi.Role.PUSH_BUTTON
 
 @pytest.mark.parametrize("test_name", TEST_HTML.keys())
 def test_axapi(axapi, session, inline, test_name):
diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
index 958fdc259d0cf6..fd33e32378a712 100644
--- a/wai-aria-aam/support/atspi_wrapper.py
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -15,9 +15,8 @@ class AtspiWrapper(ApiWrapper):
     def ApiName(self):
         return "ATSPI"
 
-    @property
-    def Accessible(self):
-        return Atspi.Accessible
+    def __getattr__(self, name):
+        return getattr(Atspi, name)
 
     def find_node(self, dom_id: str, url: str) -> Atspi.Accessible:
         """

From cb763094bb44788370b91abd394de614f142ad3f Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Mon, 2 Mar 2026 14:32:52 -0800
Subject: [PATCH 10/14] Revert "Add back polling for firefox"

This reverts commit 81691a3e174c71d893f1253c739e78c686d1de64.
---
 wai-aria-aam/support/atspi_wrapper.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
index fd33e32378a712..7d5ecf9c172508 100644
--- a/wai-aria-aam/support/atspi_wrapper.py
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -29,12 +29,17 @@ def find_node(self, dom_id: str, url: str) -> Atspi.Accessible:
                 self._find_fully_loaded_tab, f"Timeout looking for url: {self.test_url}"
             )
 
-        # Polling for the node with ID because in Firefox the node's
-        # id attribute may be set after the tab is ready, leading to flakes.
-        test_node = self._poll_for(
-            lambda: self._find_node_by_id(self.document, dom_id),
-            f"Timout looking for node with id '{dom_id}' in accessibility API ATSPI.",
-        )
+        test_node = self._find_node_by_id(self.document, dom_id);
+
+        if not test_node:
+            raise Exception(f"Did not find node with id '{dom_id}' in accessibility API ATSPI.")
+
+        # # Polling for the node with ID because in Firefox the node's
+        # # id attribute may be set after the tab is ready, leading to flakes.
+        # test_node = self._poll_for(
+        #     lambda: self._find_node_by_id(self.document, dom_id),
+        #     f"Timout looking for node with id '{dom_id}' in accessibility API ATSPI.",
+        # )
 
         return test_node
 

From d9a5796c83cba7347d30ff1b0f635bd747e12cfc Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Mon, 2 Mar 2026 15:41:52 -0800
Subject: [PATCH 11/14] Correct mac blockquote assertion

---
 wai-aria-aam/role/blockquote_tentative.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wai-aria-aam/role/blockquote_tentative.py b/wai-aria-aam/role/blockquote_tentative.py
index 90f13fc04ce684..9dd499e75e2ff7 100644
--- a/wai-aria-aam/role/blockquote_tentative.py
+++ b/wai-aria-aam/role/blockquote_tentative.py
@@ -14,7 +14,7 @@ def test_axapi(axapi, session, inline):
     role = axapi.AXUIElementCopyAttributeValue(node, "AXRole", None)[1]
     assert role == "AXGroup"
     role = axapi.AXUIElementCopyAttributeValue(node, "AXSubrole", None)[1]
-    assert role == None
+    assert role == "AXUnknown"
 
 
 def test_ia2(ia2, session, inline):

From 832ef1f08bd46a57c2e4284224f8e83a39fb3182 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 3 Mar 2026 14:54:29 -0800
Subject: [PATCH 12/14] Use proper pytest parameterizing norms

---
 .../attribute/aria-autocomplete_tentative.py  | 12 +++++-----
 ...ria-pressed_and_aria-haspopup_tentative.py | 24 +++++++++----------
 ...efined_value_for_aria-pressed_tentative.py | 24 +++++++++----------
 ...false_value_for_aria-haspopup_tentative.py | 24 +++++++++----------
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/wai-aria-aam/attribute/aria-autocomplete_tentative.py b/wai-aria-aam/attribute/aria-autocomplete_tentative.py
index 8ecf643f33f399..a0d87909cb9263 100644
--- a/wai-aria-aam/attribute/aria-autocomplete_tentative.py
+++ b/wai-aria-aam/attribute/aria-autocomplete_tentative.py
@@ -6,9 +6,9 @@
     "list": "<input role='combobox' id='test' aria-autocomplete='list'>",
 }
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_atspi(atspi, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_atspi(atspi, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     node = atspi.find_node("test", session.url)
     assert f"autocomplete:{test_name}" in atspi.Accessible.get_attributes_as_array(node)
@@ -17,9 +17,9 @@ def test_atspi(atspi, session, inline, test_name):
 
 # Intentionally no AX API test, AX API does not map.
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_ia2(ia2, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name, test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_ia2(ia2, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for IA2.
 
diff --git a/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
index 54862f4e76da37..4033b54b922284 100644
--- a/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
+++ b/wai-aria-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup_tentative.py
@@ -8,27 +8,27 @@
     "aria-haspopup-false": "<div id=test role=button aria-haspopup=false>click me</div>",
 }
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_atspi(atspi, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_atspi(atspi, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     node = atspi.find_node("test", session.url)
     assert atspi.Accessible.get_role(node) == atspi.Role.PUSH_BUTTON
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_axapi(axapi, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_axapi(axapi, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for AX API.
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_ia2(ia2, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_ia2(ia2, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for IA2.
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_uia(uia, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_uia(uia, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for UIA.
diff --git a/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
index 382f7bc9385c66..f0649de4249ff5 100644
--- a/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
+++ b/wai-aria-aam/role/button_with_defined_value_for_aria-pressed_tentative.py
@@ -5,27 +5,27 @@
     "false": "<div id=test role=button aria-pressed=false>press me</div>"
 }
 
-@pytest.mark.parametrize("test_name", TEST_HTML)
-def test_atspi(atspi, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_atspi(atspi, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     node = atspi.find_node("test", session.url)
     assert atspi.Accessible.get_role(node) == atspi.Role.TOGGLE_BUTTON
 
-@pytest.mark.parametrize("test_name", TEST_HTML)
-def test_axapi(axapi, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_axapi(axapi, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for AX API.
 
-@pytest.mark.parametrize("test_name", TEST_HTML)
-def test_ia2(ia2, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_ia2(ia2, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for IA2.
 
-@pytest.mark.parametrize("test_name", TEST_HTML)
-def test_uia(uia, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_uia(uia, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for UIA.
diff --git a/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
index 9e13e0604a6d8a..901652891d0317 100644
--- a/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
+++ b/wai-aria-aam/role/button_with_non_false_value_for_aria-haspopup_tentative.py
@@ -9,27 +9,27 @@
     "dialog": "<div id=test role=button aria-haspopup=dialog>click me</div>"
 }
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_atspi(atspi, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_atspi(atspi, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     node = atspi.find_node("test", session.url)
     assert atspi.Accessible.get_role(node) == atspi.Role.PUSH_BUTTON
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_axapi(axapi, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_axapi(axapi, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for AX API.
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_ia2(ia2, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_ia2(ia2, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for IA2.
 
-@pytest.mark.parametrize("test_name", TEST_HTML.keys())
-def test_uia(uia, session, inline, test_name):
-    session.url = inline(TEST_HTML[test_name])
+@pytest.mark.parametrize("test_name,test_html", TEST_HTML.items(), ids=TEST_HTML.keys())
+def test_uia(uia, session, inline, test_name, test_html):
+    session.url = inline(test_html)
 
     # Todo: Add test for UIA.

From f1ebab581af5b32d4d3253b9e596bd0c50dad442 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 3 Mar 2026 16:05:07 -0800
Subject: [PATCH 13/14] In AXAPI: use the PID if it exists

---
 wai-aria-aam/support/axapi_wrapper.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wai-aria-aam/support/axapi_wrapper.py b/wai-aria-aam/support/axapi_wrapper.py
index e69eb68ace7400..01ae4ff6ef484d 100644
--- a/wai-aria-aam/support/axapi_wrapper.py
+++ b/wai-aria-aam/support/axapi_wrapper.py
@@ -51,6 +51,9 @@ def _find_browser(self) -> Optional[Any]:
 
         :return: AXUIElement or None.
         """
+        if self.pid and self.pid != 0:
+            return AXUIElementCreateApplication(self.pid)
+
         ws = NSWorkspace.sharedWorkspace()
         regular_predicate = NSPredicate.predicateWithFormat_(
             f"activationPolicy == {NSApplicationActivationPolicyRegular}"

From 904605c8c0810f129d9ee68a8940a93892abb54a Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 4 Mar 2026 12:58:25 -0800
Subject: [PATCH 14/14] Code review comments

---
 tools/manifest/sourcefile.py                 |  6 +++---
 tools/wptrunner/wptrunner/browsers/chrome.py |  4 +---
 wai-aria-aam/support/api_wrapper.py          | 19 ++++++++++++++-----
 wai-aria-aam/support/atspi_wrapper.py        | 10 +++++-----
 wai-aria-aam/support/axapi_wrapper.py        | 13 +++++++------
 wai-aria-aam/support/ia2/constants.py        |  4 ++--
 wai-aria-aam/support/ia2_wrapper.py          |  6 +++---
 7 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/tools/manifest/sourcefile.py b/tools/manifest/sourcefile.py
index dd739f7c7c0c3f..1294e5dcb63928 100644
--- a/tools/manifest/sourcefile.py
+++ b/tools/manifest/sourcefile.py
@@ -34,7 +34,7 @@
 # because relative import beyond toplevel throws *ImportError*!
 from metadata.webfeatures.schema import WEB_FEATURES_YML_FILENAME  # type: ignore
 
-wd_pattern = "*.py"
+py_pattern = "*.py"
 js_meta_re = re.compile(br"//\s*META:\s*(\w*)=(.*)$")
 python_meta_re = re.compile(br"#\s*META:\s*(\w*)=(.*)$")
 
@@ -396,7 +396,7 @@ def name_is_webdriver(self) -> bool:
                  (rel_path_parts[:2] == ("infrastructure", "webdriver") and
                   len(rel_path_parts) > 2)) and
                 self.filename not in ("__init__.py", "conftest.py") and
-                fnmatch(self.filename, wd_pattern))
+                fnmatch(self.filename, py_pattern))
 
     @property
     def name_is_wai_aria_aam(self) -> bool:
@@ -405,7 +405,7 @@ def name_is_wai_aria_aam(self) -> bool:
         rel_path_parts = self.rel_path_parts
         return ((rel_path_parts[0] == "wai-aria-aam" and len(rel_path_parts) > 1) and
                 self.filename not in ("__init__.py", "conftest.py") and
-                fnmatch(self.filename, wd_pattern))
+                fnmatch(self.filename, py_pattern))
 
     @property
     def name_is_reference(self) -> bool:
diff --git a/tools/wptrunner/wptrunner/browsers/chrome.py b/tools/wptrunner/wptrunner/browsers/chrome.py
index ef6a32e0dbe7c8..6ad4da2809b323 100644
--- a/tools/wptrunner/wptrunner/browsers/chrome.py
+++ b/tools/wptrunner/wptrunner/browsers/chrome.py
@@ -268,9 +268,7 @@ def restart_on_test_type_change(self, new_test_type: str, old_test_type: str) ->
         # Restart the test runner when switch from/to wdspec or aamtest tests.
         # These tests use a different protocol class so a restart is always needed.
         wdspec_types = {"wdspec", "aamtest"}
-        if old_test_type in wdspec_types or new_test_type in wdspec_types:
-            return True
-        return False
+        return old_test_type in wdspec_types or new_test_type in wdspec_types
 
     def create_output_handler(self, cmd: List[str]) -> OutputHandler:
         return ChromeDriverOutputHandler(
diff --git a/wai-aria-aam/support/api_wrapper.py b/wai-aria-aam/support/api_wrapper.py
index 4650828b8ed1e1..85b64c9a6e07d3 100644
--- a/wai-aria-aam/support/api_wrapper.py
+++ b/wai-aria-aam/support/api_wrapper.py
@@ -1,8 +1,11 @@
+import abc
 import time
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Generic, Optional, TypeVar
 
+ApiNode = TypeVar('ApiNode')
+PollResult = TypeVar('PollResult')
 
-class ApiWrapper:
+class ApiWrapper(Generic[ApiNode], abc.ABC):
     def __init__(self, pid: int, product_name: str, timeout: float) -> None:
         """Setup for accessibility API testing.
 
@@ -13,7 +16,7 @@ def __init__(self, pid: int, product_name: str, timeout: float) -> None:
         self.product_name: str = product_name
         self.pid: int = pid
         self.root: Optional[Any] = None
-        self.document: Optional[Any] = None
+        self.document: Optional[ApiNode] = None
         self.test_url: Optional[str] = None
         self.timeout: float = timeout
 
@@ -24,10 +27,16 @@ def __init__(self, pid: int, product_name: str, timeout: float) -> None:
                 f"Couldn't find browser {self.product_name} in accessibility API {self.ApiName}."
             )
 
-    def _find_browser(self) -> Any:
+    @property
+    @abc.abstractmethod
+    def ApiName(self) -> str:
         pass
 
-    def _poll_for(self, find: Callable[[], Any], error: str) -> Any:
+    @abc.abstractmethod
+    def _find_browser(self) -> Optional[ApiNode]:
+        pass
+
+    def _poll_for(self, find: Callable[[], Optional[PollResult]], error: str) -> PollResult:
         """Poll until the `find` function returns something.
 
         :param url: The url of the test.
diff --git a/wai-aria-aam/support/atspi_wrapper.py b/wai-aria-aam/support/atspi_wrapper.py
index 7d5ecf9c172508..8f1e2f6a1c37d7 100644
--- a/wai-aria-aam/support/atspi_wrapper.py
+++ b/wai-aria-aam/support/atspi_wrapper.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Optional, List, Dict
+from typing import Any, Optional, List, Dict
 
 import gi
 
@@ -9,13 +9,13 @@
 from .api_wrapper import ApiWrapper
 
 
-class AtspiWrapper(ApiWrapper):
+class AtspiWrapper(ApiWrapper[Atspi.Accessible]):
 
     @property
-    def ApiName(self):
+    def ApiName(self) -> str:
         return "ATSPI"
 
-    def __getattr__(self, name):
+    def __getattr__(self, name: str) -> Any:
         return getattr(Atspi, name)
 
     def find_node(self, dom_id: str, url: str) -> Atspi.Accessible:
@@ -76,7 +76,7 @@ def get_state_list_helper(self, node: Atspi.Accessible) -> List[str]:
             state_string_list.append(state.value_name.removeprefix("ATSPI_"))
         return state_string_list
 
-    def _find_browser(self):
+    def _find_browser(self) -> Optional[Atspi.Accessible]:
         if self.pid and self.pid != 0:
             return self._find_browser_by_pid()
         else:
diff --git a/wai-aria-aam/support/axapi_wrapper.py b/wai-aria-aam/support/axapi_wrapper.py
index 01ae4ff6ef484d..426c307d4fc2ba 100644
--- a/wai-aria-aam/support/axapi_wrapper.py
+++ b/wai-aria-aam/support/axapi_wrapper.py
@@ -16,18 +16,19 @@
 
 from .api_wrapper import ApiWrapper
 
+AXUIElement = Any
 
-class AxapiWrapper(ApiWrapper):
+class AxapiWrapper(ApiWrapper[AXUIElement]):
 
     @property
-    def ApiName(self):
+    def ApiName(self) -> str:
         return "AXAPI"
 
     @property
     def AXUIElementCopyAttributeValue(self):
         return AXUIElementCopyAttributeValue
 
-    def find_node(self, dom_id: str, url: str) -> Any:
+    def find_node(self, dom_id: str, url: str) -> AXUIElement:
         """
         :param dom_id: The dom id of the node to test.
         :param url: The url of the test.
@@ -46,7 +47,7 @@ def find_node(self, dom_id: str, url: str) -> Any:
 
         return test_node
 
-    def _find_browser(self) -> Optional[Any]:
+    def _find_browser(self) -> Optional[AXUIElement]:
         """Find the AXUIElement representing the browser.
 
         :return: AXUIElement or None.
@@ -73,7 +74,7 @@ def _find_browser(self) -> Optional[Any]:
             return None
         return AXUIElementCreateApplication(pid)
 
-    def _find_tab(self) -> Optional[Any]:
+    def _find_tab(self) -> Optional[AXUIElement]:
         """Find the active tab of the browser.
 
         :return: AXUIElement representing test document or None.
@@ -95,7 +96,7 @@ def _find_tab(self) -> Optional[Any]:
 
         return None
 
-    def _find_node_by_id(self, root: Any, dom_id: str) -> Optional[Any]:
+    def _find_node_by_id(self, root: Any, dom_id: str) -> Optional[AXUIElement]:
         """Find the AXUIElement with a specified dom_id.
 
         :param root: The root node to search from.
diff --git a/wai-aria-aam/support/ia2/constants.py b/wai-aria-aam/support/ia2/constants.py
index ef4cca981152d7..2cc3f14e73354e 100644
--- a/wai-aria-aam/support/ia2/constants.py
+++ b/wai-aria-aam/support/ia2/constants.py
@@ -198,7 +198,7 @@ def msaa_state_list_to_string(states):
     state_strings = []
     for state in MsaaState:
         if states & state:
-            state_strings.append(state.name.replace("STATE_SYSTEM_", ""))
+            state_strings.append(state.name.removeprefix("STATE_SYSTEM_"))
     return state_strings
 
 
@@ -206,5 +206,5 @@ def state_list_to_string(states):
     state_strings = []
     for state in Ia2State:
         if states & state:
-            state_strings.append(state.name.replace("IA2_STATE_", ""))
+            state_strings.append(state.name.removeprefix("IA2_STATE_"))
     return state_strings
diff --git a/wai-aria-aam/support/ia2_wrapper.py b/wai-aria-aam/support/ia2_wrapper.py
index f17cda4c9f1cfc..91ce2c5f0824ce 100644
--- a/wai-aria-aam/support/ia2_wrapper.py
+++ b/wai-aria-aam/support/ia2_wrapper.py
@@ -70,10 +70,10 @@ def to_ia2(node: IAccessiblePtr) -> IAccessible2Ptr:
     return service.QueryService(IAccessible._iid_, IAccessible2_2)
 
 
-class Ia2Wrapper(ApiWrapper):
+class Ia2Wrapper(ApiWrapper[IAccessible2Ptr]):
 
     @property
-    def ApiName(self):
+    def ApiName(self) -> str:
         return "IA2"
 
     def find_node(self, dom_id: str, url: str) -> IAccessible2Ptr:
@@ -107,7 +107,7 @@ def get_state_list(self, node: IAccessible2Ptr) -> str:
     def get_msaa_state_list(self, node: IAccessible2Ptr) -> str:
         return msaa_state_list_to_string(node.accState(CHILDID_SELF))
 
-    def _find_browser(self) -> IAccessible2Ptr:
+    def _find_browser(self) -> Optional[IAccessible2Ptr]:
         """Find the IAccessible2 node representing the browser.
 
         :return: IAccessible2Ptr.