Use the same version of JSON for serializer tests as tokenizer tests, and fix DOCTYPE output, and run all tests.

gsnedders · gsnedders · commit 849e63d58354 · 2010-08-22T17:56:50.000+02:00
diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
@@ -1,6 +1,11 @@
 import os
 import unittest
-from support import simplejson, html5lib_test_files
+from support import html5lib_test_files
+
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 import html5lib
 from html5lib import html5parser, serializer, constants
@@ -117,7 +122,7 @@ def testEntityNoResolve(self):
 def buildBasicTestSuite():
     for filename in html5lib_test_files('serializer', '*.test'):
         test_name = os.path.basename(filename).replace('.test','')
-        tests = simplejson.load(file(filename))
+        tests = json.load(file(filename))
         for index, test in enumerate(tests['tests']):
             xhtml = test.get("xhtml", test["expected"])
             if test_name == 'optionaltags': xhtml = None
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
@@ -202,7 +202,7 @@ def convertTokens(tokens):
                                    token["publicId"],
                                    token["systemId"] and token["systemId"] or ""))
                 elif token["systemId"]:
-                    output.append("""%s<!DOCTYPE %s SYSTEM "%s">"""% 
+                    output.append("""%s<!DOCTYPE %s "" "%s">"""% 
                                   (" "*indent, token["name"], 
                                    token["systemId"]))
                 else:
@@ -277,11 +277,8 @@ def buildTestSuite():
 
     for treeName, treeCls in treeTypes.iteritems():
         files = html5lib_test_files('tree-construction')
-        files = [f for f in files if 
-                 not f.split(".")[-2][-2:] in ("s9", "10", "11", "12")] #skip namespace tests for now
         for filename in files:
             testName = os.path.basename(filename).replace(".dat","")
-            if testName == "tests5": continue # TODO
 
             tests = TestData(filename, "data")
 
