Unbreak sanitizer tests and convert to nose

jgraham · jgraham · commit f50cb0827bf2 · 2011-11-14T23:19:30.000+01:00
diff --git a/html5lib/sanitizer.py b/html5lib/sanitizer.py
@@ -245,11 +245,11 @@ def sanitize_css(self, style):
 
 class HTMLSanitizer(HTMLTokenizer, HTMLSanitizerMixin):
     def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
-                 lowercaseElementName=False, lowercaseAttrName=False):
+                 lowercaseElementName=False, lowercaseAttrName=False, parser=None):
         #Change case matching defaults as we only output lowercase html anyway
         #This solution doesn't seem ideal...
         HTMLTokenizer.__init__(self, stream, encoding, parseMeta, useChardet,
-                               lowercaseElementName, lowercaseAttrName)
+                               lowercaseElementName, lowercaseAttrName, parser=parser)
 
     def __iter__(self):
         for token in HTMLTokenizer.__iter__(self):
diff --git a/html5lib/tests/test_sanitizer.py b/html5lib/tests/test_sanitizer.py
@@ -7,92 +7,70 @@
 except ImportError:
     import simplejson as json
 
-from support import html5lib_test_files
 from html5lib import html5parser, sanitizer, constants
 
-class SanitizeTest(unittest.TestCase):
-  def addTest(cls, name, expected, input):
-    def test(self, expected=expected, input=input):
-        expected = ''.join([token.toxml() for token in html5parser.HTMLParser().
-          parseFragment(expected).childNodes])
-        expected = json.loads(json.dumps(expected))
-        self.assertEqual(expected, self.sanitize_html(input))
-    setattr(cls, name, test)
-  addTest = classmethod(addTest)
+def runSanitizerTest(name, expected, input):
+    expected = ''.join([token.toxml() for token in html5parser.HTMLParser().
+                         parseFragment(expected).childNodes])
+    expected = json.loads(json.dumps(expected))
+    assert expected == sanitize_html(input)
 
