|
7 | 7 |
|
8 | 8 | warnings.simplefilter("error") |
9 | 9 |
|
10 | | -from support import html5lib_test_files, TestData, convert, convertExpected |
| 10 | +from support import html5lib_test_files as data_files |
| 11 | +from support import TestData, convert, convertExpected |
11 | 12 | import html5lib |
12 | 13 | from html5lib import html5parser, treebuilders, constants |
13 | 14 |
|
@@ -113,23 +114,23 @@ def runParserTest(innerHTML, input, expected, errors, treeClass, |
113 | 114 | assert len(p.errors) == len(errors), errorMsg2.encode("utf-8") |
114 | 115 |
|
115 | 116 | def test_parser(): |
116 | | - sys.stdout.<
8000
span class=pl-c1>write('Testing tree builders '+ " ".join(treeTypes.keys()) + "\n") |
117 | | - |
118 | | - for treeName, treeCls in treeTypes.iteritems(): |
119 | | - files = html5lib_test_files('tree-construction') |
120 | | - for filename in files: |
121 | | - testName = os.path.basename(filename).replace(".dat","") |
122 | | - |
123 | | - tests = TestData(filename, "data") |
| 117 | + sys.stderr.write('Testing tree builders '+ " ".join(treeTypes.keys()) + "\n") |
| 118 | + files = data_files('tree-construction') |
| 119 | + |
| 120 | + for filename in files: |
| 121 | + testName = os.path.basename(filename).replace(".dat","") |
124 | 122 |
|
125 | | - for index, test in enumerate(tests): |
126 | | - input, errors, innerHTML, expected = [test[key] for key in |
| 123 | + tests = TestData(filename, "data") |
| 124 | + |
| 125 | + for index, test in enumerate(tests): |
| 126 | + input, errors, innerHTML, expected = [test[key] for key in |
127 | 127 | 'data', 'errors', |
128 | 128 | 'document-fragment', |
129 | 129 | 'document'] |
130 | | - if errors: |
131 | | - errors = errors.split("\n") |
132 | | - |
| 130 | + if errors: |
| 131 | + errors = errors.split("\n") |
| 132 | + |
| 133 | + for treeName, treeCls in treeTypes.iteritems(): |
133 | 134 | for namespaceHTMLElements in (True, False): |
134 | 135 | print input |
135 | 136 | yield (runParserTest, innerHTML, input, expected, errors, treeCls, |
|
0 commit comments