Make serializer tests pass

jgraham · jgraham · commit 92bce5132665 · 2009-07-12T17:14:54.000+02:00
diff --git a/src/html5lib/filters/optionaltags.py b/src/html5lib/filters/optionaltags.py
@@ -14,7 +14,8 @@ def __iter__(self):
         for previous, token, next in self.slider():
             type = token["type"]
             if type == "StartTag":
-                if token["data"] or not self.is_optional_start(token["name"], previous, next):
+                if (token["data"] or 
+                    not self.is_optional_start(token["name"], previous, next)):
                     yield token
             elif type == "EndTag":
                 if not self.is_optional_end(token["name"], next):
@@ -119,11 +120,12 @@ def is_optional_end(self, tagname, next):
             # nav, ol, p, pre, section, table, or ul, element, or if
             # there is no more content in the parent element.
             if type in ("StartTag", "EmptyTag"):
-                return next["name"] in ('address', 'article', 'aside',     \
-                    'blockquote', 'datagrid', 'dialog', 'dir', 'div',      \
-                    'dl', 'fieldset', 'footer', 'form', 'h1', 'h2', 'h3',  \
-                    'h4', 'h5', 'h6', 'header', 'hr', 'menu', 'nav', 'ol', \
-                    'p', 'pre', 'section', 'table', 'ul')
+                return next["name"] in ('address', 'article', 'aside',
+                                        'blockquote', 'datagrid', 'dialog', 
+                                        'dir', 'div', 'dl', 'fieldset', 'footer',
+                                        'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+                                        'header', 'hr', 'menu', 'nav', 'ol', 
+                                        'p', 'pre', 'section', 'table', 'ul')
             else:
                 return type == "EndTag" or type is None
         elif tagname == 'option':
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
@@ -13,17 +13,17 @@ def __iter__(self):
             type = token[0]
             if type == "StartTag":
                 if len(token) == 4:
-                    namespace, name, attrib = token[1:]
+                    namespace, name, attrib = token[1:4]
                 else:
                     namespace = default_namespace
-                    name, attrib = token[1:]
+                    name, attrib = token[1:3]
                 yield self.startTag(namespace, name, attrib)
             elif type == "EndTag":
                 if len(token) == 3:
-                    namespace, name = token[1:]
+                    namespace, name = token[1:3]
                 else:
                     namespace = default_namespace
-                    name= token[1]
+                    name = token[1]
                 yield self.endTag(namespace, name)
             elif type == "EmptyTag":
                 if len(token) == 4:
@@ -53,15 +53,15 @@ def addTest(cls, name, description, input, expected, xhtml, options):
     def mockTest(self, input, options, expected, xhtml):
         result = self.serialize_html(input, options)
         if len(expected) == 1:
-            self.assertEquals(expected[0], result)
+            self.assertEquals(expected[0], result, "Expected:\n%s\nActual:\n%s\nOptions\nxhtml:False\n%s"%(expected[0], result, str(options)))
         elif result not in expected:
             self.fail("Expected: %s, Received: %s" % (expected, result))
 
         if not xhtml: return
 
         result = self.serialize_xhtml(input, options)
         if len(xhtml) == 1:
-            self.assertEquals(xhtml[0], result)
+            self.assertEquals(xhtml[0], result, "Expected:\n%s\nActual:\n%s\nOptions\nxhtml:True\n%s"%(xhtml[0], result, str(options)))
         elif result not in xhtml:
             self.fail("Expected: %s, Received: %s" % (xhtml, result))
 
