Move to a single definition of treeTypes for all tests

Author: gsnedders

html5lib/tests/support.py

@@ -13,16 +13,24 @@
                                                 os.path.pardir,
                                                 os.path.pardir)))
 
-from html5lib import treebuilders
+from html5lib import treebuilders, treewalkers, treeadapters
 del base_path
 
 # Build a dict of available trees
-treeTypes = {"DOM": treebuilders.getTreeBuilder("dom")}
+treeTypes = {}
 
-# Try whatever etree implementations are available from a list that are
-#"supposed" to work
+# DOM impls
+treeTypes["DOM"] = {
+    "builder": treebuilders.getTreeBuilder("dom"),
+    "walker": treewalkers.getTreeWalker("dom")
+}
+
+# ElementTree impls
 import xml.etree.ElementTree as ElementTree
-treeTypes['ElementTree'] = treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True)
+treeTypes['ElementTree'] = {
+    "builder": treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True),
+    "walker": treewalkers.getTreeWalker("etree", ElementTree)
+}
 
 try:
     import xml.etree.cElementTree as cElementTree
@@ -33,14 +41,32 @@
     if cElementTree.Element is ElementTree.Element:
         treeTypes['cElementTree'] = None
     else:
-        treeTypes['cElementTree'] = treebuilders.getTreeBuilder("etree", cElementTree, fullTree=True)
+        treeTypes['cElementTree'] = {
+            "builder": treebuilders.getTreeBuilder("etree", cElementTree, fullTree=True),
+            "walker": treewalkers.getTreeWalker("etree", cElementTree)
+        }
 
 try:
     import lxml.etree as lxml  # flake8: noqa
 except ImportError:
     treeTypes['lxml'] = None
 else:
-    treeTypes['lxml'] = treebuilders.getTreeBuilder("lxml")
+    treeTypes['lxml'] = {
+        "builder": treebuilders.getTreeBuilder("lxml"),
+        "walker": treewalkers.getTreeWalker("lxml")
+    }
+
+# Genshi impls
+try:
+    import genshi  # flake8: noqa
+except ImportError:
+    pass
+else:
+    treeTypes["genshi"] = {
+        "builder": treebuilders.getTreeBuilder("dom"),
+        "adapter": lambda tree: treeadapters.genshi.to_genshi(treewalkers.getTreeWalker("dom")(tree)),
+        "walker": treewalkers.getTreeWalker("genshi")
+    }
 
 
 def get_data_files(subdirectory, files='*.dat'):

html5lib/tests/test_treewalkers.py

@@ -11,57 +11,12 @@
 except AttributeError:
     unittest.TestCase.assertEqual = unittest.TestCase.assertEquals
 
-from .support import get_data_files, TestData, convertExpected
+import pytest
 
-from html5lib import html5parser, treewalkers, treebuilders, treeadapters, constants
-from html5lib.filters.lint import Filter as Lint
-
-
-treeTypes = {
-    "DOM": {"builder": treebuilders.getTreeBuilder("dom"),
-            "walker": treewalkers.getTreeWalker("dom")},
-}
-
-# Try whatever etree implementations are available from a list that are
-#"supposed" to work
-try:
-    import xml.etree.ElementTree as ElementTree
-except ImportError:
-    pass
-else:
-    treeTypes['ElementTree'] = \
-        {"builder": treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True),
-         "walker": treewalkers.getTreeWalker("etree", ElementTree)}
-
-try:
-    import xml.etree.cElementTree as ElementTree
-except ImportError:
-    pass
-else:
-    treeTypes['cElementTree'] = \
-        {"builder": treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True),
-         "walker": treewalkers.getTreeWalker("etree", ElementTree)}
+from .support import get_data_files, TestData, convertExpected, treeTypes
 
-
-try:
-    import lxml.etree as ElementTree  # flake8: noqa
-except ImportError:
-    pass
-else:
-    treeTypes['lxml_native'] = \
-        {"builder": treebuilders.getTreeBuilder("lxml"),
-         "walker": treewalkers.getTreeWalker("lxml")}
-
-
-try:
-    import genshi  # flake8: noqa
-except ImportError:
-    pass
-else:
-    treeTypes["genshi"] = \
-        {"builder": treebuilders.getTreeBuilder("dom"),
-         "adapter": lambda tree: treeadapters.genshi.to_genshi(treewalkers.getTreeWalker("dom")(tree)),
-         "walker": treewalkers.getTreeWalker("genshi")}
+from html5lib import html5parser, treewalkers, constants
+from html5lib.filters.lint import Filter as Lint
 
 import re
 attrlist = re.compile(r"^(\s+)\w+=.*(\n\1\w+=.*)+", re.M)
@@ -89,6 +44,8 @@ def test_all_tokens(self):
             {'type': 'EndTag', 'namespace': 'http://www.w3.org/1999/xhtml', 'name': 'html'}
         ]
         for treeName, treeCls in sorted(treeTypes.items()):
+            if treeCls is None:
+                continue
             p = html5parser.HTMLParser(tree=treeCls["builder"])
             document = p.parse("<html><head></head><body>a<div>b</div>c</body></html>")
             document = treeCls.get("adapter", lambda x: x)(document)
@@ -98,6 +55,8 @@ def test_all_tokens(self):
 
 
 def runTreewalkerTest(innerHTML, input, expected, errors, treeClass):
+    if treeClass is None:
+        pytest.skip("Treebuilder not loaded")
     warnings.resetwarnings()
     warnings.simplefilter("error")
     try:
@@ -164,6 +123,8 @@ def set_attribute_on_first_child(docfrag, name, value, treeName):
 def runTreewalkerEditTest(intext, expected, attrs_to_add, tree):
     """tests what happens when we add attributes to the intext"""
     treeName, treeClass = tree
+    if treeClass is None:
+        pytest.skip("Treebuilder not loaded")
     parser = html5parser.HTMLParser(tree=treeClass["builder"])
     document = parser.parseFragment(intext)
     for nom, val in attrs_to_add:

html5lib/tests/tree_construction.py

@@ -13,18 +13,23 @@ class TreeConstructionFile(pytest.File):
     def collect(self):
         tests = TestData(str(self.fspath), "data")
         for i, test in enumerate(tests):
-            for treeName, treeClass in sorted(treeTypes.items()):
+            for treeName, treeAPIs in sorted(treeTypes.items()):
+                if treeAPIs is not None and "adapter" in treeAPIs:
+                    continue
                 for namespaceHTMLElements in (True, False):
                     if namespaceHTMLElements:
                         nodeid = "%d::%s::namespaced" % (i, treeName)
                     else:
                         nodeid = "%d::%s::void-namespace" % (i, treeName)
-                    item = ParserTest(nodeid, self,
-                                      test, treeClass, namespaceHTMLElements)
+                    item = ParserTest(nodeid,
+                                      self,
+                                      test,
+                                      treeAPIs["builder"] if treeAPIs is not None else None,
+                                      namespaceHTMLElements)
                     item.add_marker(getattr(pytest.mark, treeName))
                     if namespaceHTMLElements:
                         item.add_marker(pytest.mark.namespaced)
-                    if treeClass is None:
+                    if treeAPIs is None:
                         item.add_marker(pytest.mark.skipif(True, reason="Treebuilder not loaded"))
                     yield item