From d4090486279d6b7eb2d7f8d7016261a02f8ff02b Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Fri, 13 Oct 2023 00:27:20 -0700
Subject: [PATCH 1/4] self-referencial labelledby + another IDREF

---
 accname/name/comp_labelledby.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/accname/name/comp_labelledby.html b/accname/name/comp_labelledby.html
index ab17bff1187411..d532305e3f66ac 100644
--- a/accname/name/comp_labelledby.html
+++ b/accname/name/comp_labelledby.html
@@ -13,8 +13,13 @@
 
 <p>Tests the <a href="https://w3c.github.io/accname/#comp_labelledby">#comp_labelledby</a> portions of the AccName <em>Name Computation</em> algorithm.</p>
 
-<div role="group" aria-labelledby="h" class="ex" data-expectedlabel="div group label" data-testname="div group explicitly labelledby heading">
-  <h2 id="h">div group label</h2>
+<div role="group" aria-labelledby="h" class="ex" data-expectedlabel="first heading" data-testname="div group explicitly labelledby heading">
+  <h2 id="h">first heading</h2>
+  <p>text inside div group</p>
+</div>
+
+<div role="group" aria-label="self label" id="g2" aria-labelledby="g2 h2" class="ex" data-expectedlabel="self label + first heading" data-testname="div group explicitly labelledby self and heading">
+  <h2 id="h2">+ first heading</h2>
   <p>text inside div group</p>
 </div>
 

From 9bc38cc5ed0b45730360e676326415ee1fe25e0e Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Fri, 13 Oct 2023 00:52:00 -0700
Subject: [PATCH 2/4] recursion tests

---
 accname/name/comp_labelledby.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/accname/name/comp_labelledby.html b/accname/name/comp_labelledby.html
index d532305e3f66ac..9775eb810b6d47 100644
--- a/accname/name/comp_labelledby.html
+++ b/accname/name/comp_labelledby.html
@@ -13,6 +13,14 @@
 
 <p>Tests the <a href="https://w3c.github.io/accname/#comp_labelledby">#comp_labelledby</a> portions of the AccName <em>Name Computation</em> algorithm.</p>
 
+<!--
+
+  Some overlap with tests in:
+  - /accname/name/comp_name_from_content.html
+  - /accname/name/shadowdom/*
+
+-->
+
 <div role="group" aria-labelledby="h" class="ex" data-expectedlabel="first heading" data-testname="div group explicitly labelledby heading">
   <h2 id="h">first heading</h2>
   <p>text inside div group</p>
@@ -23,6 +31,16 @@ <h2 id="h2">+ first heading</h2>
   <p>text inside div group</p>
 </div>
 
+<nav aria-labelledby="s1 s2 s3 s4" class="ex" data-expectedlabel="verify spaces between foreach" data-testname="nav with verified spaces appended between each of IDREFS">
+  <span id="s1">verify</span><span id="s2">spaces</span><span>FAIL IF INCLUDED</span><span id="s3">between</span><span id="s4">foreach</span>
+</nav>
+
+<nav aria-labelledby="r1" class="ex" data-expectedlabel="inception cubed" data-testname="nav with straight recursion">
+  <h2 id="r1" aria-labelledby="r2">1st FAIL IF INCLUDED</h2>
+  <span id="r2" aria-labelledby="r3">2nd FAIL IF INCLUDED</span>
+</nav>
+<span id="r3" aria-label="inception cubed">3rd FAIL IF INCLUDED</span>
+
 <!--
 
 Todo: test all remaining cases of https://w3c.github.io/accname/#comp_labelledby

From 42a22e66a8a7149fff3938d8be1cde82067d4524 Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Fri, 13 Oct 2023 16:16:07 -0700
Subject: [PATCH 3/4] blocking remaining tests on spec ambiguity issue
 https://github.com/w3c/accname/issues/209

---
 accname/name/comp_labelledby.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/accname/name/comp_labelledby.html b/accname/name/comp_labelledby.html
index 9775eb810b6d47..994b94004cacb9 100644
--- a/accname/name/comp_labelledby.html
+++ b/accname/name/comp_labelledby.html
@@ -35,15 +35,14 @@ <h2 id="h2">+ first heading</h2>
   <span id="s1">verify</span><span id="s2">spaces</span><span>FAIL IF INCLUDED</span><span id="s3">between</span><span id="s4">foreach</span>
 </nav>
 
-<nav aria-labelledby="r1" class="ex" data-expectedlabel="inception cubed" data-testname="nav with straight recursion">
-  <h2 id="r1" aria-labelledby="r2">1st FAIL IF INCLUDED</h2>
-  <span id="r2" aria-labelledby="r3">2nd FAIL IF INCLUDED</span>
-</nav>
-<span id="r3" aria-label="inception cubed">3rd FAIL IF INCLUDED</span>
-
 <!--
 
-Todo: test all remaining cases of https://w3c.github.io/accname/#comp_labelledby
+  BLOCKED on https://github.com/w3c/accname/issues/209
+
+  Once that's resolved, it may be worthwhile to add a new ./comp_labelledby_recursion.html file,
+  so that the implementation diffs rolling in don't penalize this Interop 2024 test.
+
+  All remaining cases of https://w3c.github.io/accname/#comp_labelledby
   - comp_labelledby_reset
   - comp_labelledby_foreach
   - comp_labelledby_set_current

From 4803e83d8f62a8336aed1ff83d26cf777243b38d Mon Sep 17 00:00:00 2001
From: James Craig <cookiecrook@users.noreply.github.com>
Date: Thu, 2 Nov 2023 14:18:46 -0700
Subject: [PATCH 4/4] Review feedback from rahimabdi: cross-reference tests in
 ./comp_label.html

---
 accname/name/comp_labelledby.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/accname/name/comp_labelledby.html b/accname/name/comp_labelledby.html
index 994b94004cacb9..2a22fd8919122e 100644
--- a/accname/name/comp_labelledby.html
+++ b/accname/name/comp_labelledby.html
@@ -15,7 +15,8 @@
 
 <!--
 
-  Some overlap with tests in:
+  Some overlap with other aria-labelledby tests in:
+  - /accname/name/comp_label.html (aria-labelledby / aria-label fallback, etc.)
   - /accname/name/comp_name_from_content.html
   - /accname/name/shadowdom/*