Lint serializer test input; fix broken examples

gsnedders · gsnedders · commit d87ca9b7baf4 · 2016-05-08T18:48:47.000+01:00
diff --git a/html5lib/filters/lint.py b/html5lib/filters/lint.py
@@ -10,6 +10,10 @@
 
 
 class Filter(_base.Filter):
+    def __init__(self, source, require_matching_tags=True):
+        super(Filter, self).__init__(source)
+        self.require_matching_tags = require_matching_tags
+
     def __iter__(self):
         open_elements = []
         for token in _base.Filter.__iter__(self):
@@ -26,7 +30,7 @@ def __iter__(self):
                     assert type == "EmptyTag"
                 else:
                     assert type == "StartTag"
-                if type == "StartTag":
+                if type == "StartTag" and self.require_matching_tags:
                     open_elements.append((namespace, name))
                 for (namespace, name), value in token["data"].items():
                     assert namespace is None or isinstance(namespace, text_type)
@@ -44,7 +48,7 @@ def __iter__(self):
                 assert name != ""
                 if (not namespace or namespace == namespaces["html"]) and name in voidElements:
                     assert False, "Void element reported as EndTag token: %(tag)s" % {"tag": name}
-                else:
+                elif self.require_matching_tags:
                     start = open_elements.pop()
                     assert start == (namespace, name)
 
diff --git a/html5lib/tests/serializer-testdata/core.test b/html5lib/tests/serializer-testdata/core.test
@@ -293,20 +293,6 @@
             ],
             "description": "void element (as EmptyTag token)"
         },
-        {
-            "expected": [
-                "<img>"
-            ],
-            "input": [
-                [
-                    "StartTag",
-                    "http://www.w3.org/1999/xhtml",
-                    "img",
-                    {}
-                ]
-            ],
-            "description": "void element (as StartTag token)"
-        },
         {
             "expected": [
                 "<!DOCTYPE foo>"
diff --git a/html5lib/tests/serializer-testdata/optionaltags.test b/html5lib/tests/serializer-testdata/optionaltags.test
@@ -347,7 +347,7 @@
         },
         {
             "expected": [
-                "<foo>"
+                "<meta>"
             ],
             "input": [
                 [
@@ -358,7 +358,7 @@
                 ],
                 [
                     "EmptyTag",
-                    "foo",
+                    "meta",
                     {}
                 ]
             ],
@@ -2094,7 +2094,7 @@
                     {}
                 ],
                 [
-                    "StartTag",
+                    "EmptyTag",
                     "http://www.w3.org/1999/xhtml",
                     "col",
                     {}
diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
@@ -13,6 +13,7 @@
 
 import html5lib
 from html5lib import constants
+from html5lib.filters.lint import Filter as Lint
 from html5lib.serializer import HTMLSerializer, serialize
 from html5lib.treewalkers._base import TreeWalker
 
@@ -83,7 +84,7 @@ def _convertAttrib(self, attribs):
 
 def serialize_html(input, options):
     options = dict([(str(k), v) for k, v in options.items()])
-    stream = JsonWalker(input)
+    stream = Lint(JsonWalker(input), False)
     serializer = HTMLSerializer(alphabetical_attributes=True, **options)
     return serializer.render(stream, options.get("encoding", None))
 
@@ -125,9 +126,6 @@ def testCharacters(self):
     def testStartTagName(self):
         self.throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "\u0101", []]])
 
-    def testEmptyTagName(self):
-        self.throwsWithLatin1([["EmptyTag", "http://www.w3.org/1999/xhtml", "\u0101", []]])
-
     def testAttributeName(self):
         self.throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": None, "name": "\u0101", "value": "potato"}]]])
 

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@`
`347`	`347`	`},`
`348`	`348`	`{`
`349`	`349`	`"expected": [`
`350`		`- "<foo>"`
	`350`	`+ "<meta>"`
`351`	`351`	`],`
`352`	`352`	`"input": [`
`353`	`353`	`[`
`@@ -358,7 +358,7 @@`
`358`	`358`	`],`
`359`	`359`	`[`
`360`	`360`	`"EmptyTag",`
`361`		`- "foo",`
	`361`	`+ "meta",`
`362`	`362`	`{}`
`363`	`363`	`]`
`364`	`364`	`],`
`@@ -2094,7 +2094,7 @@`
`2094`	`2094`	`{}`
`2095`	`2095`	`],`
`2096`	`2096`	`[`
`2097`		`- "StartTag",`
	`2097`	`+ "EmptyTag",`
`2098`	`2098`	`"http://www.w3.org/1999/xhtml",`
`2099`	`2099`	`"col",`
`2100`	`2100`	`{}`