From 8435f781ee891f7100badd5b07075a74b28bf1b3 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Thu, 14 Dec 2023 11:01:39 +0100 Subject: [PATCH 01/11] dom: implement NodeList --- src/dom/dom.zig | 2 ++ src/dom/node.zig | 10 ++++++++++ src/dom/nodelist.zig | 32 ++++++++++++++++++++++++++++++++ src/netsurf.zig | 7 +++++++ 4 files changed, 51 insertions(+) create mode 100644 src/dom/nodelist.zig diff --git a/src/dom/dom.zig b/src/dom/dom.zig index 9c5c269f..25fdbb17 100644 --- a/src/dom/dom.zig +++ b/src/dom/dom.zig @@ -5,6 +5,7 @@ const EventTarget = @import("event_target.zig").EventTarget; const DOMImplementation = @import("implementation.zig").DOMImplementation; const NamedNodeMap = @import("namednodemap.zig").NamedNodeMap; const DOMTokenList = @import("token_list.zig").DOMTokenList; +const NodeList = @import("nodelist.zig").NodeList; const Nod = @import("node.zig"); pub const Interfaces = generate.Tuple(.{ @@ -13,6 +14,7 @@ pub const Interfaces = generate.Tuple(.{ DOMImplementation, NamedNodeMap, DOMTokenList, + NodeList, Nod.Node, Nod.Interfaces, }); diff --git a/src/dom/node.zig b/src/dom/node.zig index 86b3dae5..29c80239 100644 --- a/src/dom/node.zig +++ b/src/dom/node.zig @@ -193,6 +193,10 @@ pub const Node = struct { return try parser.nodeHasChildNodes(self); } + pub fn get_childNodes(self: *parser.Node) !*parser.NodeList { + return try parser.nodeGetChildNodes(self); + } + pub fn _insertBefore(self: *parser.Node, new_node: *parser.Node, ref_node: *parser.Node) !*parser.Node { return try parser.nodeInsertBefore(self, new_node, ref_node); } @@ -393,6 +397,12 @@ pub fn testExecFn( }; try checkCases(js_env, &node_has_child_nodes); + var node_child_nodes = [_]Case{ + .{ .src = "link.childNodes.length", .ex = "1" }, + .{ .src = "text.childNodes.length", .ex = "0" }, + }; + try checkCases(js_env, &node_child_nodes); + var node_insert_before = [_]Case{ .{ .src = "let insertBefore = document.createElement('a')", .ex = "undefined" }, .{ .src = "link.insertBefore(insertBefore, text) !== undefined", .ex = "true" }, diff --git a/src/dom/nodelist.zig b/src/dom/nodelist.zig new file mode 100644 index 00000000..4d6ff51b --- /dev/null +++ b/src/dom/nodelist.zig @@ -0,0 +1,32 @@ +const std = @import("std"); + +const parser = @import("../netsurf.zig"); + +const jsruntime = @import("jsruntime"); + +const NodeUnion = @import("node.zig").Union; +const Node = @import("node.zig").Node; + +const DOMException = @import("exceptions.zig").DOMException; + +// WEB IDL https://dom.spec.whatwg.org/#nodelist +pub const NodeList = struct { + pub const Self = parser.NodeList; + pub const mem_guarantied = true; + + pub const Exception = DOMException; + + pub fn get_length(self: *parser.NodeList) !u32 { + return try parser.nodeListLength(self); + } + + pub fn _item(self: *parser.NodeList, index: u32) !?NodeUnion { + const n = try parser.nodeListItem(self, index); + if (n == null) return null; + return try Node.toInterface(n.?); + } + + // TODO _symbol_iterator + + // TODO implement postAttach +}; diff --git a/src/netsurf.zig b/src/netsurf.zig index 2455b35a..30fd09ce 100644 --- a/src/netsurf.zig +++ b/src/netsurf.zig @@ -647,6 +647,13 @@ pub fn nodeHasChildNodes(node: *Node) !bool { return res; } +pub fn nodeGetChildNodes(node: *Node) !*NodeList { + var res: ?*NodeList = undefined; + const err = nodeVtable(node).dom_node_get_child_nodes.?(node, &res); + try DOMErr(err); + return res.?; +} + pub fn nodeInsertBefore(node: *Node, new_node: *Node, ref_node: *Node) !*Node { var res: ?*Node = undefined; const err = nodeVtable(node).dom_node_insert_before.?(node, new_node, ref_node, &res); From 7f1517557cee6bb566c9f0e71461a16ebc8a9349 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Thu, 14 Dec 2023 14:16:13 +0100 Subject: [PATCH 02/11] netsurf: expose private libdom func --- src/netsurf.zig | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/netsurf.zig b/src/netsurf.zig index 30fd09ce..f04eb4d9 100644 --- a/src/netsurf.zig +++ b/src/netsurf.zig @@ -356,6 +356,30 @@ pub const NodeType = enum(u4) { // NodeList pub const NodeList = c.dom_nodelist; +pub const NodeListType = enum(c_uint) { + query = 5, +}; + +// create reference to external libdom private function manually instead of +// using cimport. +// zig translate-c is unable to generate this declaration, idk why. +pub extern fn _dom_nodelist_create( + document: ?*Document, + nltype: c_uint, + owner: ?*Node, + tagname: [*c]String, + ns: [*c]String, + localname: [*c]String, + list: [*c]?*NodeList, +) DOMException; + +pub fn nodeListCreate(doc: ?*Document, nltype: NodeListType, root: *Node) !*NodeList { + var res: ?*NodeList = undefined; + const err = _dom_nodelist_create(doc, @intFromEnum(nltype), root, null, null, null, &res); + try DOMErr(err); + return res.?; +} + pub fn nodeListLength(nodeList: *NodeList) !u32 { var ln: u32 = undefined; const err = c.dom_nodelist_get_length(nodeList, &ln); From 76bdd94a3cfc9117770027bb0f520354426af1a1 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Thu, 14 Dec 2023 15:36:41 +0100 Subject: [PATCH 03/11] dom: reimplement nodelist in pure zig --- src/dom/element.zig | 1 + src/dom/node.zig | 14 +++++++++-- src/dom/nodelist.zig | 59 ++++++++++++++++++++++++++++++++++++++------ src/netsurf.zig | 27 -------------------- src/run_tests.zig | 2 ++ 5 files changed, 66 insertions(+), 37 deletions(-) diff --git a/src/dom/element.zig b/src/dom/element.zig index 8ab9d3c7..936a3813 100644 --- a/src/dom/element.zig +++ b/src/dom/element.zig @@ -9,6 +9,7 @@ const checkCases = jsruntime.test_utils.checkCases; const collection = @import("html_collection.zig"); const Node = @import("node.zig").Node; +const NodeList = @import("nodelist.zig").NodeList; const HTMLElem = @import("../html/elements.zig"); pub const Union = @import("../html/elements.zig").Union; diff --git a/src/dom/node.zig b/src/dom/node.zig index 29c80239..3144ea4e 100644 --- a/src/dom/node.zig +++ b/src/dom/node.zig @@ -14,6 +14,7 @@ const EventTarget = @import("event_target.zig").EventTarget; const Attr = @import("attribute.zig").Attr; const CData = @import("character_data.zig"); const Element = @import("element.zig").Element; +const NodeList = @import("nodelist.zig").NodeList; const Document = @import("document.zig").Document; const DocumentType = @import("document_type.zig").DocumentType; const DocumentFragment = @import("document_fragment.zig").DocumentFragment; @@ -193,8 +194,15 @@ pub const Node = struct { return try parser.nodeHasChildNodes(self); } - pub fn get_childNodes(self: *parser.Node) !*parser.NodeList { - return try parser.nodeGetChildNodes(self); + pub fn get_childNodes(self: *parser.Node, alloc: std.mem.Allocator) !*NodeList { + const list = try NodeList.init(alloc); + errdefer list.deinit(alloc); + + var n = try parser.nodeFirstChild(self) orelse return list; + while (true) { + try list.append(n); + n = try parser.nodeNextSibling(n) orelse return list; + } } pub fn _insertBefore(self: *parser.Node, new_node: *parser.Node, ref_node: *parser.Node) !*parser.Node { @@ -246,6 +254,8 @@ pub const Node = struct { const res = try parser.nodeReplaceChild(self, new_child, old_child); return try Node.toInterface(res); } + + pub fn deinit(_: *parser.Node, _: std.mem.Allocator) void {} }; // Tests diff --git a/src/dom/nodelist.zig b/src/dom/nodelist.zig index 4d6ff51b..b663ec4b 100644 --- a/src/dom/nodelist.zig +++ b/src/dom/nodelist.zig @@ -3,30 +3,73 @@ const std = @import("std"); const parser = @import("../netsurf.zig"); const jsruntime = @import("jsruntime"); +const Case = jsruntime.test_utils.Case; +const checkCases = jsruntime.test_utils.checkCases; const NodeUnion = @import("node.zig").Union; const Node = @import("node.zig").Node; const DOMException = @import("exceptions.zig").DOMException; +// Nodelist is implemented in pure Zig b/c libdom's NodeList doesn't allow to +// append nodes. // WEB IDL https://dom.spec.whatwg.org/#nodelist pub const NodeList = struct { - pub const Self = parser.NodeList; pub const mem_guarantied = true; - pub const Exception = DOMException; - pub fn get_length(self: *parser.NodeList) !u32 { - return try parser.nodeListLength(self); + const NodesArrayList = std.ArrayList(*parser.Node); + + nodes: NodesArrayList, + + pub fn init(alloc: std.mem.Allocator) !*NodeList { + const list = try alloc.create(NodeList); + list.* = NodeList{ + .nodes = NodesArrayList.init(alloc), + }; + + return list; } - pub fn _item(self: *parser.NodeList, index: u32) !?NodeUnion { - const n = try parser.nodeListItem(self, index); - if (n == null) return null; - return try Node.toInterface(n.?); + pub fn deinit(self: *NodeList, alloc: std.mem.Allocator) void { + // TODO unref all nodes + self.nodes.deinit(); + alloc.destroy(self); + } + + pub fn append(self: *NodeList, node: *parser.Node) !void { + try self.nodes.append(node); + } + + pub fn get_length(self: *NodeList) u32 { + return @intCast(self.nodes.items.len); + } + + pub fn _item(self: *NodeList, index: u32) !?NodeUnion { + if (index >= self.nodes.items.len) { + return null; + } + + const n = self.nodes.items[index]; + return try Node.toInterface(n); } // TODO _symbol_iterator // TODO implement postAttach }; + +// Tests +// ----- + +pub fn testExecFn( + _: std.mem.Allocator, + js_env: *jsruntime.Env, + comptime _: []jsruntime.API, +) !void { + var childnodes = [_]Case{ + .{ .src = "let list = document.getElementById('content').childNodes", .ex = "undefined" }, + .{ .src = "list.length", .ex = "9" }, + }; + try checkCases(js_env, &childnodes); +} diff --git a/src/netsurf.zig b/src/netsurf.zig index f04eb4d9..a2b268dc 100644 --- a/src/netsurf.zig +++ b/src/netsurf.zig @@ -360,26 +360,6 @@ pub const NodeListType = enum(c_uint) { query = 5, }; -// create reference to external libdom private function manually instead of -// using cimport. -// zig translate-c is unable to generate this declaration, idk why. -pub extern fn _dom_nodelist_create( - document: ?*Document, - nltype: c_uint, - owner: ?*Node, - tagname: [*c]String, - ns: [*c]String, - localname: [*c]String, - list: [*c]?*NodeList, -) DOMException; - -pub fn nodeListCreate(doc: ?*Document, nltype: NodeListType, root: *Node) !*NodeList { - var res: ?*NodeList = undefined; - const err = _dom_nodelist_create(doc, @intFromEnum(nltype), root, null, null, null, &res); - try DOMErr(err); - return res.?; -} - pub fn nodeListLength(nodeList: *NodeList) !u32 { var ln: u32 = undefined; const err = c.dom_nodelist_get_length(nodeList, &ln); @@ -671,13 +651,6 @@ pub fn nodeHasChildNodes(node: *Node) !bool { return res; } -pub fn nodeGetChildNodes(node: *Node) !*NodeList { - var res: ?*NodeList = undefined; - const err = nodeVtable(node).dom_node_get_child_nodes.?(node, &res); - try DOMErr(err); - return res.?; -} - pub fn nodeInsertBefore(node: *Node, new_node: *Node, ref_node: *Node) !*Node { var res: ?*Node = undefined; const err = nodeVtable(node).dom_node_insert_before.?(node, new_node, ref_node, &res); diff --git a/src/run_tests.zig b/src/run_tests.zig index 681e96c0..0f541c79 100644 --- a/src/run_tests.zig +++ b/src/run_tests.zig @@ -17,6 +17,7 @@ const DOMExceptionTestExecFn = @import("dom/exceptions.zig").testExecFn; const DOMImplementationExecFn = @import("dom/implementation.zig").testExecFn; const NamedNodeMapExecFn = @import("dom/namednodemap.zig").testExecFn; const DOMTokenListExecFn = @import("dom/token_list.zig").testExecFn; +const NodeListTestExecFn = @import("dom/nodelist.zig").testExecFn; var doc: *parser.DocumentHTML = undefined; @@ -65,6 +66,7 @@ fn testsAllExecFn( DOMImplementationExecFn, NamedNodeMapExecFn, DOMTokenListExecFn, + NodeListTestExecFn, }; inline for (testFns) |testFn| { From 459a46a553c9025f0637dbb8b2087e6414f12e7f Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Thu, 14 Dec 2023 16:41:35 +0100 Subject: [PATCH 04/11] dom: implement basic queryselector for element --- src/dom/element.zig | 87 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/src/dom/element.zig b/src/dom/element.zig index 936a3813..50999314 100644 --- a/src/dom/element.zig +++ b/src/dom/element.zig @@ -9,6 +9,7 @@ const checkCases = jsruntime.test_utils.checkCases; const collection = @import("html_collection.zig"); const Node = @import("node.zig").Node; +const Walker = @import("html_collection.zig").WalkerDepthFirst; const NodeList = @import("nodelist.zig").NodeList; const HTMLElem = @import("../html/elements.zig"); pub const Union = @import("../html/elements.zig").Union; @@ -192,6 +193,74 @@ pub const Element = struct { return try HTMLElem.toInterface(HTMLElem.Union, res.?); } + fn getElementById(self: *parser.Element, id: []const u8) !?*parser.Node { + // walk over the node tree fo find the node by id. + const root = parser.elementToNode(self); + const walker = Walker{}; + var next: ?*parser.Node = null; + while (true) { + next = try walker.get_next(root, next) orelse return null; + // ignore non-element nodes. + if (try parser.nodeType(next.?) != .element) { + continue; + } + const e = parser.nodeToElement(next.?); + if (std.mem.eql(u8, id, try get_id(e))) return next; + } + } + + // TODO netsurf doesn't handle query selectors. We have to implement a + // solution by ourselves. + // We handle only * and single id selector like `#foo`. + pub fn _querySelector(self: *parser.Element, selectors: []const u8) !?Union { + if (selectors.len == 0) return null; + + // catch-all, return the firstElementChild + if (selectors[0] == '*') return try get_firstElementChild(self); + + // support only simple id selector. + if (selectors[0] != '#' or std.mem.indexOf(u8, selectors, " ") != null) return null; + + // walk over the node tree fo find the node by id. + const n = try getElementById(self, selectors[1..]) orelse return null; + return try toInterface(parser.nodeToElement(n)); + } + + // TODO netsurf doesn't handle query selectors. We have to implement a + // solution by ourselves. + // We handle only * and single id selector like `#foo`. + pub fn _querySelectorAll(self: *parser.Element, alloc: std.mem.Allocator, selectors: []const u8) !*NodeList { + const list = try NodeList.init(alloc); + errdefer list.deinit(alloc); + + if (selectors.len == 0) return list; + + // catch-all, return all elements + if (selectors[0] == '*') { + // walk over the node tree fo find the node by id. + const root = parser.elementToNode(self); + const walker = Walker{}; + var next: ?*parser.Node = null; + while (true) { + next = try walker.get_next(root, next) orelse return list; + // ignore non-element nodes. + if (try parser.nodeType(next.?) != .element) { + continue; + } + try list.append(next.?); + } + } + + // support only simple id selector. + if (selectors[0] != '#' or std.mem.indexOf(u8, selectors, " ") != null) return list; + + // walk over the node tree fo find the node by id. + const n = try getElementById(self, selectors[1..]) orelse return list; + try list.append(n); + + return list; + } + pub fn deinit(_: *parser.Element, _: std.mem.Allocator) void {} }; @@ -279,4 +348,22 @@ pub fn testExecFn( .{ .src = "d.nextElementSibling", .ex = "null" }, }; try checkCases(js_env, &elementSibling); + + var querySelector = [_]Case{ + .{ .src = "let e = document.getElementById('content')", .ex = "undefined" }, + .{ .src = "e.querySelector('foo')", .ex = "null" }, + .{ .src = "e.querySelector('#foo')", .ex = "null" }, + .{ .src = "e.querySelector('#link').id", .ex = "link" }, + .{ .src = "e.querySelector('#para').id", .ex = "para" }, + .{ .src = "e.querySelector('*').id", .ex = "link" }, + + .{ .src = "e.querySelectorAll('foo').length", .ex = "0" }, + .{ .src = "e.querySelectorAll('#foo').length", .ex = "0" }, + .{ .src = "e.querySelectorAll('#link').length", .ex = "1" }, + .{ .src = "e.querySelectorAll('#link').item(0).id", .ex = "link" }, + .{ .src = "e.querySelectorAll('#para').length", .ex = "1" }, + .{ .src = "e.querySelectorAll('#para').item(0).id", .ex = "para" }, + .{ .src = "e.querySelectorAll('*').length", .ex = "4" }, + }; + try checkCases(js_env, &querySelector); } From 3a3bd5fa0806d30bf2fa43e5c8de76615df8e7d2 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Thu, 14 Dec 2023 16:45:41 +0100 Subject: [PATCH 05/11] add element queryselector wpt test --- .../ParentNode-querySelector-All-content.html | 377 +++++++++ .../ParentNode-querySelector-All-content.xht | 372 +++++++++ .../ParentNode-querySelector-All-xht.xht | 124 +++ .../nodes/ParentNode-querySelector-All.html | 120 +++ .../dom/nodes/ParentNode-querySelector-All.js | 261 ++++++ ...ntNode-querySelector-case-insensitive.html | 21 + .../ParentNode-querySelector-escapes.html | 123 +++ .../nodes/ParentNode-querySelector-scope.html | 33 + ...ode-querySelectorAll-removed-elements.html | 30 + .../ParentNode-querySelectors-exclusive.html | 39 + .../ParentNode-querySelectors-namespaces.html | 21 + ...ectors-space-and-dash-attribute-value.html | 21 + tests/wpt/dom/nodes/selectors.js | 755 ++++++++++++++++++ 13 files changed, 2297 insertions(+) create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-All-content.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-All-content.xht create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-All-xht.xht create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-All.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-All.js create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-case-insensitive.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-escapes.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelector-scope.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelectorAll-removed-elements.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelectors-exclusive.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelectors-namespaces.html create mode 100644 tests/wpt/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html create mode 100644 tests/wpt/dom/nodes/selectors.js diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-All-content.html b/tests/wpt/dom/nodes/ParentNode-querySelector-All-content.html new file mode 100644 index 00000000..8dc13545 --- /dev/null +++ b/tests/wpt/dom/nodes/ParentNode-querySelector-All-content.html @@ -0,0 +1,377 @@ + + + + + Selectors-API Test Suite: HTML with Selectors Level 2 using TestHarness: Test Document + + + + + + + + +
+
+ +
+

Universal selector tests inside element with id="universal".

+
+ 
Some preformatted text with some embedded code
+

This is a normal link: W3C

+
Some more nested elements code hyperlink
+
+ +
+
+
+
+
+

+ 

+    

+    
    
+
+    
+    
+    
+  
    
+
+  
    
+    
    
+      
    
+      
    
+      
    
+
+    
    
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
    
+
+    
    
+  
    
+
+  
    
+    
    
+      
    
+      
    
+
+      
    
+      
    
+
+    
+    
+    
+     
+    
+    
+    
+
+    
    
+  
    
+
+  
    
+    
    
+      
    
+      
    
+      
    
+  
    
+
+  
    
+    
+    
+    
+
+      
    
+      
    
+      
    
+      
    
+      
    
+
+    
     
+  
    
+
+  
    
+    
+    
+    
+
+      
    
+      
    
+      
    
+      
    
+
+    
     
+  
    
+
+  
    
+    
+    
+    
+
+      
    
+      
    
+      
    
+      
    
+      
    
+      
    
+
+    
    
+  
    
+
+  
    
+    
+      
+      
+      
+    
    
+
+    
      
+      
    1. 
+      
    2. 
+      
    3. 
+      
    4. 
+      
    5. 
+      
    6. 
+      
    7. 
+      
    8. 
+      
    9. 
+      
    10. 
+      
    11. 
+      
    12. 
+    
    
+
+    
    
+      span1
+      em1
+      
+      em2
+      span2
+      strong1
+      em3
+      span3
+      span4
+      strong2
+      em4
+    
    
+  
    
+
+  
    
+    
    
+    
    
+    
    
+
+    
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+    
    
+    
    
+
+    
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+      
+    
    
+    
    
+      
+      
+    
    
+    
    
+      
+      
+      
+    
    
+  
    >
+
+  
    
+    
    
+    
    
+    
     
    
+    
    Text node
    
+    
    
+  
    
+
+  
+
+  
    
+    
    
+      
    
+      
    
+      
    
+  
    
+
+  
    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
    
+
+  
    
+    
    
+    
    
+    
    
+
+    
    
+    
    
+    
    
+  
    
+
+  
    All pseudo-element tests
    
+
+  
    
+    
    
+    
    
+    
    
+
+    
+    
    
+    
    
+    
    
+    
    
+    
    
+    
    
+    
    
+    
    
+    
    
+
+    
+    
+
+    
+    
+  
    
+
+  
    
+    
    
+    
    
+
+    
      
+      
    • 
+      
    • 
+      
    • 
+      
    • 
+    
    
+
+    
+    
+
+    
+    
+  
    
+
+  
    
+    
    
+      
    
+        
    
+        
    
+      
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+      
    
+        
    
+        
    
+      
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+    
    
+      
    
+    
    
+    
    
+      
    
+      
    
+    
    
+    
    
+    
    
+    
    
+  
    
+
+  
    
+    
    
+    
    
+      
    
+    
    
+    
    
+      
    
+      
    
+    
    
+    
    
+    
    
+    
    
+  
    
+
+  
    
+    
+    
+  
    
+
    
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-All-content.xht b/tests/wpt/dom/nodes/ParentNode-querySelector-All-content.xht
new file mode 100644
index 00000000..0e9b925f
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelector-All-content.xht
@@ -0,0 +1,372 @@
+
+
+
+  Selectors-API Test Suite: HTML with Selectors Level 2 using TestHarness: Test Document
+
+  
+  
+  
+  
+
+
+
    
+  
    
+
+  
    
+    
    Universal selector tests inside element with id="universal".
    
+    
    
+    
    Some preformatted text with some embedded code
    
+    
    This is a normal link: W3C
    
+    
    Some more nested elements code hyperlink
    
+  
    
+
+  
    
+    
    
+    
    
+    
    
+    
    
+    
    
+    
    
+    
    
+    
      
+
+    
+    
+    
+  
      
+
+  
      
+    
      
+      
      
+      
      
+      
      
+
+    
      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
      
+
+    
      
+  
      
+
+  
      
+    
      
+      
      
+      
      
+
+      
      
+      
      
+
+    
+    
+    
+     
+    
+    
+    
+
+    
      
+  
      
+
+  
      
+    
      
+      
      
+      
      
+      
      
+  
      
+
+  
      
+    
+    
+    
+
+      
      
+      
      
+      
      
+      
      
+      
      
+
+    
       
+  
      
+
+  
      
+    
+    
+    
+
+      
      
+      
      
+      
      
+      
      
+
+    
       
+  
      
+
+  
      
+    
+    
+    
+
+      
      
+      
      
+      
      
+      
      
+      
      
+      
      
+
+    
      
+  
      
+
+  
      
+    
+      
+      
+      
+    
      
+
+    
        
+      
      1. 
+      
      2. 
+      
      3. 
+      
      4. 
+      
      5. 
+      
      6. 
+      
      7. 
+      
      8. 
+      
      9. 
+      
      10. 
+      
      11. 
+      
      12. 
+    
      
+
+    
      
+      span1
+      em1
+      
+      em2
+      span2
+      strong1
+      em3
+      span3
+      span4
+      strong2
+      em4
+    
      
+  
      
+
+  
      
+    
      
+    
      
+    
      
+
+    
      
+    
      
+    
      
+  
      
+
+  
      
+    
      
+    
      
+    
      
+
+    
      
+    
      
+    
      
+  
      
+
+  
      
+    
      
+      
+    
      
+    
      
+      
+      
+    
      
+    
      
+      
+      
+      
+    
      
+  
      >
+
+  
      
+    
      
+    
      
+    
       
      
+    
      Text node
      
+    
      
+  
      
+
+  
+
+  
      
+    
      
+      
      
+      
      
+      
      
+  
      
+
+  
      
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
      
+
+  
      
+    
      
+    
      
+    
      
+
+    
      
+    
      
+    
      
+  
      
+
+  
      All pseudo-element tests
      
+
+  
      
+    
      
+    
      
+    
      
+
+    
+    
      
+    
      
+    
      
+    
      
+    
      
+    
      
+    
      
+    
      
+    
      
+
+    
+    
+
+    
+    
+  
      
+
+  
      
+    
      
+    
      
+
+    
        
+      
      • 
+      
      • 
+      
      • 
+      
      • 
+    
      
+
+    
+    
+
+    
+    
+  
      
+
+  
      
+    
      
+      
      
+        
      
+        
      
+      
      
+    
      
+    
      
+  
      
+
+  
      
+    
      
+      
      
+        
      
+        
      
+      
      
+    
      
+    
      
+  
      
+
+  
      
+    
      
+    
      
+      
      
+    
      
+    
      
+      
      
+      
      
+    
      
+    
      
+    
      
+    
      
+  
      
+
+  
      
+    
      
+    
      
+      
      
+    
      
+    
      
+      
      
+      
      
+    
      
+    
      
+    
      
+    
      
+  
      
+
+  
      
+    
+    
+  
      
+
      
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-All-xht.xht b/tests/wpt/dom/nodes/ParentNode-querySelector-All-xht.xht
new file mode 100644
index 00000000..f2d94da1
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelector-All-xht.xht
@@ -0,0 +1,124 @@
+
+
+
+
+Selectors-API Test Suite: XHTML
+
+
+
+
+
+
+
+
      This test requires JavaScript.
      
+
+
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-All.html b/tests/wpt/dom/nodes/ParentNode-querySelector-All.html
new file mode 100644
index 00000000..7d68e7f2
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelector-All.html
@@ -0,0 +1,120 @@
+
+
+
+Selectors-API Test Suite: HTML
+
+
+
+
+
+
+
      This test requires JavaScript.
      
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-All.js b/tests/wpt/dom/nodes/ParentNode-querySelector-All.js
new file mode 100644
index 00000000..3c6c5031
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelector-All.js
@@ -0,0 +1,261 @@
+// Require selectors.js to be included before this.
+
+/*
+ * Create and append special elements that cannot be created correctly with HTML markup alone.
+ */
+function setupSpecialElements(doc, parent) {
+  // Setup null and undefined tests
+  parent.appendChild(doc.createElement("null"));
+  parent.appendChild(doc.createElement("undefined"));
+
+  // Setup namespace tests
+  var anyNS = doc.createElement("div");
+  var noNS = doc.createElement("div");
+  anyNS.id = "any-namespace";
+  noNS.id = "no-namespace";
+
+  var divs;
+  div = [doc.createElement("div"),
+         doc.createElementNS("http://www.w3.org/1999/xhtml", "div"),
+         doc.createElementNS("", "div"),
+         doc.createElementNS("http://www.example.org/ns", "div")];
+
+  div[0].id = "any-namespace-div1";
+  div[1].id = "any-namespace-div2";
+  div[2].setAttribute("id", "any-namespace-div3"); // Non-HTML elements can't use .id property
+  div[3].setAttribute("id", "any-namespace-div4");
+
+  for (var i = 0; i < div.length; i++) {
+    anyNS.appendChild(div[i])
+  }
+
+  div = [doc.createElement("div"),
+         doc.createElementNS("http://www.w3.org/1999/xhtml", "div"),
+         doc.createElementNS("", "div"),
+         doc.createElementNS("http://www.example.org/ns", "div")];
+
+  div[0].id = "no-namespace-div1";
+  div[1].id = "no-namespace-div2";
+  div[2].setAttribute("id", "no-namespace-div3"); // Non-HTML elements can't use .id property
+  div[3].setAttribute("id", "no-namespace-div4");
+
+  for (i = 0; i < div.length; i++) {
+    noNS.appendChild(div[i])
+  }
+
+  parent.appendChild(anyNS);
+  parent.appendChild(noNS);
+
+  var span = doc.getElementById("attr-presence-i1");
+  span.setAttributeNS("http://www.example.org/ns", "title", "");
+}
+
+/*
+ * Check that the querySelector and querySelectorAll methods exist on the given Node
+ */
+function interfaceCheck(type, obj) {
+  test(function() {
+    var q = typeof obj.querySelector === "function";
+    assert_true(q, type + " supports querySelector.");
+  }, type + " supports querySelector")
+
+  test(function() {
+    var qa = typeof obj.querySelectorAll === "function";
+    assert_true( qa, type + " supports querySelectorAll.");
+  }, type + " supports querySelectorAll")
+
+  test(function() {
+    var list = obj.querySelectorAll("div");
+    if (obj.ownerDocument) { // The object is not a Document
+      assert_true(list instanceof obj.ownerDocument.defaultView.NodeList, "The result should be an instance of a NodeList")
+    } else { // The object is a Document
+      assert_true(list instanceof obj.defaultView.NodeList, "The result should be an instance of a NodeList")
+    }
+  }, type + ".querySelectorAll returns NodeList instance")
+}
+
+/*
+ * Verify that the NodeList returned by querySelectorAll is static and and that a new list is created after
+ * each call. A static list should not be affected by subsequent changes to the DOM.
+ */
+function verifyStaticList(type, doc, root) {
+  var pre, post, preLength;
+
+  test(function() {
+    pre = root.querySelectorAll("div");
+    preLength = pre.length;
+
+    var div = doc.createElement("div");
+    (root.body || root).appendChild(div);
+
+    assert_equals(pre.length, preLength, "The length of the NodeList should not change.")
+  }, type + ": static NodeList")
+
+  test(function() {
+    post = root.querySelectorAll("div"),
+    assert_equals(post.length, preLength + 1, "The length of the new NodeList should be 1 more than the previous list.")
+  }, type + ": new NodeList")
+}
+
+/*
+ * Verify handling of special values for the selector parameter, including stringification of
+ * null and undefined, and the handling of the empty string.
+ */
+function runSpecialSelectorTests(type, root) {
+  let global = (root.ownerDocument || root).defaultView;
+
+  test(function() { // 1
+    assert_equals(root.querySelectorAll(null).length, 1, "This should find one element with the tag name 'NULL'.");
+  }, type + ".querySelectorAll null")
+
+  test(function() { // 2
+    assert_equals(root.querySelectorAll(undefined).length, 1, "This should find one element with the tag name 'UNDEFINED'.");
+  }, type + ".querySelectorAll undefined")
+
+  test(function() { // 3
+    assert_throws_js(global.TypeError, function() {
+      root.querySelectorAll();
+    }, "This should throw a TypeError.")
+  }, type + ".querySelectorAll no parameter")
+
+  test(function() { // 4
+    var elm = root.querySelector(null)
+    assert_not_equals(elm, null, "This should find an element.");
+    assert_equals(elm.tagName.toUpperCase(), "NULL", "The tag name should be 'NULL'.")
+  }, type + ".querySelector null")
+
+  test(function() { // 5
+    var elm = root.querySelector(undefined)
+    assert_not_equals(elm, undefined, "This should find an element.");
+    assert_equals(elm.tagName.toUpperCase(), "UNDEFINED", "The tag name should be 'UNDEFINED'.")
+  }, type + ".querySelector undefined")
+
+  test(function() { // 6
+    assert_throws_js(global.TypeError, function() {
+      root.querySelector();
+    }, "This should throw a TypeError.")
+  }, type + ".querySelector no parameter")
+
+  test(function() { // 7
+    result = root.querySelectorAll("*");
+    var i = 0;
+    traverse(root, function(elem) {
+      if (elem !== root) {
+        assert_equals(elem, result[i], "The result in index " + i + " should be in tree order.");
+        i++;
+      }
+    })
+  }, type + ".querySelectorAll tree order");
+}
+
+/*
+ * Execute queries with the specified valid selectors for both querySelector() and querySelectorAll()
+ * Only run these tests when results are expected. Don't run for syntax error tests.
+ */
+function runValidSelectorTest(type, root, selectors, testType, docType) {
+  var nodeType = "";
+  switch (root.nodeType) {
+    case Node.DOCUMENT_NODE:
+      nodeType = "document";
+      break;
+    case Node.ELEMENT_NODE:
+      nodeType = root.parentNode ? "element" : "detached";
+      break;
+    case Node.DOCUMENT_FRAGMENT_NODE:
+      nodeType = "fragment";
+      break;
+    default:
+      assert_unreached();
+      nodeType = "unknown"; // This should never happen.
+  }
+
+  for (var i = 0; i < selectors.length; i++) {
+    var s = selectors[i];
+    var n = s["name"];
+    var q = s["selector"];
+    var e = s["expect"];
+
+    if ((!s["exclude"] || (s["exclude"].indexOf(nodeType) === -1 && s["exclude"].indexOf(docType) === -1))
+     && (s["testType"] & testType) ) {
+      var foundall, found;
+
+      test(function() {
+        foundall = root.querySelectorAll(q);
+        assert_not_equals(foundall, null, "The method should not return null.")
+        assert_equals(foundall.length, e.length, "The method should return the expected number of matches.")
+
+        for (var i = 0; i < e.length; i++) {
+          assert_not_equals(foundall[i], null, "The item in index " + i + " should not be null.")
+          assert_equals(foundall[i].getAttribute("id"), e[i], "The item in index " + i + " should have the expected ID.");
+          assert_false(foundall[i].hasAttribute("data-clone"), "This should not be a cloned element.");
+        }
+      }, type + ".querySelectorAll: " + n + ": " + q);
+
+      test(function() {
+        found = root.querySelector(q);
+
+        if (e.length > 0) {
+          assert_not_equals(found, null, "The method should return a match.")
+          assert_equals(found.getAttribute("id"), e[0], "The method should return the first match.");
+          assert_equals(found, foundall[0], "The result should match the first item from querySelectorAll.");
+          assert_false(found.hasAttribute("data-clone"), "This should not be annotated as a cloned element.");
+        } else {
+          assert_equals(found, null, "The method should not match anything.");
+        }
+      }, type + ".querySelector: " + n + ": " + q);
+    }
+  }
+}
+
+function windowFor(root) {
+  return root.defaultView || root.ownerDocument.defaultView;
+}
+
+/*
+ * Execute queries with the specified invalid selectors for both querySelector() and querySelectorAll()
+ * Only run these tests when errors are expected. Don't run for valid selector tests.
+ */
+function runInvalidSelectorTest(type, root, selectors) {
+  for (var i = 0; i < selectors.length; i++) {
+    var s = selectors[i];
+    var n = s["name"];
+    var q = s["selector"];
+
+    test(function() {
+      assert_throws_dom("SyntaxError", windowFor(root).DOMException, function() {
+        root.querySelector(q)
+      });
+    }, type + ".querySelector: " + n + ": " + q);
+
+    test(function() {
+      assert_throws_dom("SyntaxError", windowFor(root).DOMException, function() {
+        root.querySelectorAll(q)
+      });
+    }, type + ".querySelectorAll: " + n + ": " + q);
+  }
+}
+
+function traverse(elem, fn) {
+  if (elem.nodeType === elem.ELEMENT_NODE) {
+    fn(elem);
+  }
+  elem = elem.firstChild;
+  while (elem) {
+    traverse(elem, fn);
+    elem = elem.nextSibling;
+  }
+}
+
+function getNodeType(node) {
+  switch (node.nodeType) {
+    case Node.DOCUMENT_NODE:
+      return "document";
+    case Node.ELEMENT_NODE:
+      return node.parentNode ? "element" : "detached";
+    case Node.DOCUMENT_FRAGMENT_NODE:
+      return "fragment";
+    default:
+      assert_unreached();
+      return "unknown"; // This should never happen.
+  }
+}
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-case-insensitive.html b/tests/wpt/dom/nodes/ParentNode-querySelector-case-insensitive.html
new file mode 100644
index 00000000..e461ee50
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelector-case-insensitive.html
@@ -0,0 +1,21 @@
+
+
+querySelector(All) must work with the i and *= selectors
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-escapes.html b/tests/wpt/dom/nodes/ParentNode-querySelector-escapes.html
new file mode 100644
index 00000000..65a75e5c
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelector-escapes.html
@@ -0,0 +1,123 @@
+
+
+querySelector() with CSS escapes
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelector-scope.html b/tests/wpt/dom/nodes/ParentNode-querySelector-scope.html
new file mode 100644
index 00000000..d984956d
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelector-scope.html
@@ -0,0 +1,33 @@
+
+
+querySelector(All) scoped to a root element
+
+
+
+
      hello
      
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelectorAll-removed-elements.html b/tests/wpt/dom/nodes/ParentNode-querySelectorAll-removed-elements.html
new file mode 100644
index 00000000..3cefc809
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelectorAll-removed-elements.html
@@ -0,0 +1,30 @@
+
+
+querySelectorAll must not return removed elements
+
+
+
+
+
      
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelectors-exclusive.html b/tests/wpt/dom/nodes/ParentNode-querySelectors-exclusive.html
new file mode 100644
index 00000000..5cff9367
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelectors-exclusive.html
@@ -0,0 +1,39 @@
+
+
+querySelector/querySelectorAll should not include their thisArg
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelectors-namespaces.html b/tests/wpt/dom/nodes/ParentNode-querySelectors-namespaces.html
new file mode 100644
index 00000000..714999b3
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelectors-namespaces.html
@@ -0,0 +1,21 @@
+
+
+querySelectorAll must work with namespace attribute selectors on SVG
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html b/tests/wpt/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html
new file mode 100644
index 00000000..e08c6e6d
--- /dev/null
+++ b/tests/wpt/dom/nodes/ParentNode-querySelectors-space-and-dash-attribute-value.html
@@ -0,0 +1,21 @@
+
+
+querySelector(All) must work for attribute values that contain spaces and dashes
+
+
+
+
+Test One
+
+
diff --git a/tests/wpt/dom/nodes/selectors.js b/tests/wpt/dom/nodes/selectors.js
new file mode 100644
index 00000000..5e05547c
--- /dev/null
+++ b/tests/wpt/dom/nodes/selectors.js
@@ -0,0 +1,755 @@
+// Bit-mapped flags to indicate which tests the selector is suitable for
+var TEST_QSA              = 0x01; // querySelector() and querySelectorAll() tests
+var TEST_FIND             = 0x04; // find() and findAll() tests, may be unsuitable for querySelector[All]
+var TEST_MATCH            = 0x10; // matches() tests
+
+/*
+ * All of these invalid selectors should result in a SyntaxError being thrown by the APIs.
+ *
+ *   name:     A descriptive name of the selector being tested
+ *   selector: The selector to test
+ */
+var invalidSelectors = [
+  {name: "Empty String",                 selector: ""},
+  {name: "Invalid character",            selector: "["},
+  {name: "Invalid character",            selector: "]"},
+  {name: "Invalid character",            selector: "("},
+  {name: "Invalid character",            selector: ")"},
+  {name: "Invalid character",            selector: "{"},
+  {name: "Invalid character",            selector: "}"},
+  {name: "Invalid character",            selector: "<"},
+  {name: "Invalid character",            selector: ">"},
+  {name: "Invalid ID",                   selector: "#"},
+  {name: "Invalid group of selectors",   selector: "div,"},
+  {name: "Invalid class",                selector: "."},
+  {name: "Invalid class",                selector: ".5cm"},
+  {name: "Invalid class",                selector: "..test"},
+  {name: "Invalid class",                selector: ".foo..quux"},
+  {name: "Invalid class",                selector: ".bar."},
+  {name: "Invalid combinator",           selector: "div % address, p"},
+  {name: "Invalid combinator",           selector: "div ++ address, p"},
+  {name: "Invalid combinator",           selector: "div ~~ address, p"},
+  {name: "Invalid [att=value] selector", selector: "[*=test]"},
+  {name: "Invalid [att=value] selector", selector: "[*|*=test]"},
+  {name: "Invalid [att=value] selector", selector: "[class= space unquoted ]"},
+  {name: "Unknown pseudo-class",         selector: "div:example"},
+  {name: "Unknown pseudo-class",         selector: ":example"},
+  {name: "Unknown pseudo-class",         selector: "div:linkexample"},
+  {name: "Unknown pseudo-element",       selector: "div::example"},
+  {name: "Unknown pseudo-element",       selector: "::example"},
+  {name: "Invalid pseudo-element",       selector: ":::before"},
+  {name: "Invalid pseudo-element",       selector: ":: before"},
+  {name: "Undeclared namespace",         selector: "ns|div"},
+  {name: "Undeclared namespace",         selector: ":not(ns|div)"},
+  {name: "Invalid namespace",            selector: "^|div"},
+  {name: "Invalid namespace",            selector: "$|div"},
+  {name: "Relative selector",            selector: ">*"},
+];
+
+/*
+ * All of these should be valid selectors, expected to match zero or more elements in the document.
+ * None should throw any errors.
+ *
+ *   name:     A descriptive name of the selector being tested
+ *   selector: The selector to test
+ *   expect:   A list of IDs of the elements expected to be matched. List must be given in tree order.
+ *   exclude:  An array of contexts to exclude from testing. The valid values are:
+ *             ["document", "element", "fragment", "detached", "html", "xhtml"]
+ *             The "html" and "xhtml" values represent the type of document being queried. These are useful
+ *             for tests that are affected by differences between HTML and XML, such as case sensitivity.
+ *   level:    An integer indicating the CSS or Selectors level in which the selector being tested was introduced.
+ *   testType: A bit-mapped flag indicating the type of test.
+ *
+ * Note: Interactive pseudo-classes (:active :hover and :focus) have not been tested in this test suite.
+ */
+var validSelectors = [
+  // Type Selector
+  {name: "Type selector, matching html element", selector: "html", expect: ["html"],          exclude: ["element", "fragment", "detached"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Type selector, matching html element", selector: "html", expect: [] /*no matches*/, exclude: ["document"],                        level: 1, testType: TEST_QSA},
+  {name: "Type selector, matching body element", selector: "body", expect: ["body"],          exclude: ["element", "fragment", "detached"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Type selector, matching body element", selector: "body", expect: [] /*no matches*/, exclude: ["document"],                        level: 1, testType: TEST_QSA},
+
+  // Universal Selector
+  {name: "Universal selector, matching all elements",                                    selector: "*",              expect: ["universal", "universal-p1", "universal-code1", "universal-hr1", "universal-pre1", "universal-span1", "universal-p2", "universal-a1", "universal-address1", "universal-code2", "universal-a2"], level: 2, testType: TEST_MATCH},
+  {name: "Universal selector, matching all children of element with specified ID",       selector: "#universal>*",   expect: ["universal-p1", "universal-hr1", "universal-pre1", "universal-p2", "universal-address1"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Universal selector, matching all grandchildren of element with specified ID",  selector: "#universal>*>*", expect: ["universal-code1", "universal-span1", "universal-a1", "universal-code2"],                 level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Universal selector, matching all children of empty element with specified ID", selector: "#empty>*",       expect: [] /*no matches*/,                                                                         level: 2, testType: TEST_QSA},
+  {name: "Universal selector, matching all descendants of element with specified ID",    selector: "#universal *",   expect: ["universal-p1", "universal-code1", "universal-hr1", "universal-pre1", "universal-span1", "universal-p2", "universal-a1", "universal-address1", "universal-code2", "universal-a2"], level: 2, testType: TEST_QSA | TEST_MATCH},
+
+  // Attribute Selectors
+  // - presence                  [att]
+  {name: "Attribute presence selector, matching align attribute with value",                    selector: ".attr-presence-div1[align]",                             expect: ["attr-presence-div1"],                                                                   level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute presence selector, matching align attribute with empty value",              selector: ".attr-presence-div2[align]",                             expect: ["attr-presence-div2"],                                                                   level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute presence selector, matching title attribute, case insensitivity",           selector: "#attr-presence [*|TiTlE]",                                 expect: ["attr-presence-a1", "attr-presence-span1", "attr-presence-i1"], exclude: ["xhtml"],    level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute presence selector, not matching title attribute, case sensitivity",         selector: "#attr-presence [*|TiTlE]",                                 expect: [],                                                              exclude: ["html"],     level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute presence selector, matching custom data-* attribute",                       selector: "[data-attr-presence]",                                   expect: ["attr-presence-pre1", "attr-presence-blockquote1"],                                      level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute presence selector, not matching attribute with similar name",               selector: ".attr-presence-div3[align], .attr-presence-div4[align]", expect: [] /*no matches*/,                                                                        level: 2, testType: TEST_QSA},
+  {name: "Attribute presence selector, matching attribute with non-ASCII characters",           selector: "ul[data-中文]",                                            expect: ["attr-presence-ul1"],                                                                    level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute presence selector, not matching default option without selected attribute", selector: "#attr-presence-select1 option[selected]",                expect: [] /* no matches */,                                                                      level: 2, testType: TEST_QSA},
+  {name: "Attribute presence selector, matching option with selected attribute",                selector: "#attr-presence-select2 option[selected]",                expect: ["attr-presence-select2-option4"],                                                        level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute presence selector, matching multiple options with selected attributes",     selector: "#attr-presence-select3 option[selected]",                expect: ["attr-presence-select3-option2", "attr-presence-select3-option3"],                       level: 2, testType: TEST_QSA | TEST_MATCH},
+
+  // - value                     [att=val]
+  {name: "Attribute value selector, matching align attribute with value",                                    selector: "#attr-value [align=\"center\"]",                                     expect: ["attr-value-div1"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector, matching align attribute with value, unclosed bracket",                  selector: "#attr-value [align=\"center\"",                                      expect: ["attr-value-div1"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector, matching align attribute with empty value",                              selector: "#attr-value [align=\"\"]",                                           expect: ["attr-value-div2"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector, not matching align attribute with partial value",                        selector: "#attr-value [align=\"c\"]",                                          expect: [] /*no matches*/,   level: 2, testType: TEST_QSA},
+  {name: "Attribute value selector, not matching align attribute with incorrect value",                      selector: "#attr-value [align=\"centera\"]",                                    expect: [] /*no matches*/,   level: 2, testType: TEST_QSA},
+  {name: "Attribute value selector, matching custom data-* attribute with unicode escaped value",            selector: "[data-attr-value=\"\\e9\"]",                                         expect: ["attr-value-div3"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector, matching custom data-* attribute with escaped character",                selector: "[data-attr-value\_foo=\"\\e9\"]",                                    expect: ["attr-value-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector with single-quoted value, matching multiple inputs with type attributes", selector: "#attr-value input[type='hidden'],#attr-value input[type='radio']",   expect: ["attr-value-input3", "attr-value-input4", "attr-value-input6", "attr-value-input8", "attr-value-input9"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector with double-quoted value, matching multiple inputs with type attributes", selector: "#attr-value input[type=\"hidden\"],#attr-value input[type='radio']", expect: ["attr-value-input3", "attr-value-input4", "attr-value-input6", "attr-value-input8", "attr-value-input9"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector with unquoted value, matching multiple inputs with type attributes",      selector: "#attr-value input[type=hidden],#attr-value input[type=radio]",       expect: ["attr-value-input3", "attr-value-input4", "attr-value-input6", "attr-value-input8", "attr-value-input9"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute value selector, matching attribute with value using non-ASCII characters",               selector: "[data-attr-value=中文]",                                               expect: ["attr-value-div5"], level: 2, testType: TEST_QSA | TEST_MATCH},
+
+  // - whitespace-separated list [att~=val]
+  {name: "Attribute whitespace-separated list selector, matching class attribute with value",                                  selector: "#attr-whitespace [class~=\"div1\"]",                                        expect: ["attr-whitespace-div1"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector, not matching class attribute with empty value",                        selector: "#attr-whitespace [class~=\"\"]",                                            expect: [] /*no matches*/ ,       level: 2, testType: TEST_QSA},
+  {name: "Attribute whitespace-separated list selector, not matching class attribute with partial value",                      selector: "[data-attr-whitespace~=\"div\"]",                                           expect: [] /*no matches*/ ,       level: 2, testType: TEST_QSA},
+  {name: "Attribute whitespace-separated list selector, matching custom data-* attribute with unicode escaped value",          selector: "[data-attr-whitespace~=\"\\0000e9\"]",                                      expect: ["attr-whitespace-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector, matching custom data-* attribute with escaped character",              selector: "[data-attr-whitespace\_foo~=\"\\e9\"]",                                     expect: ["attr-whitespace-div5"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with single-quoted value, matching multiple links with rel attributes", selector: "#attr-whitespace a[rel~='bookmark'],  #attr-whitespace a[rel~='nofollow']", expect: ["attr-whitespace-a1", "attr-whitespace-a2", "attr-whitespace-a3", "attr-whitespace-a5", "attr-whitespace-a7"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with double-quoted value, matching multiple links with rel attributes", selector: "#attr-whitespace a[rel~=\"bookmark\"],#attr-whitespace a[rel~='nofollow']", expect: ["attr-whitespace-a1", "attr-whitespace-a2", "attr-whitespace-a3", "attr-whitespace-a5", "attr-whitespace-a7"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with unquoted value, matching multiple links with rel attributes",      selector: "#attr-whitespace a[rel~=bookmark],    #attr-whitespace a[rel~=nofollow]",   expect: ["attr-whitespace-a1", "attr-whitespace-a2", "attr-whitespace-a3", "attr-whitespace-a5", "attr-whitespace-a7"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with double-quoted value, not matching value with space",               selector: "#attr-whitespace a[rel~=\"book mark\"]",                                    expect: [] /* no matches */,      level: 2, testType: TEST_QSA},
+  {name: "Attribute whitespace-separated list selector, matching title attribute with value using non-ASCII characters",       selector: "#attr-whitespace [title~=中文]",                                              expect: ["attr-whitespace-p1"],   level: 2, testType: TEST_QSA | TEST_MATCH},
+
+  // - hyphen-separated list     [att|=val]
+  {name: "Attribute hyphen-separated list selector, not matching unspecified lang attribute",    selector: "#attr-hyphen-div1[lang|=\"en\"]",    expect: [] /*no matches*/,    level: 2, testType: TEST_QSA},
+  {name: "Attribute hyphen-separated list selector, matching lang attribute with exact value",   selector: "#attr-hyphen-div2[lang|=\"fr\"]",    expect: ["attr-hyphen-div2"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute hyphen-separated list selector, matching lang attribute with partial value", selector: "#attr-hyphen-div3[lang|=\"en\"]",    expect: ["attr-hyphen-div3"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute hyphen-separated list selector, not matching incorrect value",               selector: "#attr-hyphen-div4[lang|=\"es-AR\"]", expect: [] /*no matches*/,    level: 2, testType: TEST_QSA},
+
+  // - substring begins-with     [att^=val] (Level 3)
+  {name: "Attribute begins with selector, matching href attributes beginning with specified substring",                             selector: "#attr-begins a[href^=\"http://www\"]", expect: ["attr-begins-a1", "attr-begins-a3"],     level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute begins with selector, matching lang attributes beginning with specified substring, ",                           selector: "#attr-begins [lang^=\"en-\"]",         expect: ["attr-begins-div2", "attr-begins-div4"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute begins with selector, not matching class attribute with empty value",                                           selector: "#attr-begins [class^=\"\"]",          expect: [] /*no matches*/,                        level: 3, testType: TEST_QSA},
+  {name: "Attribute begins with selector, not matching class attribute not beginning with specified substring",                     selector: "#attr-begins [class^=apple]",          expect: [] /*no matches*/,                        level: 3, testType: TEST_QSA},
+  {name: "Attribute begins with selector with single-quoted value, matching class attribute beginning with specified substring",    selector: "#attr-begins [class^=' apple']",       expect: ["attr-begins-p1"],                       level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute begins with selector with double-quoted value, matching class attribute beginning with specified substring",    selector: "#attr-begins [class^=\" apple\"]",     expect: ["attr-begins-p1"],                       level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute begins with selector with unquoted value, not matching class attribute not beginning with specified substring", selector: "#attr-begins [class^= apple]",         expect: [] /*no matches*/,                        level: 3, testType: TEST_QSA},
+
+  // - substring ends-with       [att$=val] (Level 3)
+  {name: "Attribute ends with selector, matching href attributes ending with specified substring",                             selector: "#attr-ends a[href$=\".org\"]",   expect: ["attr-ends-a1", "attr-ends-a3"],     level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute ends with selector, matching lang attributes ending with specified substring, ",                           selector: "#attr-ends [lang$=\"-CH\"]",     expect: ["attr-ends-div2", "attr-ends-div4"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute ends with selector, not matching class attribute with empty value",                                        selector: "#attr-ends [class$=\"\"]",       expect: [] /*no matches*/,                    level: 3, testType: TEST_QSA},
+  {name: "Attribute ends with selector, not matching class attribute not ending with specified substring",                     selector: "#attr-ends [class$=apple]",      expect: [] /*no matches*/,                    level: 3, testType: TEST_QSA},
+  {name: "Attribute ends with selector with single-quoted value, matching class attribute ending with specified substring",    selector: "#attr-ends [class$='apple ']",   expect: ["attr-ends-p1"],                     level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute ends with selector with double-quoted value, matching class attribute ending with specified substring",    selector: "#attr-ends [class$=\"apple \"]", expect: ["attr-ends-p1"],                     level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute ends with selector with unquoted value, not matching class attribute not ending with specified substring", selector: "#attr-ends [class$=apple ]",     expect: [] /*no matches*/,                    level: 3, testType: TEST_QSA},
+
+  // - substring contains        [att*=val] (Level 3)
+  {name: "Attribute contains selector, matching href attributes beginning with specified substring",                          selector: "#attr-contains a[href*=\"http://www\"]",     expect: ["attr-contains-a1", "attr-contains-a3"],     level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector, matching href attributes ending with specified substring",                             selector: "#attr-contains a[href*=\".org\"]",           expect: ["attr-contains-a1", "attr-contains-a2"],     level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector, matching href attributes containing specified substring",                              selector: "#attr-contains a[href*=\".example.\"]",      expect: ["attr-contains-a1", "attr-contains-a3"],     level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector, matching lang attributes beginning with specified substring, ",                        selector: "#attr-contains [lang*=\"en-\"]",             expect: ["attr-contains-div2", "attr-contains-div6"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector, matching lang attributes ending with specified substring, ",                           selector: "#attr-contains [lang*=\"-CH\"]",             expect: ["attr-contains-div3", "attr-contains-div5"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector, not matching class attribute with empty value",                                        selector: "#attr-contains [class*=\"\"]",               expect: [] /*no matches*/,                            level: 3, testType: TEST_QSA},
+  {name: "Attribute contains selector with single-quoted value, matching class attribute beginning with specified substring", selector: "#attr-contains [class*=' apple']",           expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with single-quoted value, matching class attribute ending with specified substring",    selector: "#attr-contains [class*='orange ']",          expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with single-quoted value, matching class attribute containing specified substring",     selector: "#attr-contains [class*='ple banana ora']",   expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with double-quoted value, matching class attribute beginning with specified substring", selector: "#attr-contains [class*=\" apple\"]",         expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with double-quoted value, matching class attribute ending with specified substring",    selector: "#attr-contains [class*=\"orange \"]",        expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with double-quoted value, matching class attribute containing specified substring",     selector: "#attr-contains [class*=\"ple banana ora\"]", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with unquoted value, matching class attribute beginning with specified substring",      selector: "#attr-contains [class*= apple]",             expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with unquoted value, matching class attribute ending with specified substring",         selector: "#attr-contains [class*=orange ]",            expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "Attribute contains selector with unquoted value, matching class attribute containing specified substring",          selector: "#attr-contains [class*= banana ]",           expect: ["attr-contains-p1"],                         level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // Pseudo-classes
+  // - :root                 (Level 3)
+  {name: ":root pseudo-class selector, matching document root element",      selector: ":root", expect: ["html"],          exclude: ["element", "fragment", "detached"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":root pseudo-class selector, not matching document root element",  selector: ":root", expect: [] /*no matches*/, exclude: ["document"],                        level: 3, testType: TEST_QSA},
+
+  // - :nth-child(n)         (Level 3)
+  // XXX write descriptions
+  {name: ":nth-child selector, matching the third child element",                              selector: "#pseudo-nth-table1 :nth-child(3)", expect: ["pseudo-nth-td3", "pseudo-nth-td9", "pseudo-nth-tr3", "pseudo-nth-td15"],                    level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-child selector, matching every third child element",                            selector: "#pseudo-nth li:nth-child(3n)",     expect: ["pseudo-nth-li3", "pseudo-nth-li6", "pseudo-nth-li9", "pseudo-nth-li12"],                    level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-child selector, matching every second child element, starting from the fourth", selector: "#pseudo-nth li:nth-child(2n+4)",   expect: ["pseudo-nth-li4", "pseudo-nth-li6", "pseudo-nth-li8", "pseudo-nth-li10", "pseudo-nth-li12"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-child selector, matching every fourth child element, starting from the third",  selector: "#pseudo-nth-p1 :nth-child(4n-1)",  expect: ["pseudo-nth-em2", "pseudo-nth-span3"],                                                       level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :nth-last-child       (Level 3)
+  {name: ":nth-last-child selector, matching the third last child element",                                           selector: "#pseudo-nth-table1 :nth-last-child(3)", expect: ["pseudo-nth-tr1", "pseudo-nth-td4", "pseudo-nth-td10", "pseudo-nth-td16"],                 level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-last-child selector, matching every third child element from the end",                                 selector: "#pseudo-nth li:nth-last-child(3n)",     expect: ["pseudo-nth-li1", "pseudo-nth-li4", "pseudo-nth-li7", "pseudo-nth-li10"],                  level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-last-child selector, matching every second child element from the end, starting from the fourth last", selector: "#pseudo-nth li:nth-last-child(2n+4)",   expect: ["pseudo-nth-li1", "pseudo-nth-li3", "pseudo-nth-li5", "pseudo-nth-li7", "pseudo-nth-li9"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-last-child selector, matching every fourth element from the end, starting from the third last",        selector: "#pseudo-nth-p1 :nth-last-child(4n-1)",  expect: ["pseudo-nth-span2", "pseudo-nth-span4"],                                                   level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :nth-of-type(n)       (Level 3)
+  {name: ":nth-of-type selector, matching the third em element",                                        selector: "#pseudo-nth-p1 em:nth-of-type(3)",      expect: ["pseudo-nth-em3"],                                                                                 level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-of-type selector, matching every second element of their type",                          selector: "#pseudo-nth-p1 :nth-of-type(2n)",       expect: ["pseudo-nth-em2", "pseudo-nth-span2", "pseudo-nth-span4", "pseudo-nth-strong2", "pseudo-nth-em4"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-of-type selector, matching every second elemetn of their type, starting from the first", selector: "#pseudo-nth-p1 span:nth-of-type(2n-1)", expect: ["pseudo-nth-span1", "pseudo-nth-span3"],                                                           level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :nth-last-of-type(n)  (Level 3)
+  {name: ":nth-last-of-type selector, matching the third last em element", selector: "#pseudo-nth-p1 em:nth-last-of-type(3)",      expect: ["pseudo-nth-em2"],                                                                                 level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-last-of-type selector, matching every second last element of their type", selector: "#pseudo-nth-p1 :nth-last-of-type(2n)",       expect: ["pseudo-nth-span1", "pseudo-nth-em1", "pseudo-nth-strong1", "pseudo-nth-em3", "pseudo-nth-span3"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":nth-last-of-type selector, matching every second last element of their type, starting from the last", selector: "#pseudo-nth-p1 span:nth-last-of-type(2n-1)", expect: ["pseudo-nth-span2", "pseudo-nth-span4"],                                                           level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :first-of-type        (Level 3)
+  {name: ":first-of-type selector, matching the first em element", selector: "#pseudo-nth-p1 em:first-of-type",      expect: ["pseudo-nth-em1"],                                           level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":first-of-type selector, matching the first of every type of element", selector: "#pseudo-nth-p1 :first-of-type",        expect: ["pseudo-nth-span1", "pseudo-nth-em1", "pseudo-nth-strong1"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":first-of-type selector, matching the first td element in each table row", selector: "#pseudo-nth-table1 tr :first-of-type", expect: ["pseudo-nth-td1", "pseudo-nth-td7", "pseudo-nth-td13"],      level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :last-of-type         (Level 3)
+  {name: ":last-of-type selector, matching the last em elemnet", selector: "#pseudo-nth-p1 em:last-of-type",      expect: ["pseudo-nth-em4"],                                           level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":last-of-type selector, matching the last of every type of element", selector: "#pseudo-nth-p1 :last-of-type",        expect: ["pseudo-nth-span4", "pseudo-nth-strong2", "pseudo-nth-em4"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":last-of-type selector, matching the last td element in each table row", selector: "#pseudo-nth-table1 tr :last-of-type", expect: ["pseudo-nth-td6", "pseudo-nth-td12", "pseudo-nth-td18"],     level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :first-child
+  {name: ":first-child pseudo-class selector, matching first child div element",          selector: "#pseudo-first-child div:first-child",                                        expect: ["pseudo-first-child-div1"],                                                          level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: ":first-child pseudo-class selector, doesn't match non-first-child elements",    selector: ".pseudo-first-child-div2:first-child, .pseudo-first-child-div3:first-child", expect: [] /*no matches*/,                                                                    level: 2, testType: TEST_QSA},
+  {name: ":first-child pseudo-class selector, matching first-child of multiple elements", selector: "#pseudo-first-child span:first-child",                                       expect: ["pseudo-first-child-span1", "pseudo-first-child-span3", "pseudo-first-child-span5"], level: 2, testType: TEST_QSA | TEST_MATCH},
+
+  // - :last-child           (Level 3)
+  {name: ":last-child pseudo-class selector, matching last child div element",           selector: "#pseudo-last-child div:last-child",                                       expect: ["pseudo-last-child-div3"],                                                        level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":last-child pseudo-class selector, doesn't match non-last-child elements",     selector: ".pseudo-last-child-div1:last-child, .pseudo-last-child-div2:first-child", expect: [] /*no matches*/,                                                                 level: 3, testType: TEST_QSA},
+  {name: ":last-child pseudo-class selector, matching first-child of multiple elements", selector: "#pseudo-last-child span:last-child",                                      expect: ["pseudo-last-child-span2", "pseudo-last-child-span4", "pseudo-last-child-span6"], level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :only-child           (Level 3)
+  {name: ":pseudo-only-child pseudo-class selector, matching all only-child elements", selector: "#pseudo-only :only-child", expect: ["pseudo-only-span1"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":pseudo-only-child pseudo-class selector, matching only-child em elements",  selector: "#pseudo-only em:only-child", expect: [] /*no matches*/,   level: 3, testType: TEST_QSA},
+
+  // - :only-of-type         (Level 3)
+  {name: ":pseudo-only-of-type pseudo-class selector, matching all elements with no siblings of the same type", selector: "#pseudo-only :only-of-type", expect: ["pseudo-only-span1", "pseudo-only-em1"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":pseudo-only-of-type pseudo-class selector, matching em elements with no siblings of the same type",  selector: "#pseudo-only em:only-of-type", expect: ["pseudo-only-em1"],                    level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :empty                (Level 3)
+  {name: ":empty pseudo-class selector, matching empty p elements",   selector: "#pseudo-empty p:empty", expect: ["pseudo-empty-p1", "pseudo-empty-p2"],                       level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":empty pseudo-class selector, matching all empty elements", selector: "#pseudo-empty :empty",  expect: ["pseudo-empty-p1", "pseudo-empty-p2", "pseudo-empty-span1"], level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :link and :visited
+  // Implementations may treat all visited links as unvisited, so these cannot be tested separately.
+  // The only guarantee is that ":link,:visited" matches the set of all visited and unvisited links and that they are individually mutually exclusive sets.
+  {name: ":link and :visited pseudo-class selectors, matching a and area elements with href attributes",        selector: "#pseudo-link :link, #pseudo-link :visited", expect: ["pseudo-link-a1", "pseudo-link-a2", "pseudo-link-area1"],                                level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: ":link and :visited pseudo-class selectors, matching no elements",                                     selector: "#head :link, #head :visited",               expect: [] /*no matches*/,                          exclude: ["element", "fragment", "detached"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: ":link and :visited pseudo-class selectors, not matching link elements with href attributes",          selector: "#head :link, #head :visited",               expect: [] /*no matches*/,                          exclude: ["document"],                        level: 1, testType: TEST_QSA},
+  {name: ":link and :visited pseudo-class selectors, chained, mutually exclusive pseudo-classes match nothing", selector: ":link:visited",                             expect: [] /*no matches*/,                          exclude: ["document"],                        level: 1, testType: TEST_QSA},
+
+  // - :target               (Level 3)
+  {name: ":target pseudo-class selector, matching the element referenced by the URL fragment identifier", selector: ":target", expect: [] /*no matches*/, exclude: ["document", "element"],  level: 3, testType: TEST_QSA},
+  {name: ":target pseudo-class selector, matching the element referenced by the URL fragment identifier", selector: ":target", expect: ["target"],        exclude: ["fragment", "detached"], level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :lang()
+  {name: ":lang pseudo-class selector, matching inherited language",                     selector: "#pseudo-lang-div1:lang(en)",    expect: ["pseudo-lang-div1"], exclude: ["detached", "fragment"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: ":lang pseudo-class selector, not matching element with no inherited language", selector: "#pseudo-lang-div1:lang(en)",    expect: [] /*no matches*/,    exclude: ["document", "element"],  level: 2, testType: TEST_QSA},
+  {name: ":lang pseudo-class selector, matching specified language with exact value",    selector: "#pseudo-lang-div2:lang(fr)",    expect: ["pseudo-lang-div2"],                                    level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: ":lang pseudo-class selector, matching specified language with partial value",  selector: "#pseudo-lang-div3:lang(en)",    expect: ["pseudo-lang-div3"],                                    level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: ":lang pseudo-class selector, not matching incorrect language",                 selector: "#pseudo-lang-div4:lang(es-AR)", expect: [] /*no matches*/,                                       level: 2, testType: TEST_QSA},
+
+  // - :enabled              (Level 3)
+  {name: ":enabled pseudo-class selector, matching all enabled form controls",  selector: "#pseudo-ui :enabled",  expect: ["pseudo-ui-input1", "pseudo-ui-input2", "pseudo-ui-input3", "pseudo-ui-input4", "pseudo-ui-input5", "pseudo-ui-input6",
+                                                                                                                           "pseudo-ui-input7", "pseudo-ui-input8", "pseudo-ui-input9", "pseudo-ui-textarea1", "pseudo-ui-button1"],    level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":enabled pseudo-class selector, not matching link elements",  selector: "#pseudo-link :enabled",  expect: [] /*no matches*/, unexpected: ["pseudo-link-a1","pseudo-link-a2","pseudo-link-a3","pseudo-link-map1","pseudo-link-area1","pseudo-link-area2"],   level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :disabled             (Level 3)
+  {name: ":disabled pseudo-class selector, matching all disabled form controls", selector: "#pseudo-ui :disabled", expect: ["pseudo-ui-input10", "pseudo-ui-input11", "pseudo-ui-input12", "pseudo-ui-input13", "pseudo-ui-input14", "pseudo-ui-input15",
+                                                                                                                           "pseudo-ui-input16", "pseudo-ui-input17", "pseudo-ui-input18", "pseudo-ui-textarea2", "pseudo-ui-button2"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":disabled pseudo-class selector, not matching link elements", selector: "#pseudo-link :disabled", expect: [] /*no matches*/, unexpected: ["pseudo-link-a1","pseudo-link-a2","pseudo-link-a3","pseudo-link-map1","pseudo-link-area1","pseudo-link-area2"], level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :checked              (Level 3)
+  {name: ":checked pseudo-class selector, matching checked radio buttons and checkboxes", selector: "#pseudo-ui :checked", expect: ["pseudo-ui-input4", "pseudo-ui-input6", "pseudo-ui-input13", "pseudo-ui-input15"],  level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :not(s)               (Level 3)
+  {name: ":not pseudo-class selector, matching ", selector: "#not>:not(div)",   expect: ["not-p1", "not-p2", "not-p3"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":not pseudo-class selector, matching ", selector: "#not * :not(:first-child)",   expect: ["not-em1", "not-em2", "not-em3"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: ":not pseudo-class selector, matching nothing", selector: ":not(*)",   expect: [] /* no matches */, level: 3, testType: TEST_QSA},
+  {name: ":not pseudo-class selector, matching nothing", selector: ":not(*|*)", expect: [] /* no matches */, level: 3, testType: TEST_QSA},
+  {name: ":not pseudo-class selector argument surrounded by spaces, matching ", selector: "#not>:not( div )",   expect: ["not-p1", "not-p2", "not-p3"], level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // Pseudo-elements
+  // - ::first-line
+  {name: ":first-line pseudo-element (one-colon syntax) selector, not matching any elements",    selector: "#pseudo-element:first-line",    expect: [] /*no matches*/, level: 2, testType: TEST_QSA},
+  {name: "::first-line pseudo-element (two-colon syntax) selector, not matching any elements",   selector: "#pseudo-element::first-line",   expect: [] /*no matches*/, level: 3, testType: TEST_QSA},
+
+  // - ::first-letter
+  {name: ":first-letter pseudo-element (one-colon syntax) selector, not matching any elements",  selector: "#pseudo-element:first-letter",  expect: [] /*no matches*/, level: 2, testType: TEST_QSA},
+  {name: "::first-letter pseudo-element (two-colon syntax) selector, not matching any elements", selector: "#pseudo-element::first-letter", expect: [] /*no matches*/, level: 3, testType: TEST_QSA},
+
+  // - ::before
+  {name: ":before pseudo-element (one-colon syntax) selector, not matching any elements",        selector: "#pseudo-element:before",        expect: [] /*no matches*/, level: 2, testType: TEST_QSA},
+  {name: "::before pseudo-element (two-colon syntax) selector, not matching any elements",       selector: "#pseudo-element::before",       expect: [] /*no matches*/, level: 3, testType: TEST_QSA},
+
+  // - ::after
+  {name: ":after pseudo-element (one-colon syntax) selector, not matching any elements",         selector: "#pseudo-element:after",         expect: [] /*no matches*/, level: 2, testType: TEST_QSA},
+  {name: "::after pseudo-element (two-colon syntax) selector, not matching any elements",        selector: "#pseudo-element::after",        expect: [] /*no matches*/, level: 3, testType: TEST_QSA},
+
+  // Class Selectors
+  {name: "Class selector, matching element with specified class",                                           selector: ".class-p",                expect: ["class-p1","class-p2", "class-p3"],                                              level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, chained, matching only elements with all specified classes",                      selector: "#class .apple.orange.banana",    expect: ["class-div1", "class-div2", "class-p4", "class-div3", "class-p6", "class-div4"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class Selector, chained, with type selector",                                                     selector: "div.apple.banana.orange", expect: ["class-div1", "class-div2", "class-div3", "class-div4"],                         level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching element with class value using non-ASCII characters (1)",                selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci",             expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching multiple elements with class value using non-ASCII characters",          selector: ".\u53F0\u5317",                     expect: ["class-span1","class-span2"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters (1)", selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci.\u53F0\u5317",          expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching element with class with escaped character",                              selector: ".foo\\:bar",              expect: ["class-span3"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching element with class with escaped character",                              selector: ".test\\.foo\\[5\\]bar",   expect: ["class-span4"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+
+  // ID Selectors
+  {name: "ID selector, matching element with specified id",           selector: "#id #id-div1",              expect: ["id-div1"],            level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, chained, matching element with specified id",  selector: "#id-div1, #id-div1",        expect: ["id-div1"],            level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, chained, matching element with specified id",  selector: "#id-div1, #id-div2",        expect: ["id-div1", "id-div2"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID Selector, chained, with type selector",                  selector: "div#id-div1, div#id-div2",  expect: ["id-div1", "id-div2"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, not matching non-existent descendant",         selector: "#id #none",                 expect: [] /*no matches*/,      level: 1, testType: TEST_QSA},
+  {name: "ID selector, not matching non-existent ancestor",           selector: "#none #id-div1",            expect: [] /*no matches*/,      level: 1, testType: TEST_QSA},
+  {name: "ID selector, matching multiple elements with duplicate id", selector: "#id-li-duplicate",          expect: ["id-li-duplicate", "id-li-duplicate", "id-li-duplicate", "id-li-duplicate"], level: 1, testType: TEST_QSA | TEST_MATCH},
+
+  {name: "ID selector, matching id value using non-ASCII characters (1)",    selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci",           expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci"],       level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters (2)",    selector: "#\u53F0\u5317",                   expect: ["\u53F0\u5317"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id values using non-ASCII characters (1)", selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci, #\u53F0\u5317",      expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci", "\u53F0\u5317"], level: 1, testType: TEST_QSA | TEST_MATCH},
+
+  // XXX runMatchesTest() in level2-lib.js can't handle this because obtaining the expected nodes requires escaping characters when generating the selector from 'expect' values
+  {name: "ID selector, matching element with id with escaped character", selector: "#\\#foo\\:bar",         expect: ["#foo:bar"],         level: 1, testType: TEST_QSA},
+  {name: "ID selector, matching element with id with escaped character", selector: "#test\\.foo\\[5\\]bar", expect: ["test.foo[5]bar"],   level: 1, testType: TEST_QSA},
+
+  // Namespaces
+  // XXX runMatchesTest() in level2-lib.js can't handle these because non-HTML elements don't have a recognised id
+  {name: "Namespace selector, matching element with any namespace",        selector: "#any-namespace *|div", expect: ["any-namespace-div1", "any-namespace-div2", "any-namespace-div3", "any-namespace-div4"], level: 3, testType: TEST_QSA},
+  {name: "Namespace selector, matching div elements in no namespace only", selector: "#no-namespace |div",   expect: ["no-namespace-div3"], level: 3, testType: TEST_QSA},
+  {name: "Namespace selector, matching any elements in no namespace only", selector: "#no-namespace |*",     expect: ["no-namespace-div3"], level: 3, testType: TEST_QSA},
+
+  // Combinators
+  // - Descendant combinator ' '
+  {name: "Descendant combinator, matching element that is a descendant of an element with id",                 selector: "#descendant div",                   expect: ["descendant-div1", "descendant-div2", "descendant-div3", "descendant-div4"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Descendant combinator, matching element with id that is a descendant of an element",                 selector: "body #descendant-div1",             expect: ["descendant-div1"], exclude: ["detached", "fragment"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Descendant combinator, matching element with id that is a descendant of an element",                 selector: "div #descendant-div1",              expect: ["descendant-div1"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Descendant combinator, matching element with id that is a descendant of an element with id",         selector: "#descendant #descendant-div2",      expect: ["descendant-div2"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Descendant combinator, matching element with class that is a descendant of an element with id",      selector: "#descendant .descendant-div2",      expect: ["descendant-div2"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Descendant combinator, matching element with class that is a descendant of an element with class",   selector: ".descendant-div1 .descendant-div3", expect: ["descendant-div3"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Descendant combinator, not matching element with id that is not a descendant of an element with id", selector: "#descendant-div1 #descendant-div4", expect: [] /*no matches*/,                                      level: 1, testType: TEST_QSA},
+  {name: "Descendant combinator, whitespace characters",                                                       selector: "#descendant\t\r\n#descendant-div2", expect: ["descendant-div2"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+
+  /* The future of this combinator is uncertain, see
+   * https://github.com/w3c/csswg-drafts/issues/641
+   * These tests are commented out until a final decision is made on whether to
+   * keep the feature in the spec.
+   */
+
+  // // - Descendant combinator '>>'
+  // {name: "Descendant combinator '>>', matching element that is a descendant of an element with id",                 selector: "#descendant>>div",                   expect: ["descendant-div1", "descendant-div2", "descendant-div3", "descendant-div4"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with id that is a descendant of an element",                 selector: "body>>#descendant-div1",             expect: ["descendant-div1"], exclude: ["detached", "fragment"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with id that is a descendant of an element",                 selector: "div>>#descendant-div1",              expect: ["descendant-div1"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with id that is a descendant of an element with id",         selector: "#descendant>>#descendant-div2",      expect: ["descendant-div2"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with class that is a descendant of an element with id",      selector: "#descendant>>.descendant-div2",      expect: ["descendant-div2"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with class that is a descendant of an element with class",   selector: ".descendant-div1>>.descendant-div3", expect: ["descendant-div3"],                                    level: 1, testType: TEST_QSA | TEST_MATCH},
+  // {name: "Descendant combinator '>>', not matching element with id that is not a descendant of an element with id", selector: "#descendant-div1>>#descendant-div4", expect: [] /*no matches*/,                                      level: 1, testType: TEST_QSA},
+
+  // - Child combinator '>'
+  {name: "Child combinator, matching element that is a child of an element with id",                       selector: "#child>div",                          expect: ["child-div1", "child-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, matching element with id that is a child of an element",                       selector: "div>#child-div1",                     expect: ["child-div1"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, matching element with id that is a child of an element with id",               selector: "#child>#child-div1",                  expect: ["child-div1"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, matching element with id that is a child of an element with class",            selector: "#child-div1>.child-div2",             expect: ["child-div2"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, matching element with class that is a child of an element with class",         selector: ".child-div1>.child-div2",             expect: ["child-div2"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, not matching element with id that is not a child of an element with id",       selector: "#child>#child-div3",                  expect: [] /*no matches*/,            level: 2, testType: TEST_QSA},
+  {name: "Child combinator, not matching element with id that is not a child of an element with class",    selector: "#child-div1>.child-div3",             expect: [] /*no matches*/,            level: 2, testType: TEST_QSA},
+  {name: "Child combinator, not matching element with class that is not a child of an element with class", selector: ".child-div1>.child-div3",             expect: [] /*no matches*/,            level: 2, testType: TEST_QSA},
+  {name: "Child combinator, surrounded by whitespace",                                                     selector: "#child-div1\t\r\n>\t\r\n#child-div2", expect: ["child-div2"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, whitespace after",                                                             selector: "#child-div1>\t\r\n#child-div2",       expect: ["child-div2"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, whitespace before",                                                            selector: "#child-div1\t\r\n>#child-div2",       expect: ["child-div2"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Child combinator, no whitespace",                                                                selector: "#child-div1>#child-div2",             expect: ["child-div2"],               level: 2, testType: TEST_QSA | TEST_MATCH},
+
+  // - Adjacent sibling combinator '+'
+  {name: "Adjacent sibling combinator, matching element that is an adjacent sibling of an element with id",                 selector: "#adjacent-div2+div",                                         expect: ["adjacent-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with id that is an adjacent sibling of an element",                 selector: "div+#adjacent-div4",                                         expect: ["adjacent-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with id that is an adjacent sibling of an element with id",         selector: "#adjacent-div2+#adjacent-div4",                              expect: ["adjacent-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with class that is an adjacent sibling of an element with id",      selector: "#adjacent-div2+.adjacent-div4",                              expect: ["adjacent-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with class that is an adjacent sibling of an element with class",   selector: ".adjacent-div2+.adjacent-div4",                              expect: ["adjacent-div4"], level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching p element that is an adjacent sibling of a div element",                    selector: "#adjacent div+p",                                            expect: ["adjacent-p2"],   level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, not matching element with id that is not an adjacent sibling of an element with id", selector: "#adjacent-div2+#adjacent-p2, #adjacent-div2+#adjacent-div1", expect: [] /*no matches*/, level: 2, testType: TEST_QSA},
+  {name: "Adjacent sibling combinator, surrounded by whitespace",                                                           selector: "#adjacent-p2\t\r\n+\t\r\n#adjacent-p3",                      expect: ["adjacent-p3"],   level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, whitespace after",                                                                   selector: "#adjacent-p2+\t\r\n#adjacent-p3",                            expect: ["adjacent-p3"],   level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, whitespace before",                                                                  selector: "#adjacent-p2\t\r\n+#adjacent-p3",                            expect: ["adjacent-p3"],   level: 2, testType: TEST_QSA | TEST_MATCH},
+  {name: "Adjacent sibling combinator, no whitespace",                                                                      selector: "#adjacent-p2+#adjacent-p3",                                  expect: ["adjacent-p3"],   level: 2, testType: TEST_QSA | TEST_MATCH},
+
+  // - General sibling combinator ~ (Level 3)
+  {name: "General sibling combinator, matching element that is a sibling of an element with id",                    selector: "#sibling-div2~div",                                        expect: ["sibling-div4", "sibling-div6"], level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, matching element with id that is a sibling of an element",                    selector: "div~#sibling-div4",                                        expect: ["sibling-div4"],                 level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, matching element with id that is a sibling of an element with id",            selector: "#sibling-div2~#sibling-div4",                              expect: ["sibling-div4"],                 level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, matching element with class that is a sibling of an element with id",         selector: "#sibling-div2~.sibling-div",                               expect: ["sibling-div4", "sibling-div6"],                 level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, matching p element that is a sibling of a div element",                       selector: "#sibling div~p",                                           expect: ["sibling-p2", "sibling-p3"],                   level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, not matching element with id that is not a sibling after a p element",        selector: "#sibling>p~div",                                           expect: [] /*no matches*/,                level: 3, testType: TEST_QSA},
+  {name: "General sibling combinator, not matching element with id that is not a sibling after an element with id", selector: "#sibling-div2~#sibling-div3, #sibling-div2~#sibling-div1", expect: [] /*no matches*/,                level: 3, testType: TEST_QSA},
+  {name: "General sibling combinator, surrounded by whitespace",                                                    selector: "#sibling-p2\t\r\n~\t\r\n#sibling-p3",                      expect: ["sibling-p3"],                   level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, whitespace after",                                                            selector: "#sibling-p2~\t\r\n#sibling-p3",                            expect: ["sibling-p3"],                   level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, whitespace before",                                                           selector: "#sibling-p2\t\r\n~#sibling-p3",                            expect: ["sibling-p3"],                   level: 3, testType: TEST_QSA | TEST_MATCH},
+  {name: "General sibling combinator, no whitespace",                                                               selector: "#sibling-p2~#sibling-p3",                                  expect: ["sibling-p3"],                   level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // Group of selectors (comma)
+  {name: "Syntax, group of selectors separator, surrounded by whitespace", selector: "#group em\t\r \n,\t\r \n#group strong", expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Syntax, group of selectors separator, whitespace after",         selector: "#group em,\t\r\n#group strong",         expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Syntax, group of selectors separator, whitespace before",        selector: "#group em\t\r\n,#group strong",         expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Syntax, group of selectors separator, no whitespace",            selector: "#group em,#group strong",               expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_QSA | TEST_MATCH},
+
+  // ::slotted (shouldn't match anything, but is a valid selector)
+  {name: "Slotted selector", selector: "::slotted(foo)", expect: [], level: 3, testType: TEST_QSA},
+  {name: "Slotted selector (no matching closing paren)", selector: "::slotted(foo", expect: [], level: 3, testType: TEST_QSA},
+];
+
+
+/*
+ * These selectors are intended to be used with the find(), findAll() and matches() methods.  Expected results
+ * should be determined under the assumption that :scope will be prepended to the selector where appropriate,
+ * in accordance with the specification.
+ *
+ * All of these should be valid relative selectors, expected to match zero or more elements in the document.
+ * None should throw any errors.
+ *
+ *   name:      A descriptive name of the selector being tested
+ *
+ *   selector:  The selector to test
+ *
+ *   ctx:       A selector to obtain the context object to use for tests invoking context.find(),
+ *              and to use as a single reference node for tests invoking document.find().
+ *              Note: context = root.querySelector(ctx);
+ *
+ *   ref:       A selector to obtain the reference nodes to be used for the selector.
+ *              Note: If root is the document or an in-document element:
+ *                      refNodes = document.querySelectorAll(ref);
+ *                    Otherwise, if root is a fragment or detached element:
+ *                      refNodes = root.querySelectorAll(ref);
+ *
+ *   expect:    A list of IDs of the elements expected to be matched. List must be given in tree order.
+ *
+ *   unexpected: A list of IDs of some elements that are not expected to match the given selector.
+ *               This is used to verify that unexpected.matches(selector, refNode) does not match.
+ *
+ *   exclude:   An array of contexts to exclude from testing. The valid values are:
+ *              ["document", "element", "fragment", "detached", "html", "xhtml"]
+ *              The "html" and "xhtml" values represent the type of document being queried. These are useful
+ *              for tests that are affected by differences between HTML and XML, such as case sensitivity.
+ *
+ *   level:     An integer indicating the CSS or Selectors level in which the selector being tested was introduced.
+ *
+ *   testType:  A bit-mapped flag indicating the type of test.
+ *
+ * The test function for these tests accepts a specified root node, on which the methods will be invoked during the tests.
+ *
+ * Based on whether either 'context' or 'refNodes', or both, are specified the tests will execute the following methods:
+ *
+ * Where testType is TEST_FIND:
+ *
+ * context.findAll(selector, refNodes)
+ * context.findAll(selector)        // Only if refNodes is not specified
+ * root.findAll(selector, context)  // Only if refNodes is not specified
+ * root.findAll(selector, refNodes) // Only if context is not specified
+ * root.findAll(selector)           // Only if neither context nor refNodes is specified
+ *
+ * Where testType is TEST_QSA
+ *
+ * context.querySelectorAll(selector)
+ * root.querySelectorAll(selector)  // Only if neither context nor refNodes is specified
+ *
+ * Equivalent tests will be run for .find() as well.
+ * Note: Do not specify a testType of TEST_QSA where either implied :scope or explicit refNodes
+ * are required.
+ *
+ * Where testType is TEST_MATCH:
+ * For each expected result given, within the specified root:
+ *
+ * expect.matches(selector, context)    // Only where refNodes is not specified
+ * expect.matches(selector, refNodes)
+ * expect.matches(selector)             // Only if neither context nor refNodes is specified
+ *
+ * The tests involving refNodes for both find(), findAll() and matches() will each be run by passing the
+ * collection as a NodeList, an Array and, if there is only a single element, an Element node.
+ *
+ * Note: Interactive pseudo-classes (:active :hover and :focus) have not been tested in this test suite.
+ */
+
+var scopedSelectors = [
+  //{name: "", selector: "", ctx: "", ref: "", expect: [], level: 1, testType: TEST_FIND | TEST_MATCH},
+
+  // Attribute Selectors
+  // - presence                  [att]
+  {name: "Attribute presence selector, matching align attribute with value",                    selector: ".attr-presence-div1[align]",                             ctx: "#attr-presence", expect: ["attr-presence-div1"],                                             level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute presence selector, matching align attribute with empty value",              selector: ".attr-presence-div2[align]",                             ctx: "#attr-presence", expect: ["attr-presence-div2"],                                             level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute presence selector, matching title attribute, case insensitivity",           selector: "[TiTlE]",                                                ctx: "#attr-presence", expect: ["attr-presence-a1", "attr-presence-span1"], exclude: ["xhtml"],    level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute presence selector, not matching title attribute, case sensitivity",         selector: "[TiTlE]",                                                ctx: "#attr-presence", expect: [],                                          exclude: ["html"],     level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute presence selector, matching custom data-* attribute",                       selector: "[data-attr-presence]",                                   ctx: "#attr-presence", expect: ["attr-presence-pre1", "attr-presence-blockquote1"],                level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute presence selector, not matching attribute with similar name",               selector: ".attr-presence-div3[align], .attr-presence-div4[align]", ctx: "#attr-presence", expect: [] /*no matches*/,                                                  level: 2, testType: TEST_FIND},
+  {name: "Attribute presence selector, matching attribute with non-ASCII characters",           selector: "ul[data-中文]",                                            ctx: "#attr-presence", expect: ["attr-presence-ul1"],                                              level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute presence selector, not matching default option without selected attribute", selector: "#attr-presence-select1 option[selected]",                ctx: "#attr-presence", expect: [] /* no matches */,                                                level: 2, testType: TEST_FIND},
+  {name: "Attribute presence selector, matching option with selected attribute",                selector: "#attr-presence-select2 option[selected]",                ctx: "#attr-presence", expect: ["attr-presence-select2-option4"],                                  level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute presence selector, matching multiple options with selected attributes",     selector: "#attr-presence-select3 option[selected]",                ctx: "#attr-presence", expect: ["attr-presence-select3-option2", "attr-presence-select3-option3"], level: 2, testType: TEST_FIND | TEST_MATCH},
+
+  // - value                     [att=val]
+  {name: "Attribute value selector, matching align attribute with value",                                    selector: "[align=\"center\"]",                                     ctx: "#attr-value", expect: ["attr-value-div1"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute value selector, matching align attribute with empty value",                              selector: "[align=\"\"]",                                           ctx: "#attr-value", expect: ["attr-value-div2"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute value selector, not matching align attribute with partial value",                        selector: "[align=\"c\"]",                                          ctx: "#attr-value", expect: [] /*no matches*/,   level: 2, testType: TEST_FIND},
+  {name: "Attribute value selector, not matching align attribute with incorrect value",                      selector: "[align=\"centera\"]",                                    ctx: "#attr-value", expect: [] /*no matches*/,   level: 2, testType: TEST_FIND},
+  {name: "Attribute value selector, matching custom data-* attribute with unicode escaped value",            selector: "[data-attr-value=\"\\e9\"]",                             ctx: "#attr-value", expect: ["attr-value-div3"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute value selector, matching custom data-* attribute with escaped character",                selector: "[data-attr-value\_foo=\"\\e9\"]",                        ctx: "#attr-value", expect: ["attr-value-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute value selector with single-quoted value, matching multiple inputs with type attributes", selector: "input[type='hidden'],#attr-value input[type='radio']",   ctx: "#attr-value", expect: ["attr-value-input3", "attr-value-input4", "attr-value-input6", "attr-value-input8", "attr-value-input9"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute value selector with double-quoted value, matching multiple inputs with type attributes", selector: "input[type=\"hidden\"],#attr-value input[type='radio']", ctx: "#attr-value", expect: ["attr-value-input3", "attr-value-input4", "attr-value-input6", "attr-value-input8", "attr-value-input9"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute value selector with unquoted value, matching multiple inputs with type attributes",      selector: "input[type=hidden],#attr-value input[type=radio]",       ctx: "#attr-value", expect: ["attr-value-input3", "attr-value-input4", "attr-value-input6", "attr-value-input8", "attr-value-input9"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute value selector, matching attribute with value using non-ASCII characters",               selector: "[data-attr-value=中文]",                                   ctx: "#attr-value", expect: ["attr-value-div5"], level: 2, testType: TEST_FIND | TEST_MATCH},
+
+  // - whitespace-separated list [att~=val]
+  {name: "Attribute whitespace-separated list selector, matching class attribute with value",                                  selector: "[class~=\"div1\"]",                                        ctx: "#attr-whitespace", expect: ["attr-whitespace-div1"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector, not matching class attribute with empty value",                        selector: "[class~=\"\"]",                                            ctx: "#attr-whitespace", expect: [] /*no matches*/ ,       level: 2, testType: TEST_FIND},
+  {name: "Attribute whitespace-separated list selector, not matching class attribute with partial value",                      selector: "[data-attr-whitespace~=\"div\"]",                                           ctx: "#attr-whitespace", expect: [] /*no matches*/ ,       level: 2, testType: TEST_FIND},
+  {name: "Attribute whitespace-separated list selector, matching custom data-* attribute with unicode escaped value",          selector: "[data-attr-whitespace~=\"\\0000e9\"]",                                      ctx: "#attr-whitespace", expect: ["attr-whitespace-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector, matching custom data-* attribute with escaped character",              selector: "[data-attr-whitespace\_foo~=\"\\e9\"]",                                     ctx: "#attr-whitespace", expect: ["attr-whitespace-div5"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with single-quoted value, matching multiple links with rel attributes", selector: "a[rel~='bookmark'],  #attr-whitespace a[rel~='nofollow']", ctx: "#attr-whitespace", expect: ["attr-whitespace-a1", "attr-whitespace-a2", "attr-whitespace-a3", "attr-whitespace-a5", "attr-whitespace-a7"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with double-quoted value, matching multiple links with rel attributes", selector: "a[rel~=\"bookmark\"],#attr-whitespace a[rel~='nofollow']", ctx: "#attr-whitespace", expect: ["attr-whitespace-a1", "attr-whitespace-a2", "attr-whitespace-a3", "attr-whitespace-a5", "attr-whitespace-a7"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with unquoted value, matching multiple links with rel attributes",      selector: "a[rel~=bookmark],    #attr-whitespace a[rel~=nofollow]",   ctx: "#attr-whitespace", expect: ["attr-whitespace-a1", "attr-whitespace-a2", "attr-whitespace-a3", "attr-whitespace-a5", "attr-whitespace-a7"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute whitespace-separated list selector with double-quoted value, not matching value with space",               selector: "a[rel~=\"book mark\"]",                                    ctx: "#attr-whitespace", expect: [] /* no matches */,      level: 2, testType: TEST_FIND},
+  {name: "Attribute whitespace-separated list selector, matching title attribute with value using non-ASCII characters",       selector: "[title~=中文]",                                              ctx: "#attr-whitespace", expect: ["attr-whitespace-p1"],   level: 2, testType: TEST_FIND | TEST_MATCH},
+
+  // - hyphen-separated list     [att|=val]
+  {name: "Attribute hyphen-separated list selector, not matching unspecified lang attribute",    selector: "#attr-hyphen-div1[lang|=\"en\"]",    ctx: "#attr-hyphen", expect: [] /*no matches*/,    level: 2, testType: TEST_FIND},
+  {name: "Attribute hyphen-separated list selector, matching lang attribute with exact value",   selector: "#attr-hyphen-div2[lang|=\"fr\"]",    ctx: "#attr-hyphen", expect: ["attr-hyphen-div2"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute hyphen-separated list selector, matching lang attribute with partial value", selector: "#attr-hyphen-div3[lang|=\"en\"]",    ctx: "#attr-hyphen", expect: ["attr-hyphen-div3"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute hyphen-separated list selector, not matching incorrect value",               selector: "#attr-hyphen-div4[lang|=\"es-AR\"]", ctx: "#attr-hyphen", expect: [] /*no matches*/,    level: 2, testType: TEST_FIND},
+
+  // - substring begins-with     [att^=val] (Level 3)
+  {name: "Attribute begins with selector, matching href attributes beginning with specified substring",                             selector: "a[href^=\"http://www\"]", ctx: "#attr-begins", expect: ["attr-begins-a1", "attr-begins-a3"],     level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute begins with selector, matching lang attributes beginning with specified substring, ",                           selector: "[lang^=\"en-\"]",         ctx: "#attr-begins", expect: ["attr-begins-div2", "attr-begins-div4"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute begins with selector, not matching class attribute with empty value",                                           selector: "[class^=\"\"]",          ctx: "#attr-begins", expect: [] /*no matches*/,                        level: 3, testType: TEST_FIND},
+  {name: "Attribute begins with selector, not matching class attribute not beginning with specified substring",                     selector: "[class^=apple]",          ctx: "#attr-begins", expect: [] /*no matches*/,                        level: 3, testType: TEST_FIND},
+  {name: "Attribute begins with selector with single-quoted value, matching class attribute beginning with specified substring",    selector: "[class^=' apple']",       ctx: "#attr-begins", expect: ["attr-begins-p1"],                       level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute begins with selector with double-quoted value, matching class attribute beginning with specified substring",    selector: "[class^=\" apple\"]",     ctx: "#attr-begins", expect: ["attr-begins-p1"],                       level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute begins with selector with unquoted value, not matching class attribute not beginning with specified substring", selector: "[class^= apple]",         ctx: "#attr-begins", expect: [] /*no matches*/,                        level: 3, testType: TEST_FIND},
+
+  // - substring ends-with       [att$=val] (Level 3)
+  {name: "Attribute ends with selector, matching href attributes ending with specified substring",                             selector: "a[href$=\".org\"]",   ctx: "#attr-ends", expect: ["attr-ends-a1", "attr-ends-a3"],     level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute ends with selector, matching lang attributes ending with specified substring, ",                           selector: "[lang$=\"-CH\"]",     ctx: "#attr-ends", expect: ["attr-ends-div2", "attr-ends-div4"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute ends with selector, not matching class attribute with empty value",                                        selector: "[class$=\"\"]",       ctx: "#attr-ends", expect: [] /*no matches*/,                    level: 3, testType: TEST_FIND},
+  {name: "Attribute ends with selector, not matching class attribute not ending with specified substring",                     selector: "[class$=apple]",      ctx: "#attr-ends", expect: [] /*no matches*/,                    level: 3, testType: TEST_FIND},
+  {name: "Attribute ends with selector with single-quoted value, matching class attribute ending with specified substring",    selector: "[class$='apple ']",   ctx: "#attr-ends", expect: ["attr-ends-p1"],                     level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute ends with selector with double-quoted value, matching class attribute ending with specified substring",    selector: "[class$=\"apple \"]", ctx: "#attr-ends", expect: ["attr-ends-p1"],                     level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute ends with selector with unquoted value, not matching class attribute not ending with specified substring", selector: "[class$=apple ]",     ctx: "#attr-ends", expect: [] /*no matches*/,                    level: 3, testType: TEST_FIND},
+
+  // - substring contains        [att*=val] (Level 3)
+  {name: "Attribute contains selector, matching href attributes beginning with specified substring",                          selector: "a[href*=\"http://www\"]",     ctx: "#attr-contains", expect: ["attr-contains-a1", "attr-contains-a3"],     level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector, matching href attributes ending with specified substring",                             selector: "a[href*=\".org\"]",           ctx: "#attr-contains", expect: ["attr-contains-a1", "attr-contains-a2"],     level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector, matching href attributes containing specified substring",                              selector: "a[href*=\".example.\"]",      ctx: "#attr-contains", expect: ["attr-contains-a1", "attr-contains-a3"],     level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector, matching lang attributes beginning with specified substring, ",                        selector: "[lang*=\"en-\"]",             ctx: "#attr-contains", expect: ["attr-contains-div2", "attr-contains-div6"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector, matching lang attributes ending with specified substring, ",                           selector: "[lang*=\"-CH\"]",             ctx: "#attr-contains", expect: ["attr-contains-div3", "attr-contains-div5"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector, not matching class attribute with empty value",                                        selector: "[class*=\"\"]",               ctx: "#attr-contains", expect: [] /*no matches*/,                            level: 3, testType: TEST_FIND},
+  {name: "Attribute contains selector with single-quoted value, matching class attribute beginning with specified substring", selector: "[class*=' apple']",           ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with single-quoted value, matching class attribute ending with specified substring",    selector: "[class*='orange ']",          ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with single-quoted value, matching class attribute containing specified substring",     selector: "[class*='ple banana ora']",   ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with double-quoted value, matching class attribute beginning with specified substring", selector: "[class*=\" apple\"]",         ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with double-quoted value, matching class attribute ending with specified substring",    selector: "[class*=\"orange \"]",        ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with double-quoted value, matching class attribute containing specified substring",     selector: "[class*=\"ple banana ora\"]", ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with unquoted value, matching class attribute beginning with specified substring",      selector: "[class*= apple]",             ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with unquoted value, matching class attribute ending with specified substring",         selector: "[class*=orange ]",            ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "Attribute contains selector with unquoted value, matching class attribute containing specified substring",          selector: "[class*= banana ]",           ctx: "#attr-contains", expect: ["attr-contains-p1"],                         level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // Pseudo-classes
+  // - :root                 (Level 3)
+  {name: ":root pseudo-class selector, matching document root element",      selector: ":root",               expect: ["html"],          exclude: ["element", "fragment", "detached"], level: 3, testType: TEST_FIND},
+  {name: ":root pseudo-class selector, not matching document root element",  selector: ":root",               expect: [] /*no matches*/, exclude: ["document"],                        level: 3, testType: TEST_FIND},
+  {name: ":root pseudo-class selector, not matching document root element",  selector: ":root", ctx: "#html", expect: [] /*no matches*/, exclude: ["fragment", "detached"],            level: 3, testType: TEST_FIND},
+
+  // - :nth-child(n)         (Level 3)
+  {name: ":nth-child selector, matching the third child element",                                               selector: ":nth-child(3)",                    ctx: "#pseudo-nth-table1", expect: ["pseudo-nth-td3", "pseudo-nth-td9", "pseudo-nth-tr3", "pseudo-nth-td15"],             level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-child selector, matching every third child element",                                             selector: "li:nth-child(3n)",                 ctx: "#pseudo-nth", expect: ["pseudo-nth-li3", "pseudo-nth-li6", "pseudo-nth-li9", "pseudo-nth-li12"],                    level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-child selector, matching every second child element, starting from the fourth",                  selector: "li:nth-child(2n+4)",               ctx: "#pseudo-nth", expect: ["pseudo-nth-li4", "pseudo-nth-li6", "pseudo-nth-li8", "pseudo-nth-li10", "pseudo-nth-li12"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-child selector, matching every second child element, starting from the fourth, with whitespace", selector: "li:nth-child(2n \t\r\n+ \t\r\n4)", ctx: "#pseudo-nth", expect: ["pseudo-nth-li4", "pseudo-nth-li6", "pseudo-nth-li8", "pseudo-nth-li10", "pseudo-nth-li12"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-child selector, matching every fourth child element, starting from the third",                   selector: ":nth-child(4n-1)",                 ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-em2", "pseudo-nth-span3"],                                                    level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-child selector, matching every fourth child element, starting from the third, with whitespace",  selector: ":nth-child(4n \t\r\n- \t\r\n1)",   ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-em2", "pseudo-nth-span3"],                                                    level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-child selector used twice, matching ",                                                           selector: ":nth-child(1) :nth-child(1)",      ctx: "#pseudo-nth", expect: ["pseudo-nth-table1", "pseudo-nth-tr1"],                                                      level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :nth-last-child       (Level 3)
+  {name: ":nth-last-child selector, matching the third last child element",                                           selector: ":nth-last-child(3)",      ctx: "#pseudo-nth-table1", expect: ["pseudo-nth-tr1", "pseudo-nth-td4", "pseudo-nth-td10", "pseudo-nth-td16"],         level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-last-child selector, matching every third child element from the end",                                 selector: "li:nth-last-child(3n)",   ctx: "pseudo-nth", expect: ["pseudo-nth-li1", "pseudo-nth-li4", "pseudo-nth-li7", "pseudo-nth-li10"],                  level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-last-child selector, matching every second child element from the end, starting from the fourth last", selector: "li:nth-last-child(2n+4)", ctx: "pseudo-nth", expect: ["pseudo-nth-li1", "pseudo-nth-li3", "pseudo-nth-li5", "pseudo-nth-li7", "pseudo-nth-li9"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-last-child selector, matching every fourth element from the end, starting from the third last",        selector: ":nth-last-child(4n-1)",   ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-span2", "pseudo-nth-span4"],                                               level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :nth-of-type(n)       (Level 3)
+  {name: ":nth-of-type selector, matching the third em element",                                        selector: "em:nth-of-type(3)",      ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-em3"],                                                                                 level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-of-type selector, matching every second element of their type",                          selector: ":nth-of-type(2n)",       ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-em2", "pseudo-nth-span2", "pseudo-nth-span4", "pseudo-nth-strong2", "pseudo-nth-em4"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-of-type selector, matching every second elemetn of their type, starting from the first", selector: "span:nth-of-type(2n-1)", ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-span1", "pseudo-nth-span3"],                                                           level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :nth-last-of-type(n)  (Level 3)
+  {name: ":nth-last-of-type selector, matching the third last em element",                                       selector: "em:nth-last-of-type(3)",      ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-em2"],                                                                                 level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-last-of-type selector, matching every second last element of their type",                         selector: ":nth-last-of-type(2n)",       ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-span1", "pseudo-nth-em1", "pseudo-nth-strong1", "pseudo-nth-em3", "pseudo-nth-span3"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":nth-last-of-type selector, matching every second last element of their type, starting from the last", selector: "span:nth-last-of-type(2n-1)", ctx: "#pseudo-nth-p1", expect: ["pseudo-nth-span2", "pseudo-nth-span4"],                                                           level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :first-of-type        (Level 3)
+  {name: ":first-of-type selector, matching the first em element",                   selector: "em:first-of-type",  ctx: "#pseudo-nth-p1",     expect: ["pseudo-nth-em1"],                                           level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":first-of-type selector, matching the first of every type of element",     selector: ":first-of-type",    ctx: "#pseudo-nth-p1",     expect: ["pseudo-nth-span1", "pseudo-nth-em1", "pseudo-nth-strong1"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":first-of-type selector, matching the first td element in each table row", selector: "tr :first-of-type", ctx: "#pseudo-nth-table1", expect: ["pseudo-nth-td1", "pseudo-nth-td7", "pseudo-nth-td13"],      level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :last-of-type         (Level 3)
+  {name: ":last-of-type selector, matching the last em elemnet",                     selector: "em:last-of-type",   ctx: "#pseudo-nth-p1",     expect: ["pseudo-nth-em4"],                                           level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":last-of-type selector, matching the last of every type of element",       selector: ":last-of-type",     ctx: "#pseudo-nth-p1",     expect: ["pseudo-nth-span4", "pseudo-nth-strong2", "pseudo-nth-em4"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":last-of-type selector, matching the last td element in each table row",   selector: "tr :last-of-type",  ctx: "#pseudo-nth-table1", expect: ["pseudo-nth-td6", "pseudo-nth-td12", "pseudo-nth-td18"],     level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :first-child
+  {name: ":first-child pseudo-class selector, matching first child div element",          selector: "div:first-child",                                                            ctx: "#pseudo-first-child", expect: ["pseudo-first-child-div1"],                                                          level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: ":first-child pseudo-class selector, doesn't match non-first-child elements",    selector: ".pseudo-first-child-div2:first-child, .pseudo-first-child-div3:first-child", ctx: "#pseudo-first-child", expect: [] /*no matches*/,                                                                    level: 2, testType: TEST_FIND},
+  {name: ":first-child pseudo-class selector, matching first-child of multiple elements", selector: "span:first-child",                                                           ctx: "#pseudo-first-child", expect: ["pseudo-first-child-span1", "pseudo-first-child-span3", "pseudo-first-child-span5"], level: 2, testType: TEST_FIND | TEST_MATCH},
+
+  // - :last-child           (Level 3)
+  {name: ":last-child pseudo-class selector, matching last child div element",           selector: "div:last-child",                                                          ctx: "#pseudo-last-child", expect: ["pseudo-last-child-div3"],                                                        level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":last-child pseudo-class selector, doesn't match non-last-child elements",     selector: ".pseudo-last-child-div1:last-child, .pseudo-last-child-div2:first-child", ctx: "#pseudo-last-child", expect: [] /*no matches*/,                                                                 level: 3, testType: TEST_FIND},
+  {name: ":last-child pseudo-class selector, matching first-child of multiple elements", selector: "span:last-child",                                                         ctx: "#pseudo-last-child", expect: ["pseudo-last-child-span2", "pseudo-last-child-span4", "pseudo-last-child-span6"], level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :only-child           (Level 3)
+  {name: ":pseudo-only-child pseudo-class selector, matching all only-child elements", selector: ":only-child",   ctx: "#pseudo-only", expect: ["pseudo-only-span1"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":pseudo-only-child pseudo-class selector, matching only-child em elements",  selector: "em:only-child", ctx: "#pseudo-only", expect: [] /*no matches*/,     level: 3, testType: TEST_FIND},
+
+  // - :only-of-type         (Level 3)
+  {name: ":pseudo-only-of-type pseudo-class selector, matching all elements with no siblings of the same type", selector: " :only-of-type",   ctx: "#pseudo-only", expect: ["pseudo-only-span1", "pseudo-only-em1"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":pseudo-only-of-type pseudo-class selector, matching em elements with no siblings of the same type",  selector: " em:only-of-type", ctx: "#pseudo-only", expect: ["pseudo-only-em1"],                    level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :empty                (Level 3)
+  {name: ":empty pseudo-class selector, matching empty p elements",   selector: "p:empty", ctx: "#pseudo-empty", expect: ["pseudo-empty-p1", "pseudo-empty-p2"],                       level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":empty pseudo-class selector, matching all empty elements", selector: ":empty",  ctx: "#pseudo-empty", expect: ["pseudo-empty-p1", "pseudo-empty-p2", "pseudo-empty-span1"], level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :link and :visited
+  // Implementations may treat all visited links as unvisited, so these cannot be tested separately.
+  // The only guarantee is that ":link,:visited" matches the set of all visited and unvisited links and that they are individually mutually exclusive sets.
+  {name: ":link and :visited pseudo-class selectors, matching a and area elements with href attributes",        selector: " :link, #pseudo-link :visited", ctx: "#pseudo-link", expect: ["pseudo-link-a1", "pseudo-link-a2", "pseudo-link-area1"],                                level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: ":link and :visited pseudo-class selectors, matching no elements",                                     selector: " :link, #head :visited",        ctx: "#head",        expect: [] /*no matches*/,                          exclude: ["element", "fragment", "detached"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: ":link and :visited pseudo-class selectors, not matching link elements with href attributes",          selector: " :link, #head :visited",        ctx: "#head",        expect: [] /*no matches*/,                          exclude: ["document"],                        level: 1, testType: TEST_FIND},
+  {name: ":link and :visited pseudo-class selectors, chained, mutually exclusive pseudo-classes match nothing", selector: ":link:visited",                 ctx: "#html",        expect: [] /*no matches*/,                          exclude: ["document"],                        level: 1, testType: TEST_FIND},
+
+// XXX Figure out context or refNodes for this
+  // - :target               (Level 3)
+  {name: ":target pseudo-class selector, matching the element referenced by the URL fragment identifier", selector: ":target", ctx: "", expect: [] /*no matches*/, exclude: ["document", "element"],  level: 3, testType: TEST_FIND},
+  {name: ":target pseudo-class selector, matching the element referenced by the URL fragment identifier", selector: ":target", ctx: "", expect: ["target"],        exclude: ["fragment", "detached"], level: 3, testType: TEST_FIND},
+
+// XXX Fix ctx in tests below
+
+  // - :lang()
+  {name: ":lang pseudo-class selector, matching inherited language (1)",                     selector: "#pseudo-lang-div1:lang(en)",    ctx: "", expect: ["pseudo-lang-div1"], exclude: ["detached", "fragment"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: ":lang pseudo-class selector, not matching element with no inherited language", selector: "#pseudo-lang-div1:lang(en)",    ctx: "", expect: [] /*no matches*/,    exclude: ["document", "element"],  level: 2, testType: TEST_FIND},
+  {name: ":lang pseudo-class selector, matching specified language with exact value (1)",    selector: "#pseudo-lang-div2:lang(fr)",    ctx: "", expect: ["pseudo-lang-div2"],                                    level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: ":lang pseudo-class selector, matching specified language with partial value (1)",  selector: "#pseudo-lang-div3:lang(en)",    ctx: "", expect: ["pseudo-lang-div3"],                                    level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: ":lang pseudo-class selector, not matching incorrect language",                 selector: "#pseudo-lang-div4:lang(es-AR)", ctx: "", expect: [] /*no matches*/,                                       level: 2, testType: TEST_FIND},
+
+  // - :enabled              (Level 3)
+  {name: ":enabled pseudo-class selector, matching all enabled form controls (1)",  selector: "#pseudo-ui :enabled",  ctx: "", expect: ["pseudo-ui-input1", "pseudo-ui-input2", "pseudo-ui-input3", "pseudo-ui-input4", "pseudo-ui-input5", "pseudo-ui-input6",
+                                                                                                                           "pseudo-ui-input7", "pseudo-ui-input8", "pseudo-ui-input9", "pseudo-ui-textarea1", "pseudo-ui-button1"],    level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":enabled pseudo-class selector, not matching link elements (1)",  selector: "#pseudo-link :enabled",  ctx: "", expect: [] /*no matches*/, unexpected: ["pseudo-link-a1","pseudo-link-a2","pseudo-link-a3","pseudo-link-map1","pseudo-link-area1","pseudo-link-area2"],   level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :disabled             (Level 3)
+  {name: ":disabled pseudo-class selector, matching all disabled form controls (1)", selector: "#pseudo-ui :disabled", ctx: "", expect: ["pseudo-ui-input10", "pseudo-ui-input11", "pseudo-ui-input12", "pseudo-ui-input13", "pseudo-ui-input14", "pseudo-ui-input15",
+                                                                                                                           "pseudo-ui-input16", "pseudo-ui-input17", "pseudo-ui-input18", "pseudo-ui-textarea2", "pseudo-ui-button2"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":disabled pseudo-class selector, not matching link elements (1)", selector: "#pseudo-link :disabled", ctx: "", expect: [] /*no matches*/, unexpected: ["pseudo-link-a1","pseudo-link-a2","pseudo-link-a3","pseudo-link-map1","pseudo-link-area1","pseudo-link-area2"], level: 3, testType: TEST_QSA | TEST_MATCH},
+
+  // - :checked              (Level 3)
+  {name: ":checked pseudo-class selector, matching checked radio buttons and checkboxes (1)", selector: "#pseudo-ui :checked", ctx: "", expect: ["pseudo-ui-input4", "pseudo-ui-input6", "pseudo-ui-input13", "pseudo-ui-input15"],  level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // - :not(s)               (Level 3)
+  {name: ":not pseudo-class selector, matching (1)", selector: "#not>:not(div)",   ctx: "", expect: ["not-p1", "not-p2", "not-p3"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":not pseudo-class selector, matching (1)", selector: "#not * :not(:first-child)",   ctx: "", expect: ["not-em1", "not-em2", "not-em3"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: ":not pseudo-class selector, matching nothing", selector: ":not(*)",   ctx: "", expect: [] /* no matches */, level: 3, testType: TEST_FIND},
+  {name: ":not pseudo-class selector, matching nothing", selector: ":not(*|*)", ctx: "", expect: [] /* no matches */, level: 3, testType: TEST_FIND},
+
+  // Pseudo-elements
+  // - ::first-line
+  {name: ":first-line pseudo-element (one-colon syntax) selector, not matching any elements",    selector: "#pseudo-element:first-line",    ctx: "", expect: [] /*no matches*/, level: 2, testType: TEST_FIND},
+  {name: "::first-line pseudo-element (two-colon syntax) selector, not matching any elements",   selector: "#pseudo-element::first-line",   ctx: "", expect: [] /*no matches*/, level: 3, testType: TEST_FIND},
+
+  // - ::first-letter
+  {name: ":first-letter pseudo-element (one-colon syntax) selector, not matching any elements",  selector: "#pseudo-element:first-letter",  ctx: "", expect: [] /*no matches*/, level: 2, testType: TEST_FIND},
+  {name: "::first-letter pseudo-element (two-colon syntax) selector, not matching any elements", selector: "#pseudo-element::first-letter", ctx: "", expect: [] /*no matches*/, level: 3, testType: TEST_FIND},
+
+  // - ::before
+  {name: ":before pseudo-element (one-colon syntax) selector, not matching any elements",        selector: "#pseudo-element:before",        ctx: "", expect: [] /*no matches*/, level: 2, testType: TEST_FIND},
+  {name: "::before pseudo-element (two-colon syntax) selector, not matching any elements",       selector: "#pseudo-element::before",       ctx: "", expect: [] /*no matches*/, level: 3, testType: TEST_FIND},
+
+  // - ::after
+  {name: ":after pseudo-element (one-colon syntax) selector, not matching any elements",         selector: "#pseudo-element:after",         ctx: "", expect: [] /*no matches*/, level: 2, testType: TEST_FIND},
+  {name: "::after pseudo-element (two-colon syntax) selector, not matching any elements",        selector: "#pseudo-element::after",        ctx: "", expect: [] /*no matches*/, level: 3, testType: TEST_FIND},
+
+  // Class Selectors
+  {name: "Class selector, matching element with specified class (1)",                                           selector: ".class-p",                ctx: "", expect: ["class-p1","class-p2", "class-p3"],                                              level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, chained, matching only elements with all specified classes (1)",                      selector: "#class .apple.orange.banana",    ctx: "", expect: ["class-div1", "class-div2", "class-p4", "class-div3", "class-p6", "class-div4"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class Selector, chained, with type selector (1)",                                                     selector: "div.apple.banana.orange", ctx: "", expect: ["class-div1", "class-div2", "class-div3", "class-div4"],                         level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching element with class value using non-ASCII characters (2)",                    selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci",             ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching multiple elements with class value using non-ASCII characters (1)",          selector: ".\u53F0\u5317",                     ctx: "", expect: ["class-span1","class-span2"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters (2)", selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci.\u53F0\u5317",          ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching element with class with escaped character (1)",                              selector: ".foo\\:bar",              ctx: "", expect: ["class-span3"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching element with class with escaped character (1)",                              selector: ".test\\.foo\\[5\\]bar",   ctx: "", expect: ["class-span4"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+
+  // ID Selectors
+  {name: "ID selector, matching element with specified id (1)",           selector: "#id #id-div1",              ctx: "", expect: ["id-div1"],            level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, chained, matching element with specified id (1)",  selector: "#id-div1, #id-div1",        ctx: "", expect: ["id-div1"],            level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, chained, matching element with specified id (1)",  selector: "#id-div1, #id-div2",        ctx: "", expect: ["id-div1", "id-div2"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID Selector, chained, with type selector (1)",                  selector: "div#id-div1, div#id-div2",  ctx: "", expect: ["id-div1", "id-div2"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, not matching non-existent descendant",         selector: "#id #none",                 ctx: "", expect: [] /*no matches*/,      level: 1, testType: TEST_FIND},
+  {name: "ID selector, not matching non-existent ancestor",           selector: "#none #id-div1",            ctx: "", expect: [] /*no matches*/,      level: 1, testType: TEST_FIND},
+  {name: "ID selector, matching multiple elements with duplicate id (1)", selector: "#id-li-duplicate",          ctx: "", expect: ["id-li-duplicate", "id-li-duplicate", "id-li-duplicate", "id-li-duplicate"], level: 1, testType: TEST_FIND | TEST_MATCH},
+
+  {name: "ID selector, matching id value using non-ASCII characters (3)",    selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci",           ctx: "", expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci"],       level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters (4)",    selector: "#\u53F0\u5317",                   ctx: "", expect: ["\u53F0\u5317"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id values using non-ASCII characters (2)",   selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci, #\u53F0\u5317",      ctx: "", expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci", "\u53F0\u5317"], level: 1, testType: TEST_FIND | TEST_MATCH},
+
+  // XXX runMatchesTest() in level2-lib.js can't handle this because obtaining the expected nodes requires escaping characters when generating the selector from 'expect' values
+  {name: "ID selector, matching element with id with escaped character", selector: "#\\#foo\\:bar",         ctx: "", expect: ["#foo:bar"],         level: 1, testType: TEST_FIND},
+  {name: "ID selector, matching element with id with escaped character", selector: "#test\\.foo\\[5\\]bar", ctx: "", expect: ["test.foo[5]bar"],   level: 1, testType: TEST_FIND},
+
+  // Namespaces
+  // XXX runMatchesTest() in level2-lib.js can't handle these because non-HTML elements don't have a recognised id
+  {name: "Namespace selector, matching element with any namespace",        selector: "#any-namespace *|div", ctx: "", expect: ["any-namespace-div1", "any-namespace-div2", "any-namespace-div3", "any-namespace-div4"], level: 3, testType: TEST_FIND},
+  {name: "Namespace selector, matching div elements in no namespace only", selector: "#no-namespace |div",   ctx: "", expect: ["no-namespace-div3"], level: 3, testType: TEST_FIND},
+  {name: "Namespace selector, matching any elements in no namespace only", selector: "#no-namespace |*",     ctx: "", expect: ["no-namespace-div3"], level: 3, testType: TEST_FIND},
+
+  // Combinators
+  // - Descendant combinator ' '
+  {name: "Descendant combinator, matching element that is a descendant of an element with id (1)",                 selector: "#descendant div",                   ctx: "", expect: ["descendant-div1", "descendant-div2", "descendant-div3", "descendant-div4"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Descendant combinator, matching element with id that is a descendant of an element (1)",                 selector: "body #descendant-div1",             ctx: "", expect: ["descendant-div1"], exclude: ["detached", "fragment"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Descendant combinator, matching element with id that is a descendant of an element (1)",                 selector: "div #descendant-div1",              ctx: "", expect: ["descendant-div1"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Descendant combinator, matching element with id that is a descendant of an element with id (1)",         selector: "#descendant #descendant-div2",      ctx: "", expect: ["descendant-div2"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Descendant combinator, matching element with class that is a descendant of an element with id (1)",      selector: "#descendant .descendant-div2",      ctx: "", expect: ["descendant-div2"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Descendant combinator, matching element with class that is a descendant of an element with class (1)",   selector: ".descendant-div1 .descendant-div3", ctx: "", expect: ["descendant-div3"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Descendant combinator, not matching element with id that is not a descendant of an element with id", selector: "#descendant-div1 #descendant-div4", ctx: "", expect: [] /*no matches*/,                                      level: 1, testType: TEST_FIND},
+  {name: "Descendant combinator, whitespace characters (1)",                                                       selector: "#descendant\t\r\n#descendant-div2", ctx: "", expect: ["descendant-div2"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+
+  // // - Descendant combinator '>>'
+  // {name: "Descendant combinator '>>', matching element that is a descendant of an element with id (1)",                 selector: "#descendant>>div",                   ctx: "", expect: ["descendant-div1", "descendant-div2", "descendant-div3", "descendant-div4"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with id that is a descendant of an element (1)",                 selector: "body>>#descendant-div1",             ctx: "", expect: ["descendant-div1"], exclude: ["detached", "fragment"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with id that is a descendant of an element (1)",                 selector: "div>>#descendant-div1",              ctx: "", expect: ["descendant-div1"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with id that is a descendant of an element with id (1)",         selector: "#descendant>>#descendant-div2",      ctx: "", expect: ["descendant-div2"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  // {name: "Descendant combinator '>>', matching element with class that is a descendant of an element with id (1)",      selector: "#descendant>>.descendant-div2",      ctx: "", expect: ["descendant-div2"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  // {name: "Descendant combinator, '>>', matching element with class that is a descendant of an element with class (1)",   selector: ".descendant-div1>>.descendant-div3", ctx: "", expect: ["descendant-div3"],                                    level: 1, testType: TEST_FIND | TEST_MATCH},
+  // {name: "Descendant combinator '>>', not matching element with id that is not a descendant of an element with id", selector: "#descendant-div1>>#descendant-div4", ctx: "", expect: [] /*no matches*/,                                      level: 1, testType: TEST_FIND},
+
+  // - Child combinator '>'
+  {name: "Child combinator, matching element that is a child of an element with id (1)",                       selector: "#child>div",                          ctx: "", expect: ["child-div1", "child-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, matching element with id that is a child of an element (1)",                       selector: "div>#child-div1",                     ctx: "", expect: ["child-div1"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, matching element with id that is a child of an element with id (1)",               selector: "#child>#child-div1",                  ctx: "", expect: ["child-div1"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, matching element with id that is a child of an element with class (1)",            selector: "#child-div1>.child-div2",             ctx: "", expect: ["child-div2"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, matching element with class that is a child of an element with class (1)",         selector: ".child-div1>.child-div2",             ctx: "", expect: ["child-div2"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, not matching element with id that is not a child of an element with id",       selector: "#child>#child-div3",                  ctx: "", expect: [] /*no matches*/,            level: 2, testType: TEST_FIND},
+  {name: "Child combinator, not matching element with id that is not a child of an element with class",    selector: "#child-div1>.child-div3",             ctx: "", expect: [] /*no matches*/,            level: 2, testType: TEST_FIND},
+  {name: "Child combinator, not matching element with class that is not a child of an element with class", selector: ".child-div1>.child-div3",             ctx: "", expect: [] /*no matches*/,            level: 2, testType: TEST_FIND},
+  {name: "Child combinator, surrounded by whitespace (1)",                                                     selector: "#child-div1\t\r\n>\t\r\n#child-div2", ctx: "", expect: ["child-div2"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, whitespace after (1)",                                                             selector: "#child-div1>\t\r\n#child-div2",       ctx: "", expect: ["child-div2"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, whitespace before (1)",                                                            selector: "#child-div1\t\r\n>#child-div2",       ctx: "", expect: ["child-div2"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Child combinator, no whitespace (1)",                                                                selector: "#child-div1>#child-div2",             ctx: "", expect: ["child-div2"],               level: 2, testType: TEST_FIND | TEST_MATCH},
+
+  // - Adjacent sibling combinator '+'
+  {name: "Adjacent sibling combinator, matching element that is an adjacent sibling of an element with id (1)",                 selector: "#adjacent-div2+div",                                         ctx: "", expect: ["adjacent-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with id that is an adjacent sibling of an element (1)",                 selector: "div+#adjacent-div4",                                         ctx: "", expect: ["adjacent-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with id that is an adjacent sibling of an element with id (1)",         selector: "#adjacent-div2+#adjacent-div4",                              ctx: "", expect: ["adjacent-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with class that is an adjacent sibling of an element with id (1)",      selector: "#adjacent-div2+.adjacent-div4",                              ctx: "", expect: ["adjacent-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching element with class that is an adjacent sibling of an element with class (1)",   selector: ".adjacent-div2+.adjacent-div4",                              ctx: "", expect: ["adjacent-div4"], level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, matching p element that is an adjacent sibling of a div element (1)",                    selector: "#adjacent div+p",                                            ctx: "", expect: ["adjacent-p2"],   level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, not matching element with id that is not an adjacent sibling of an element with id", selector: "#adjacent-div2+#adjacent-p2, #adjacent-div2+#adjacent-div1", ctx: "", expect: [] /*no matches*/, level: 2, testType: TEST_FIND},
+  {name: "Adjacent sibling combinator, surrounded by whitespace (1)",                                                           selector: "#adjacent-p2\t\r\n+\t\r\n#adjacent-p3",                      ctx: "", expect: ["adjacent-p3"],   level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, whitespace after (1)",                                                                   selector: "#adjacent-p2+\t\r\n#adjacent-p3",                            ctx: "", expect: ["adjacent-p3"],   level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, whitespace before (1)",                                                                  selector: "#adjacent-p2\t\r\n+#adjacent-p3",                            ctx: "", expect: ["adjacent-p3"],   level: 2, testType: TEST_FIND | TEST_MATCH},
+  {name: "Adjacent sibling combinator, no whitespace (1)",                                                                      selector: "#adjacent-p2+#adjacent-p3",                                  ctx: "", expect: ["adjacent-p3"],   level: 2, testType: TEST_FIND | TEST_MATCH},
+
+  // - General sibling combinator ~ (Level 3)
+  {name: "General sibling combinator, matching element that is a sibling of an element with id (1)",                    selector: "#sibling-div2~div",                                        ctx: "", expect: ["sibling-div4", "sibling-div6"], level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, matching element with id that is a sibling of an element (1)",                    selector: "div~#sibling-div4",                                        ctx: "", expect: ["sibling-div4"],                 level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, matching element with id that is a sibling of an element with id (1)",            selector: "#sibling-div2~#sibling-div4",                              ctx: "", expect: ["sibling-div4"],                 level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, matching element with class that is a sibling of an element with id (1)",         selector: "#sibling-div2~.sibling-div",                               ctx: "", expect: ["sibling-div4", "sibling-div6"],                 level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, matching p element that is a sibling of a div element (1)",                       selector: "#sibling div~p",                                           ctx: "", expect: ["sibling-p2", "sibling-p3"],                   level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, not matching element with id that is not a sibling after a p element (1)",        selector: "#sibling>p~div",                                           ctx: "", expect: [] /*no matches*/,                level: 3, testType: TEST_FIND},
+  {name: "General sibling combinator, not matching element with id that is not a sibling after an element with id", selector: "#sibling-div2~#sibling-div3, #sibling-div2~#sibling-div1", ctx: "", expect: [] /*no matches*/,                level: 3, testType: TEST_FIND},
+  {name: "General sibling combinator, surrounded by whitespace (1)",                                                    selector: "#sibling-p2\t\r\n~\t\r\n#sibling-p3",                      ctx: "", expect: ["sibling-p3"],                   level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, whitespace after (1)",                                                            selector: "#sibling-p2~\t\r\n#sibling-p3",                            ctx: "", expect: ["sibling-p3"],                   level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, whitespace before (1)",                                                           selector: "#sibling-p2\t\r\n~#sibling-p3",                            ctx: "", expect: ["sibling-p3"],                   level: 3, testType: TEST_FIND | TEST_MATCH},
+  {name: "General sibling combinator, no whitespace (1)",                                                               selector: "#sibling-p2~#sibling-p3",                                  ctx: "", expect: ["sibling-p3"],                   level: 3, testType: TEST_FIND | TEST_MATCH},
+
+  // Group of selectors (comma)
+  {name: "Syntax, group of selectors separator, surrounded by whitespace (1)", selector: "#group em\t\r \n,\t\r \n#group strong", ctx: "", expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Syntax, group of selectors separator, whitespace after (1)",         selector: "#group em,\t\r\n#group strong",         ctx: "", expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Syntax, group of selectors separator, whitespace before (1)",        selector: "#group em\t\r\n,#group strong",         ctx: "", expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Syntax, group of selectors separator, no whitespace (1)",            selector: "#group em,#group strong",               ctx: "", expect: ["group-em1", "group-strong1"], level: 1, testType: TEST_FIND | TEST_MATCH},
+];

From d7f8014d53dbe55c37c3eae7be0b930086f79a9e Mon Sep 17 00:00:00 2001
From: Pierre Tachoire 
Date: Fri, 15 Dec 2023 10:58:39 +0100
Subject: [PATCH 06/11] dom: add basic document queryselector

---
 src/dom/document.zig | 76 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/src/dom/document.zig b/src/dom/document.zig
index 846c2f32..9ab1b852 100644
--- a/src/dom/document.zig
+++ b/src/dom/document.zig
@@ -7,8 +7,10 @@ const Case = jsruntime.test_utils.Case;
 const checkCases = jsruntime.test_utils.checkCases;
 
 const Node = @import("node.zig").Node;
+const NodeList = @import("nodelist.zig").NodeList;
 const NodeUnion = @import("node.zig").Union;
 
+const Walker = @import("html_collection.zig").WalkerDepthFirst;
 const collection = @import("html_collection.zig");
 
 const Element = @import("element.zig").Element;
@@ -190,6 +192,56 @@ pub const Document = struct {
         return 1;
     }
 
+    // TODO netsurf doesn't handle query selectors. We have to implement a
+    // solution by ourselves.
+    // We handle only * and single id selector like `#foo`.
+    pub fn _querySelector(self: *parser.Document, selectors: []const u8) !?ElementUnion {
+        if (selectors.len == 0) return null;
+
+        // catch-all, return the firstElementChild
+        if (selectors[0] == '*') return try get_firstElementChild(self);
+
+        // support only simple id selector.
+        if (selectors[0] != '#' or std.mem.indexOf(u8, selectors, " ") != null) return null;
+
+        return try _getElementById(self, selectors[1..]);
+    }
+
+    // TODO netsurf doesn't handle query selectors. We have to implement a
+    // solution by ourselves.
+    // We handle only * and single id selector like `#foo`.
+    pub fn _querySelectorAll(self: *parser.Document, alloc: std.mem.Allocator, selectors: []const u8) !*NodeList {
+        const list = try NodeList.init(alloc);
+        errdefer list.deinit(alloc);
+
+        if (selectors.len == 0) return list;
+
+        // catch-all, return all elements
+        if (selectors[0] == '*') {
+            // walk over the node tree fo find the node by id.
+            const root = parser.elementToNode(try parser.documentGetDocumentElement(self) orelse return list);
+            const walker = Walker{};
+            var next: ?*parser.Node = null;
+            while (true) {
+                next = try walker.get_next(root, next) orelse return list;
+                // ignore non-element nodes.
+                if (try parser.nodeType(next.?) != .element) {
+                    continue;
+                }
+                try list.append(next.?);
+            }
+        }
+
+        // support only simple id selector.
+        if (selectors[0] != '#' or std.mem.indexOf(u8, selectors, " ") != null) return list;
+
+        // walk over the node tree fo find the node by id.
+        const e = try parser.documentGetElementById(self, selectors[1..]) orelse return list;
+        try list.append(parser.elementToNode(e));
+
+        return list;
+    }
+
     pub fn deinit(_: *parser.Document, _: std.mem.Allocator) void {}
 };
 
@@ -325,13 +377,6 @@ pub fn testExecFn(
     };
     try checkCases(js_env, &importNode);
 
-    var adoptNode = [_]Case{
-        .{ .src = "let nadop = document.getElementById('content')", .ex = "undefined" },
-        .{ .src = "var v = document.adoptNode(nadop)", .ex = "undefined" },
-        .{ .src = "v.nodeName", .ex = "DIV" },
-    };
-    try checkCases(js_env, &adoptNode);
-
     var createAttr = [_]Case{
         .{ .src = "var v = document.createAttribute('foo')", .ex = "undefined" },
         .{ .src = "v.nodeName", .ex = "foo" },
@@ -354,6 +399,23 @@ pub fn testExecFn(
     };
     try checkCases(js_env, &parentNode);
 
+    var querySelector = [_]Case{
+        .{ .src = "document.querySelector('')", .ex = "null" },
+        .{ .src = "document.querySelector('*').nodeName", .ex = "HTML" },
+        .{ .src = "document.querySelector('#content').id", .ex = "content" },
+        .{ .src = "document.querySelector('#para').id", .ex = "para" },
+    };
+    try checkCases(js_env, &querySelector);
+
+    // this test breaks the doc structure, keep it at the end of the test
+    // suite.
+    var adoptNode = [_]Case{
+        .{ .src = "let nadop = document.getElementById('content')", .ex = "undefined" },
+        .{ .src = "var v = document.adoptNode(nadop)", .ex = "undefined" },
+        .{ .src = "v.nodeName", .ex = "DIV" },
+    };
+    try checkCases(js_env, &adoptNode);
+
     const tags = comptime parser.Tag.all();
     comptime var createElements: [(tags.len) * 2]Case = undefined;
     inline for (tags, 0..) |tag, i| {

From 923296426ee2a6a1c1272ddeda22af98110aa80c Mon Sep 17 00:00:00 2001
From: Pierre Tachoire 
Date: Fri, 15 Dec 2023 11:06:53 +0100
Subject: [PATCH 07/11] add wpt tests

---
 tests/wpt/dom/nodes/Element-closest.html      |  73 ++++++++++
 .../nodes/Element-insertAdjacentElement.html  |  91 ++++++++++++
 .../dom/nodes/Element-insertAdjacentText.html |  76 ++++++++++
 tests/wpt/dom/nodes/Element-matches-init.js   |  65 +++++++++
 .../Element-matches-namespaced-elements.html  |  24 ++++
 tests/wpt/dom/nodes/Element-matches.html      |  22 +++
 tests/wpt/dom/nodes/Element-matches.js        | 135 ++++++++++++++++++
 tests/wpt/dom/nodes/Element-remove.html       |  16 +++
 .../nodes/Element-siblingElement-null-svg.svg |  20 +++
 .../Element-siblingElement-null-xhtml.xhtml   |  20 +++
 .../nodes/Element-siblingElement-null.html    |  16 +++
 tests/wpt/dom/nodes/Element-tagName.html      |  57 ++++++++
 .../nodes/Element-webkitMatchesSelector.html  |  22 +++
 tests/wpt/dom/nodes/NodeList-Iterable.html    |  61 ++++++++
 .../nodes/NodeList-live-mutations.window.js   |  79 ++++++++++
 ...eList-static-length-getter-tampered-1.html |  22 +++
 ...eList-static-length-getter-tampered-2.html |  22 +++
 ...eList-static-length-getter-tampered-3.html |  22 +++
 ...atic-length-getter-tampered-indexOf-1.html |  22 +++
 ...atic-length-getter-tampered-indexOf-2.html |  22 +++
 ...atic-length-getter-tampered-indexOf-3.html |  22 +++
 .../NodeList-static-length-tampered.js        |  46 ++++++
 22 files changed, 955 insertions(+)
 create mode 100644 tests/wpt/dom/nodes/Element-closest.html
 create mode 100644 tests/wpt/dom/nodes/Element-insertAdjacentElement.html
 create mode 100644 tests/wpt/dom/nodes/Element-insertAdjacentText.html
 create mode 100644 tests/wpt/dom/nodes/Element-matches-init.js
 create mode 100644 tests/wpt/dom/nodes/Element-matches-namespaced-elements.html
 create mode 100644 tests/wpt/dom/nodes/Element-matches.html
 create mode 100644 tests/wpt/dom/nodes/Element-matches.js
 create mode 100644 tests/wpt/dom/nodes/Element-remove.html
 create mode 100644 tests/wpt/dom/nodes/Element-siblingElement-null-svg.svg
 create mode 100644 tests/wpt/dom/nodes/Element-siblingElement-null-xhtml.xhtml
 create mode 100644 tests/wpt/dom/nodes/Element-siblingElement-null.html
 create mode 100644 tests/wpt/dom/nodes/Element-tagName.html
 create mode 100644 tests/wpt/dom/nodes/Element-webkitMatchesSelector.html
 create mode 100644 tests/wpt/dom/nodes/NodeList-Iterable.html
 create mode 100644 tests/wpt/dom/nodes/NodeList-live-mutations.window.js
 create mode 100644 tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-1.html
 create mode 100644 tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-2.html
 create mode 100644 tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-3.html
 create mode 100644 tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html
 create mode 100644 tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html
 create mode 100644 tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html
 create mode 100644 tests/wpt/dom/nodes/support/NodeList-static-length-tampered.js

diff --git a/tests/wpt/dom/nodes/Element-closest.html b/tests/wpt/dom/nodes/Element-closest.html
new file mode 100644
index 00000000..386e3bd2
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-closest.html
@@ -0,0 +1,73 @@
+
+
+Test for Element.closest
+
+
+
+  
+  
      
+
diff --git a/tests/wpt/dom/nodes/Element-insertAdjacentElement.html b/tests/wpt/dom/nodes/Element-insertAdjacentElement.html
new file mode 100644
index 00000000..9eafee6a
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-insertAdjacentElement.html
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
      
+
      
+
      
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/Element-insertAdjacentText.html b/tests/wpt/dom/nodes/Element-insertAdjacentText.html
new file mode 100644
index 00000000..be744fd4
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-insertAdjacentText.html
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
      
+
      
+
      
+
+
diff --git a/tests/wpt/dom/nodes/Element-matches-init.js b/tests/wpt/dom/nodes/Element-matches-init.js
new file mode 100644
index 00000000..254af615
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-matches-init.js
@@ -0,0 +1,65 @@
+function init(e, method) {
+  /*
+   * This test suite tests Selectors API methods in 4 different contexts:
+   * 1. Document node
+   * 2. In-document Element node
+   * 3. Detached Element node (an element with no parent, not in the document)
+   * 4. Document Fragment node
+   *
+   * For each context, the following tests are run:
+   *
+   * The interface check tests ensure that each type of node exposes the Selectors API methods.
+   *
+   * The matches() tests are run
+   * All the selectors tested for both the valid and invalid selector tests are found in selectors.js.
+   * See comments in that file for documentation of the format used.
+   *
+   * The level2-lib.js file contains all the common test functions for running each of the aforementioned tests
+   */
+
+  var docType  = "html"; // Only run tests suitable for HTML
+
+  // Prepare the nodes for testing
+  var doc = e.target.contentDocument;                 // Document Node tests
+
+  var element = doc.getElementById("root");   // In-document Element Node tests
+
+  //Setup the namespace tests
+  setupSpecialElements(doc, element);
+
+  var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
+                                               // Element tests, but after running the Document tests. This
+                                               // tests that no elements that are not descendants of element
+                                               // are selected.
+
+  traverse(outOfScope, function(elem) {        // Annotate each element as being a clone; used for verifying
+    elem.setAttribute("data-clone", "");     // that none of these elements ever match.
+  });
+
+
+  var detached = element.cloneNode(true);     // Detached Element Node tests
+
+  var fragment = doc.createDocumentFragment(); // Fragment Node tests
+  fragment.appendChild(element.cloneNode(true));
+
+  // Setup Tests
+  interfaceCheckMatches(method, "Document", doc);
+  interfaceCheckMatches(method, "Detached Element", detached);
+  interfaceCheckMatches(method, "Fragment", fragment);
+  interfaceCheckMatches(method, "In-document Element", element);
+
+  runSpecialMatchesTests(method, "DIV Element", element);
+  runSpecialMatchesTests(method, "NULL Element", document.createElement("null"));
+  runSpecialMatchesTests(method, "UNDEFINED Element", document.createElement("undefined"));
+
+  runInvalidSelectorTestMatches(method, "Document", doc, invalidSelectors);
+  runInvalidSelectorTestMatches(method, "Detached Element", detached, invalidSelectors);
+  runInvalidSelectorTestMatches(method, "Fragment", fragment, invalidSelectors);
+  runInvalidSelectorTestMatches(method, "In-document Element", element, invalidSelectors);
+
+  runMatchesTest(method, "In-document", doc, validSelectors, "html");
+  runMatchesTest(method, "Detached", detached, validSelectors, "html");
+  runMatchesTest(method, "Fragment", fragment, validSelectors, "html");
+
+  runMatchesTest(method, "In-document", doc, scopedSelectors, "html");
+}
diff --git a/tests/wpt/dom/nodes/Element-matches-namespaced-elements.html b/tests/wpt/dom/nodes/Element-matches-namespaced-elements.html
new file mode 100644
index 00000000..e61b11ca
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-matches-namespaced-elements.html
@@ -0,0 +1,24 @@
+
+
+matches/webkitMatchesSelector must work when an element has a namespace
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/Element-matches.html b/tests/wpt/dom/nodes/Element-matches.html
new file mode 100644
index 00000000..de234b66
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-matches.html
@@ -0,0 +1,22 @@
+
+
+Selectors-API Level 2 Test Suite: HTML with Selectors Level 3
+
+
+
+
+
+
+
+
+
+
      This test requires JavaScript.
      
+
+
diff --git a/tests/wpt/dom/nodes/Element-matches.js b/tests/wpt/dom/nodes/Element-matches.js
new file mode 100644
index 00000000..a1455c67
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-matches.js
@@ -0,0 +1,135 @@
+/*
+ * Check that the matches() method exists on the given Node
+ */
+function interfaceCheckMatches(method, type, obj) {
+  if (obj.nodeType === obj.ELEMENT_NODE) {
+    test(function() {
+      assert_idl_attribute(obj, method, type + " supports " + method);
+    }, type + " supports " + method)
+  } else {
+    test(function() {
+      assert_false(method in obj, type + " supports " + method);
+    }, type + " should not support " + method)
+  }
+}
+
+function runSpecialMatchesTests(method, type, element) {
+  test(function() { // 1
+    if (element.tagName.toLowerCase() === "null") {
+      assert_true(element[method](null), "An element with the tag name '" + element.tagName.toLowerCase() + "' should match.");
+    } else {
+      assert_false(element[method](null), "An element with the tag name '" + element.tagName.toLowerCase() + "' should not match.");
+    }
+  }, type + "." + method + "(null)")
+
+  test(function() { // 2
+    if (element.tagName.toLowerCase() === "undefined") {
+      assert_true(element[method](undefined), "An element with the tag name '" + element.tagName.toLowerCase() + "' should match.");
+    } else {
+      assert_false(element[method](undefined), "An element with the tag name '" + element.tagName.toLowerCase() + "' should not match.");
+    }
+  }, type + "." + method + "(undefined)")
+
+  test(function() { // 3
+    assert_throws_js(element.ownerDocument.defaultView.TypeError, function() {
+      element[method]();
+    }, "This should throw a TypeError.")
+  }, type + "." + method + " no parameter")
+}
+
+/*
+ * Execute queries with the specified invalid selectors for matches()
+ * Only run these tests when errors are expected. Don't run for valid selector tests.
+ */
+function runInvalidSelectorTestMatches(method, type, root, selectors) {
+  if (root.nodeType === root.ELEMENT_NODE) {
+    for (var i = 0; i < selectors.length; i++) {
+      var s = selectors[i];
+      var n = s["name"];
+      var q = s["selector"];
+
+      test(function() {
+        assert_throws_dom(
+          "SyntaxError",
+          root.ownerDocument.defaultView.DOMException,
+          function() {
+            root[method](q)
+          }
+        );
+      }, type + "." + method + ": " + n + ": " + q);
+    }
+  }
+}
+
+function runMatchesTest(method, type, root, selectors, docType) {
+  var nodeType = getNodeType(root);
+
+  for (var i = 0; i < selectors.length; i++) {
+    var s = selectors[i];
+    var n = s["name"];
+    var q = s["selector"];
+    var e = s["expect"];
+    var u = s["unexpected"];
+
+    var ctx = s["ctx"];
+    var ref = s["ref"];
+
+    if ((!s["exclude"] || (s["exclude"].indexOf(nodeType) === -1 && s["exclude"].indexOf(docType) === -1))
+     && (s["testType"] & TEST_MATCH) ) {
+
+      if (ctx && !ref) {
+        test(function() {
+          var j, element, refNode;
+          for (j = 0; j < e.length; j++) {
+            element = root.querySelector("#" + e[j]);
+            refNode = root.querySelector(ctx);
+            assert_true(element[method](q, refNode), "The element #" + e[j] + " should match the selector.")
+          }
+
+          if (u) {
+            for (j = 0; j < u.length; j++) {
+              element = root.querySelector("#" + u[j]);
+              refNode = root.querySelector(ctx);
+              assert_false(element[method](q, refNode), "The element #" + u[j] + " should not match the selector.")
+            }
+          }
+        }, type + " Element." + method + ": " + n + " (with refNode Element): " + q);
+      }
+
+      if (ref) {
+        test(function() {
+          var j, element, refNodes;
+          for (j = 0; j < e.length; j++) {
+            element = root.querySelector("#" + e[j]);
+            refNodes = root.querySelectorAll(ref);
+            assert_true(element[method](q, refNodes), "The element #" + e[j] + " should match the selector.")
+          }
+
+          if (u) {
+            for (j = 0; j < u.length; j++) {
+              element = root.querySelector("#" + u[j]);
+              refNodes = root.querySelectorAll(ref);
+              assert_false(element[method](q, refNodes), "The element #" + u[j] + " should not match the selector.")
+            }
+          }
+        }, type + " Element." + method + ": " + n + " (with refNodes NodeList): " + q);
+      }
+
+      if (!ctx && !ref) {
+        test(function() {
+          for (var j = 0; j < e.length; j++) {
+            var element = root.querySelector("#" + e[j]);
+            assert_true(element[method](q), "The element #" + e[j] + " should match the selector.")
+          }
+
+          if (u) {
+            for (j = 0; j < u.length; j++) {
+              element = root.querySelector("#" + u[j]);
+              assert_false(element[method](q), "The element #" + u[j] + " should not match the selector.")
+            }
+          }
+        }, type + " Element." + method + ": " + n + " (with no refNodes): " + q);
+      }
+    }
+  }
+}
diff --git a/tests/wpt/dom/nodes/Element-remove.html b/tests/wpt/dom/nodes/Element-remove.html
new file mode 100644
index 00000000..ab642d66
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-remove.html
@@ -0,0 +1,16 @@
+
+
+Element.remove
+
+
+
+
+
      
+
diff --git a/tests/wpt/dom/nodes/Element-siblingElement-null-svg.svg b/tests/wpt/dom/nodes/Element-siblingElement-null-svg.svg
new file mode 100644
index 00000000..48c981b8
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-siblingElement-null-svg.svg
@@ -0,0 +1,20 @@
+
+
+Null test
+
+
+
+Test of previousElementSibling and nextElementSibling returning null
+The result of this test is unknown.
+
+
+test(function() {
+  var fec = document.getElementById("first_element_child");
+  assert_equals(fec.previousElementSibling, null)
+  assert_equals(fec.nextElementSibling, null)
+})
+
+
diff --git a/tests/wpt/dom/nodes/Element-siblingElement-null-xhtml.xhtml b/tests/wpt/dom/nodes/Element-siblingElement-null-xhtml.xhtml
new file mode 100644
index 00000000..fcf4d54f
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-siblingElement-null-xhtml.xhtml
@@ -0,0 +1,20 @@
+
+
+
+Null Test
+
+
+
+
+
      Test of previousElementSibling and nextElementSibling returning null
      
+
      
+
      The result of this test is unknown.
      
+
+
+
diff --git a/tests/wpt/dom/nodes/Element-siblingElement-null.html b/tests/wpt/dom/nodes/Element-siblingElement-null.html
new file mode 100644
index 00000000..a7920b4f
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-siblingElement-null.html
@@ -0,0 +1,16 @@
+
+
+Null test
+
+
+
      Test of previousElementSibling and nextElementSibling returning null
      
+
      
+
      The result of this test is unknown.
      
+
+
diff --git a/tests/wpt/dom/nodes/Element-tagName.html b/tests/wpt/dom/nodes/Element-tagName.html
new file mode 100644
index 00000000..43e7a2d2
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-tagName.html
@@ -0,0 +1,57 @@
+
+Element.tagName
+
+
+
      
+
diff --git a/tests/wpt/dom/nodes/Element-webkitMatchesSelector.html b/tests/wpt/dom/nodes/Element-webkitMatchesSelector.html
new file mode 100644
index 00000000..107f8102
--- /dev/null
+++ b/tests/wpt/dom/nodes/Element-webkitMatchesSelector.html
@@ -0,0 +1,22 @@
+
+
+Selectors-API Level 2 Test Suite: HTML with Selectors Level 3
+
+
+
+
+
+
+
+
+
+
      This test requires JavaScript.
      
+
+
diff --git a/tests/wpt/dom/nodes/NodeList-Iterable.html b/tests/wpt/dom/nodes/NodeList-Iterable.html
new file mode 100644
index 00000000..fcbee175
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-Iterable.html
@@ -0,0 +1,61 @@
+
+
+NodeList Iterable Test
+
+
+    
      
+    
      
+    
      
+    
      
+    
      
+
+    
      123
      
+
diff --git a/tests/wpt/dom/nodes/NodeList-live-mutations.window.js b/tests/wpt/dom/nodes/NodeList-live-mutations.window.js
new file mode 100644
index 00000000..a11fed1e
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-live-mutations.window.js
@@ -0,0 +1,79 @@
+function testNodeList(name, hooks) {
+  test(() => {
+    const nodes = {
+      root: document.createElement("div"),
+      div1: document.createElement("div"),
+      div2: document.createElement("div"),
+      p: document.createElement("p")
+    };
+
+    const list = nodes.root.childNodes;
+
+    hooks.initial(list, nodes);
+
+    nodes.root.appendChild(nodes.div1);
+    nodes.root.appendChild(nodes.p);
+    nodes.root.appendChild(nodes.div2);
+
+    hooks.afterInsertion(list, nodes);
+
+    nodes.root.removeChild(nodes.div1);
+
+    hooks.afterRemoval(list, nodes);
+  }, `NodeList live mutations: ${name}`);
+}
+
+testNodeList("NodeList.length", {
+  initial(list) {
+    assert_equals(list.length, 0);
+  },
+  afterInsertion(list) {
+    assert_equals(list.length, 3);
+  },
+  afterRemoval(list) {
+    assert_equals(list.length, 2);
+  }
+});
+
+testNodeList("NodeList.item(index)", {
+  initial(list) {
+    assert_equals(list.item(0), null);
+  },
+  afterInsertion(list, nodes) {
+    assert_equals(list.item(0), nodes.div1);
+    assert_equals(list.item(1), nodes.p);
+    assert_equals(list.item(2), nodes.div2);
+  },
+  afterRemoval(list, nodes) {
+    assert_equals(list.item(0), nodes.p);
+    assert_equals(list.item(1), nodes.div2);
+  }
+});
+
+testNodeList("NodeList[index]", {
+  initial(list) {
+    assert_equals(list[0], undefined);
+  },
+  afterInsertion(list, nodes) {
+    assert_equals(list[0], nodes.div1);
+    assert_equals(list[1], nodes.p);
+    assert_equals(list[2], nodes.div2);
+  },
+  afterRemoval(list, nodes) {
+    assert_equals(list[0], nodes.p);
+    assert_equals(list[1], nodes.div2);
+  }
+});
+
+testNodeList("NodeList ownPropertyNames", {
+  initial(list) {
+    assert_object_equals(Object.getOwnPropertyNames(list), []);
+  },
+  afterInsertion(list) {
+    assert_object_equals(Object.getOwnPropertyNames(list), ["0", "1", "2"]);
+  },
+  afterRemoval(list) {
+    assert_object_equals(Object.getOwnPropertyNames(list), ["0", "1"]);
+  }
+});
+
diff --git a/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-1.html b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-1.html
new file mode 100644
index 00000000..c5c58f9d
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-1.html
@@ -0,0 +1,22 @@
+
+
+
+NodeList (static collection) "length" getter tampered
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-2.html b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-2.html
new file mode 100644
index 00000000..bac05112
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-2.html
@@ -0,0 +1,22 @@
+
+
+
+NodeList (static collection) "length" getter tampered
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-3.html b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-3.html
new file mode 100644
index 00000000..9690aab3
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-3.html
@@ -0,0 +1,22 @@
+
+
+
+NodeList (static collection) "length" getter tampered
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html
new file mode 100644
index 00000000..5ce41467
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html
@@ -0,0 +1,22 @@
+
+
+
+NodeList (static collection) "length" getter tampered (Array.prototype.indexOf)
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html
new file mode 100644
index 00000000..57814ed5
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html
@@ -0,0 +1,22 @@
+
+
+
+NodeList (static collection) "length" getter tampered (Array.prototype.indexOf)
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html
new file mode 100644
index 00000000..838f376d
--- /dev/null
+++ b/tests/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html
@@ -0,0 +1,22 @@
+
+
+
+NodeList (static collection) "length" getter tampered (Array.prototype.indexOf)
+
+
+
+
+
+
+
diff --git a/tests/wpt/dom/nodes/support/NodeList-static-length-tampered.js b/tests/wpt/dom/nodes/support/NodeList-static-length-tampered.js
new file mode 100644
index 00000000..51167e2d
--- /dev/null
+++ b/tests/wpt/dom/nodes/support/NodeList-static-length-tampered.js
@@ -0,0 +1,46 @@
+"use strict";
+
+function makeStaticNodeList(length) {
+    const fooRoot = document.createElement("div");
+
+    for (var i = 0; i < length; i++) {
+        const el = document.createElement("span");
+        el.className = "foo";
+        fooRoot.append(el);
+    }
+
+    document.body.append(fooRoot);
+    return fooRoot.querySelectorAll(".foo");
+}
+
+const indexOfNodeList = new Function("nodeList", `
+    const __cacheBust = ${Math.random()};
+
+    const el = nodeList[50];
+
+    let index = -1;
+
+    for (var i = 0; i < 1e5 / 2; i++) {
+        for (var j = 0; j < nodeList.length; j++) {
+            if (nodeList[j] === el) {
+                index = j;
+                break;
+            }
+        }
+    }
+
+    return index;
+`);
+
+const arrayIndexOfNodeList = new Function("nodeList", `
+    const __cacheBust = ${Math.random()};
+
+    const el = nodeList[50];
+    const {indexOf} = Array.prototype;
+
+    for (var i = 0; i < 1e5; i++) {
+        var index = indexOf.call(nodeList, el);
+    }
+
+    return index;
+`);

From 3ea95982d657aeeddb7598af9183310831dbe1ef Mon Sep 17 00:00:00 2001
From: Pierre Tachoire 
Date: Fri, 15 Dec 2023 13:51:55 +0100
Subject: [PATCH 08/11] dom: nodelist: use unmanaged arraylist

---
 src/dom/document.zig |  4 ++--
 src/dom/element.zig  |  4 ++--
 src/dom/node.zig     |  2 +-
 src/dom/nodelist.zig | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/dom/document.zig b/src/dom/document.zig
index 9ab1b852..16350634 100644
--- a/src/dom/document.zig
+++ b/src/dom/document.zig
@@ -228,7 +228,7 @@ pub const Document = struct {
                 if (try parser.nodeType(next.?) != .element) {
                     continue;
                 }
-                try list.append(next.?);
+                try list.append(alloc, next.?);
             }
         }
 
@@ -237,7 +237,7 @@ pub const Document = struct {
 
         // walk over the node tree fo find the node by id.
         const e = try parser.documentGetElementById(self, selectors[1..]) orelse return list;
-        try list.append(parser.elementToNode(e));
+        try list.append(alloc, parser.elementToNode(e));
 
         return list;
     }
diff --git a/src/dom/element.zig b/src/dom/element.zig
index 50999314..ef483e27 100644
--- a/src/dom/element.zig
+++ b/src/dom/element.zig
@@ -247,7 +247,7 @@ pub const Element = struct {
                 if (try parser.nodeType(next.?) != .element) {
                     continue;
                 }
-                try list.append(next.?);
+                try list.append(alloc, next.?);
             }
         }
 
@@ -256,7 +256,7 @@ pub const Element = struct {
 
         // walk over the node tree fo find the node by id.
         const n = try getElementById(self, selectors[1..]) orelse return list;
-        try list.append(n);
+        try list.append(alloc, n);
 
         return list;
     }
diff --git a/src/dom/node.zig b/src/dom/node.zig
index 3144ea4e..540c6b26 100644
--- a/src/dom/node.zig
+++ b/src/dom/node.zig
@@ -200,7 +200,7 @@ pub const Node = struct {
 
         var n = try parser.nodeFirstChild(self) orelse return list;
         while (true) {
-            try list.append(n);
+            try list.append(alloc, n);
             n = try parser.nodeNextSibling(n) orelse return list;
         }
     }
diff --git a/src/dom/nodelist.zig b/src/dom/nodelist.zig
index b663ec4b..269f2e4a 100644
--- a/src/dom/nodelist.zig
+++ b/src/dom/nodelist.zig
@@ -18,14 +18,14 @@ pub const NodeList = struct {
     pub const mem_guarantied = true;
     pub const Exception = DOMException;
 
-    const NodesArrayList = std.ArrayList(*parser.Node);
+    const NodesArrayList = std.ArrayListUnmanaged(*parser.Node);
 
     nodes: NodesArrayList,
 
     pub fn init(alloc: std.mem.Allocator) !*NodeList {
         const list = try alloc.create(NodeList);
         list.* = NodeList{
-            .nodes = NodesArrayList.init(alloc),
+            .nodes = NodesArrayList{},
         };
 
         return list;
@@ -33,12 +33,12 @@ pub const NodeList = struct {
 
     pub fn deinit(self: *NodeList, alloc: std.mem.Allocator) void {
         // TODO unref all nodes
-        self.nodes.deinit();
+        self.nodes.deinit(alloc);
         alloc.destroy(self);
     }
 
-    pub fn append(self: *NodeList, node: *parser.Node) !void {
-        try self.nodes.append(node);
+    pub fn append(self: *NodeList, alloc: std.mem.Allocator, node: *parser.Node) !void {
+        try self.nodes.append(alloc, node);
     }
 
     pub fn get_length(self: *NodeList) u32 {

From c72cf814d0cd6c8728af46d9bfd935a103d9b40f Mon Sep 17 00:00:00 2001
From: Pierre Tachoire 
Date: Tue, 19 Dec 2023 14:48:00 +0100
Subject: [PATCH 09/11] netsurf: remove useless alias

---
 src/netsurf.zig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/netsurf.zig b/src/netsurf.zig
index a2b268dc..2455b35a 100644
--- a/src/netsurf.zig
+++ b/src/netsurf.zig
@@ -356,10 +356,6 @@ pub const NodeType = enum(u4) {
 // NodeList
 pub const NodeList = c.dom_nodelist;
 
-pub const NodeListType = enum(c_uint) {
-    query = 5,
-};
-
 pub fn nodeListLength(nodeList: *NodeList) !u32 {
     var ln: u32 = undefined;
     const err = c.dom_nodelist_get_length(nodeList, &ln);

From 9f6253b21d753e4d9a2367f239749945ec59a064 Mon Sep 17 00:00:00 2001
From: Pierre Tachoire 
Date: Tue, 19 Dec 2023 14:53:45 +0100
Subject: [PATCH 10/11] nodelist: return struct instead of pointer

---
 src/dom/document.zig | 4 ++--
 src/dom/element.zig  | 4 ++--
 src/dom/node.zig     | 4 ++--
 src/dom/nodelist.zig | 8 ++------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/dom/document.zig b/src/dom/document.zig
index 16350634..0c76ae58 100644
--- a/src/dom/document.zig
+++ b/src/dom/document.zig
@@ -210,8 +210,8 @@ pub const Document = struct {
     // TODO netsurf doesn't handle query selectors. We have to implement a
     // solution by ourselves.
     // We handle only * and single id selector like `#foo`.
-    pub fn _querySelectorAll(self: *parser.Document, alloc: std.mem.Allocator, selectors: []const u8) !*NodeList {
-        const list = try NodeList.init(alloc);
+    pub fn _querySelectorAll(self: *parser.Document, alloc: std.mem.Allocator, selectors: []const u8) !NodeList {
+        var list = try NodeList.init();
         errdefer list.deinit(alloc);
 
         if (selectors.len == 0) return list;
diff --git a/src/dom/element.zig b/src/dom/element.zig
index ef483e27..5827604a 100644
--- a/src/dom/element.zig
+++ b/src/dom/element.zig
@@ -229,8 +229,8 @@ pub const Element = struct {
     // TODO netsurf doesn't handle query selectors. We have to implement a
     // solution by ourselves.
     // We handle only * and single id selector like `#foo`.
-    pub fn _querySelectorAll(self: *parser.Element, alloc: std.mem.Allocator, selectors: []const u8) !*NodeList {
-        const list = try NodeList.init(alloc);
+    pub fn _querySelectorAll(self: *parser.Element, alloc: std.mem.Allocator, selectors: []const u8) !NodeList {
+        var list = try NodeList.init();
         errdefer list.deinit(alloc);
 
         if (selectors.len == 0) return list;
diff --git a/src/dom/node.zig b/src/dom/node.zig
index 540c6b26..5bbc8849 100644
--- a/src/dom/node.zig
+++ b/src/dom/node.zig
@@ -194,8 +194,8 @@ pub const Node = struct {
         return try parser.nodeHasChildNodes(self);
     }
 
-    pub fn get_childNodes(self: *parser.Node, alloc: std.mem.Allocator) !*NodeList {
-        const list = try NodeList.init(alloc);
+    pub fn get_childNodes(self: *parser.Node, alloc: std.mem.Allocator) !NodeList {
+        var list = try NodeList.init();
         errdefer list.deinit(alloc);
 
         var n = try parser.nodeFirstChild(self) orelse return list;
diff --git a/src/dom/nodelist.zig b/src/dom/nodelist.zig
index 269f2e4a..fd3419df 100644
--- a/src/dom/nodelist.zig
+++ b/src/dom/nodelist.zig
@@ -22,19 +22,15 @@ pub const NodeList = struct {
 
     nodes: NodesArrayList,
 
-    pub fn init(alloc: std.mem.Allocator) !*NodeList {
-        const list = try alloc.create(NodeList);
-        list.* = NodeList{
+    pub fn init() !NodeList {
+        return NodeList{
             .nodes = NodesArrayList{},
         };
-
-        return list;
     }
 
     pub fn deinit(self: *NodeList, alloc: std.mem.Allocator) void {
         // TODO unref all nodes
         self.nodes.deinit(alloc);
-        alloc.destroy(self);
     }
 
     pub fn append(self: *NodeList, alloc: std.mem.Allocator, node: *parser.Node) !void {

From 874677fa81bbf288c9f62063e945049a20d63e36 Mon Sep 17 00:00:00 2001
From: Pierre Tachoire 
Date: Mon, 18 Dec 2023 21:52:15 +0100
Subject: [PATCH 11/11] Update src/dom/document.zig

Co-authored-by: Francis Bouvier 
---
 src/dom/document.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dom/document.zig b/src/dom/document.zig
index 0c76ae58..5157e86b 100644
--- a/src/dom/document.zig
+++ b/src/dom/document.zig
@@ -194,7 +194,7 @@ pub const Document = struct {
 
     // TODO netsurf doesn't handle query selectors. We have to implement a
     // solution by ourselves.
-    // We handle only * and single id selector like `#foo`.
+    // For now we handle only * and single id selector like `#foo`.
     pub fn _querySelector(self: *parser.Document, selectors: []const u8) !?ElementUnion {
         if (selectors.len == 0) return null;