-  def sanitize_html(self,stream):
+def sanitize_html(stream):
     return ''.join([token.toxml() for token in
-       html5parser.HTMLParser(tokenizer=sanitizer.HTMLSanitizer).
-           parseFragment(stream).childNodes])
-
-  def test_should_handle_astral_plane_characters(self):
-    self.assertEqual(u"<p>\U0001d4b5 \U0001d538</p>",
-      self.sanitize_html("<p>&#x1d4b5; &#x1d538;</p>"))
-
-for tag_name in sanitizer.HTMLSanitizer.allowed_elements:
-    if tag_name in ['caption', 'col', 'colgroup', 'optgroup', 'option', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr']: continue ### TODO
-    if tag_name != tag_name.lower(): continue ### TODO
-    if tag_name == 'image':
-        SanitizeTest.addTest("test_should_allow_%s_tag" % tag_name,
-          "<img title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz",
-          "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
-    elif tag_name == 'br':
-        SanitizeTest.addTest("test_should_allow_%s_tag" % tag_name,
-          "<br title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz<br/>",
+                    html5parser.HTMLParser(tokenizer=sanitizer.HTMLSanitizer).
+                     parseFragment(stream).childNodes])
+
+def test_should_handle_astral_plane_characters():
+    assert u"<p>\U0001d4b5 \U0001d538</p>" == sanitize_html("<p>&#x1d4b5; &#x1d538;</p>")
+
+def test_sanitizer():
+    for tag_name in sanitizer.HTMLSanitizer.allowed_elements:
+        if tag_name in ['caption', 'col', 'colgroup', 'optgroup', 'option', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr']:
+            continue ### TODO
+        if tag_name != tag_name.lower():
+            continue ### TODO
+        if tag_name == 'image':
+            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
+              "<img title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz",
+              "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
+        elif tag_name == 'br':
+            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
+              "<br title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz<br/>",
+              "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
+        elif tag_name in constants.voidElements:
+            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
+              "<%s title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz" % tag_name,
+              "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
+        else:
+            yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
+              "<%s title=\"1\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</%s>" % (tag_name,tag_name),
+              "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
+
+    for tag_name in sanitizer.HTMLSanitizer.allowed_elements:
+        tag_name = tag_name.upper()
+        yield (runSanitizerTest, "test_should_forbid_%s_tag" % tag_name,
+          "&lt;%s title=\"1\"&gt;foo &lt;bad&gt;bar&lt;/bad&gt; baz&lt;/%s&gt;" % (tag_name,tag_name),
           "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
-    elif tag_name in constants.voidElements:
-        SanitizeTest.addTest("test_should_allow_%s_tag" % tag_name,
-          "<%s title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz" % tag_name,
-          "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
-    else:
-        SanitizeTest.addTest("test_should_allow_%s_tag" % tag_name,
-          "<%s title=\"1\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</%s>" % (tag_name,tag_name),
-          "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
-
-for tag_name in sanitizer.HTMLSanitizer.allowed_elements:
-    tag_name = tag_name.upper()
-    SanitizeTest.addTest("test_should_forbid_%s_tag" % tag_name,
-      "&lt;%s title=\"1\"&gt;foo &lt;bad&gt;bar&lt;/bad&gt; baz&lt;/%s&gt;" % (tag_name,tag_name),
-      "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name,tag_name))
-
-for attribute_name in sanitizer.HTMLSanitizer.allowed_attributes:
-    if attribute_name != attribute_name.lower(): continue ### TODO
-    if attribute_name == 'style': continue
-    SanitizeTest.addTest("test_should_allow_%s_attribute" % attribute_name,
-      "<p %s=\"foo\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>" % attribute_name,
-      "<p %s='foo'>foo <bad>bar</bad> baz</p>" % attribute_name)
-
-for attribute_name in sanitizer.HTMLSanitizer.allowed_attributes:
-    attribute_name = attribute_name.upper()
-    SanitizeTest.addTest("test_should_forbid_%s_attribute" % attribute_name,
-      "<p>foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>",
-      "<p %s='display: none;'>foo <bad>bar</bad> baz</p>" % attribute_name)
-
-for protocol in sanitizer.HTMLSanitizer.allowed_protocols:
-    SanitizeTest.addTest("test_should_allow_%s_uris" % protocol,
-      "<a href=\"%s\">foo</a>" % protocol,
-      """<a href="%s">foo</a>""" % protocol)
-
-for protocol in sanitizer.HTMLSanitizer.allowed_protocols:
-    SanitizeTest.addTest("test_should_allow_uppercase_%s_uris" % protocol,
-      "<a href=\"%s\">foo</a>" % protocol,
-      """<a href="%s">foo</a>""" % protocol)
-
-def buildTestSuite():
-    for filename in html5lib_test_files("sanitizer"):
-        for test in json.load(file(filename)):
-          SanitizeTest.addTest('test_' + test['name'], test['output'], test['input'])
-
-    return unittest.TestLoader().loadTestsFromTestCase(SanitizeTest)
-
-def sanitize_html(stream):
-  return ''.join([token.toxml() for token in
-      html5parser.HTMLParser(tokenizer=sanitizer.HTMLSanitizer).
-          parseFragment(stream).childNodes])
-
-def main():
-    buildTestSuite()
-    unittest.main()
 
-if __name__ == "__main__":
-    main()
+    for attribute_name in sanitizer.HTMLSanitizer.allowed_attributes:
+        if attribute_name != attribute_name.lower(): continue ### TODO
+        if attribute_name == 'style': continue
+        yield (runSanitizerTest, "test_should_allow_%s_attribute" % attribute_name,
+          "<p %s=\"foo\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>" % attribute_name,
+          "<p %s='foo'>foo <bad>bar</bad> baz</p>" % attribute_name)
+
+    for attribute_name in sanitizer.HTMLSanitizer.allowed_attributes:
+        attribute_name = attribute_name.upper()
+        yield (runSanitizerTest, "test_should_forbid_%s_attribute" % attribute_name,
+          "<p>foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>",
+          "<p %s='display: none;'>foo <bad>bar</bad> baz</p>" % attribute_name)
+
+    for protocol in sanitizer.HTMLSanitizer.allowed_protocols:
+        yield (runSanitizerTest, "test_should_allow_%s_uris" % protocol,
+          "<a href=\"%s\">foo</a>" % protocol,
+          """<a href="%s">foo</a>""" % protocol)
+
+    for protocol in sanitizer.HTMLSanitizer.allowed_protocols:
+        yield (runSanitizerTest, "test_should_allow_uppercase_%s_uris" % protocol,
+          "<a href=\"%s\">foo</a>" % protocol,
+        """<a href="%s">foo</a>""" % protocol)
