Minor refactoring/cleanup

rubys · rubys · commit 668cd3aa937e · 2007-07-03T15:56:00.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40845
diff --git a/tests/support.py b/tests/support.py
@@ -87,7 +87,7 @@ def __iter__(self):
     def isSectionHeading(self, line):
         """If the current heading is a test section heading return the heading,
         otherwise return False"""
-        line=line.strip()
+        line = line.strip()
         if line.startswith("#") and line[1:] in self.sections:
             return line[1:]
         else:
@@ -98,7 +98,22 @@ def normaliseOutput(self, data):
         for key,value in data.iteritems():
             if value.endswith("\n"):
                 data[key] = value[:-1]
+        result = []
         for heading in self.sections:
-            if heading not in data:
-                data[heading] = None
-        return data
+            result.append(data.get(heading))
+        return result
+
+def convert(stripChars):
+    def convertData(data):
+        """convert the output of str(document) to the format used in the testcases"""
+        data = data.split("\n")
+        rv = []
+        for line in data:
+            if line.startswith("|"):
+                rv.append(line[stripChars:])
+            else:
+                rv.append(line)
+        return "\n".join(rv)
+    return convertData
+
+convertExpected = convert(2)
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -2,7 +2,7 @@
 import sys
 import StringIO
 import unittest
-from support import html5lib_test_files, TestData
+from support import html5lib_test_files, TestData, convert, convertExpected
 
 from html5lib import html5parser, treebuilders
 
@@ -46,26 +46,11 @@
 #Run the parse error checks
 checkParseErrors = False # TODO
 
-def convert(stripChars):
-    def convertData(data):
-        """convert the output of str(document) to the format used in the testcases"""
-        data = data.split("\n")
-        rv = []
-        for line in data:
-            if line.startswith("|"):
-                rv.append(line[stripChars:])
-            else:
-                rv.append(line)
-        return "\n".join(rv)
-    return convertData
 #XXX - There should just be one function here but for some reason the testcase
 #format differs from the treedump format by a single space character
-
 def convertTreeDump(data):
     return "\n".join(convert(3)(data).split("\n")[1:])
 
-convertExpected = convert(2)
-
 import re
 attrlist = re.compile(r"^(\s+)\w+=.*(\n\1\w+=.*)+",re.M)
 def sortattrs(x):
@@ -98,9 +83,6 @@ def runParserTest(self, innerHTML, input, expected, errors, treeClass):
         if checkParseErrors:
             self.assertEquals(len(p.errors), len(errors), errorMsg2)
 
-def test_parser():
-                yield innerHTML, input, expected, errors, treeName, treeCls
-
 def buildTestSuite():
     sys.stdout.write('Testing tree builders '+ " ".join(treeTypes.keys()) + "\n")
 
@@ -112,10 +94,10 @@ def buildTestSuite():
             tests = TestData(filename, ("data", "errors", "document-fragment",
                                         "document"))
 
-            for index, test in enumerate(tests):
-                errors = test['errors'].split("\n")
-                def testFunc(self, innerHTML=test['document-fragment'], input=test['data'],
-                    expected=test['document'], errors=errors, treeCls=treeCls): 
+            for index, (input, errors, innerHTML, expected) in enumerate(tests):
+                errors = errors.split("\n")
+                def testFunc(self, innerHTML=innerHTML, input=input,
+                    expected=expected, errors=errors, treeCls=treeCls): 
                     return self.runParserTest(innerHTML, input, expected, errors, treeCls)
                 setattr(TestCase, "test_%s_%d_%s" % (testName,index+1,treeName),
                      testFunc)
diff --git a/tests/test_treewalkers.py b/tests/test_treewalkers.py
@@ -3,13 +3,11 @@
 import StringIO
 import unittest
 
-from support import html5lib_test_files, TestData
+from support import html5lib_test_files, TestData, convertExpected
 
 from html5lib import html5parser, treewalkers, treebuilders
 from html5lib.filters.lint import Filter as LintFilter, LintError
 
-from test_parser import convertExpected
-
 def PullDOMAdapter(node):
     from xml.dom import Node
     from xml.dom.pulldom import START_ELEMENT, END_ELEMENT, COMMENT, CHARACTERS
@@ -231,11 +229,10 @@ def buildTestSuite():
             tests = TestData(filename, ("data", "errors", "document-fragment",
                                         "document"))
 
-            for index, test in enumerate(tests):
-                errors = test['errors'].split("\n")
-                def testFunc(self, innerHTML=test['document-fragment'],
-                    input=test['data'], expected=test['document'],
-                    errors=errors, treeCls=treeCls):
+            for index, (input, errors, innerHTML, expected) in enumerate(tests):
+                errors = errors.split("\n")
+                def testFunc(self, innerHTML=innerHTML, input=input,
+                    expected=expected, errors=errors, treeCls=treeCls):
                     self.runTest(innerHTML, input, expected, errors, treeCls)
                 setattr(TestCase, "test_%s_%d_%s" % (testName,index+1,treeName),
                      testFunc)
