Clean up a function name that confuses nose

James Graham · James Graham · commit b837a90286e7 · 2012-05-20T19:32:55.000+02:00
diff --git a/html5lib/tests/support.py b/html5lib/tests/support.py
@@ -62,7 +62,7 @@
 except ImportError:
     pass
 
-def html5lib_test_files(subdirectory, files='*.dat'):
+def get_data_files(subdirectory, files='*.dat'):
     return glob.glob(os.path.join(test_dir,subdirectory,files))
 
 class DefaultDict(dict):
diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py
@@ -1,6 +1,6 @@
 import os
 import unittest
-from support import html5lib_test_files, TestData, test_dir
+from support import get_data_files, TestData, test_dir
 
 from html5lib import HTMLParser, inputstream
 
@@ -14,7 +14,7 @@ def test_codec_name(self):
         self.assertEquals(inputstream.codecName("ISO_8859--1"), "windows-1252")
 
 def buildTestSuite():
-    for filename in html5lib_test_files("encoding"):
+    for filename in get_data_files("encoding"):
         test_name = os.path.basename(filename).replace('.dat',''). \
             replace('-','')
         tests = TestData(filename, "data")
diff --git a/html5lib/tests/test_parser.py b/html5lib/tests/test_parser.py
@@ -7,7 +7,7 @@
 
 warnings.simplefilter("error")
 
-from support import html5lib_test_files as data_files
+from support import get_data_files
 from support import TestData, convert, convertExpected
 import html5lib
 from html5lib import html5parser, treebuilders, constants
@@ -115,7 +115,7 @@ def runParserTest(innerHTML, input, expected, errors, treeClass,
 
 def test_parser():
     sys.stderr.write('Testing tree builders '+ " ".join(treeTypes.keys()) + "\n")
-    files = data_files('tree-construction')
+    files = get_data_files('tree-construction')
     
     for filename in files:
         testName = os.path.basename(filename).replace(".dat","")
diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
@@ -1,6 +1,6 @@
 import os
 import unittest
-from support import html5lib_test_files
+from support import get_data_files
 
 try:
     import json
@@ -170,7 +170,7 @@ def testEntityNoResolve(self):
             self.assertEquals(u"""<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&beta;</html>""", result)
 
 def test_serializer():
-    for filename in html5lib_test_files('serializer', '*.test'):
+    for filename in get_data_files('serializer', '*.test'):
         tests = json.load(file(filename))
         test_name = os.path.basename(filename).replace('.test','')
         for index, test in enumerate(tests['tests']):
diff --git a/html5lib/tests/test_tokenizer.py b/html5lib/tests/test_tokenizer.py
@@ -9,7 +9,7 @@
 except ImportError:
     import simplejson as json
 
-from support import html5lib_test_files
+from support import get_data_files
 from html5lib.tokenizer import HTMLTokenizer
 from html5lib import constants
 
@@ -141,7 +141,7 @@ def runTokenizerTest(test):
     #XXX - move this out into the setup function
     #concatenate all consecutive character tokens into a single token
     if 'doubleEscaped' in test:
-        test = unescape_test(test)
+        test = unescape(test)
 
     expected = concatenateCharacterTokens(test['output'])            
     if 'lastStartTag' not in test:
@@ -174,7 +174,7 @@ def capitalize(s):
     return s
 
 def testTokenizer():
-    for filename in html5lib_test_files('tokenizer', '*.test'):
+    for filename in get_data_files('tokenizer', '*.test'):
         tests = json.load(file(filename))
         testName = os.path.basename(filename).replace(".test","")
         if 'tests' in tests:
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
@@ -5,7 +5,7 @@
 
 warnings.simplefilter("error")
 
-from support import html5lib_test_files, TestData, convertExpected
+from support import get_data_files, TestData, convertExpected
 
 from html5lib import html5parser, treewalkers, treebuilders, constants
 from html5lib.filters.lint import Filter as LintFilter, LintError
@@ -293,7 +293,7 @@ def test_treewalker():
     sys.stdout.write('Testing tree walkers '+ " ".join(treeTypes.keys()) + "\n")
 
     for treeName, treeCls in treeTypes.iteritems():
-        files = html5lib_test_files('tree-construction')
+        files = get_data_files('tree-construction')
         for filename in files:
             testName = os.path.basename(filename).replace(".dat","")
 
diff --git a/html5lib/tests/tokenizertotree.py b/html5lib/tests/tokenizertotree.py
@@ -17,7 +17,7 @@ def main(out_path):
         sys.stderr.write("Path %s does not exist"%out_path)
         sys.exit(1)
 
-    for filename in support.html5lib_test_files('tokenizer', '*.test'):
+    for filename in support.get_data_files('tokenizer', '*.test'):
         run_file(filename, out_path)
 
 def run_file(filename, out_path):
