refs #29: updated the xml based tests for the new expected html

Jason Ward · Jason Ward · commit 0cec15865a1e · 2013-05-21T13:23:44.000-04:00
diff --git a/pydocx/tests/__init__.py b/pydocx/tests/__init__.py
@@ -11,6 +11,17 @@
 )
 from unittest import TestCase
 
+STYLE = '<style>.insert {color:green;}.delete {color:red;text-decoration:line-through;}.center {text-align:center;}.right {text-align:right;}.left {text-align:left;}.comment {color:blue;}body {width:0px;margin:0px auto;}</style>'  # noqa
+
+BASE_HTML = '''
+<html>
+    <head>
+    %s
+    </head>
+    <body>%%s</body>
+</html>
+''' % STYLE
+
 
 def assert_html_equal(actual_html, expected_html):
     assert collapse_html(
@@ -99,8 +110,8 @@ def _parse_styles(self):
         '1': 'decimal',
     },
     '2': {
-        '0': 'none',
-        '1': 'none',
+        '0': 'lowerLetter',
+        '1': 'lowerLetter',
     },
 }
 
@@ -136,4 +147,4 @@ def test_expected_output(self):
             numbering_dict=self.numbering_dict,
         ).parsed
 
-        assert_html_equal(html, self.expected_output)
+        assert_html_equal(html, BASE_HTML % self.expected_output)
diff --git a/pydocx/tests/test_docx.py b/pydocx/tests/test_docx.py
@@ -6,24 +6,13 @@
 from nose.plugins.skip import SkipTest
 #from nose.tools import assert_raises
 
-from pydocx.tests import assert_html_equal
+from pydocx.tests import assert_html_equal, BASE_HTML
 from pydocx.parsers.Docx2Html import Docx2Html
 
 
 def convert(path):
     return Docx2Html(path).parsed
 
-STYLE = '<style>.insert {color:green;}.delete {color:red;text-decoration:line-through;}.center {text-align:center;}.right {text-align:right;}.left {text-align:left;}.comment {color:blue;}body {width:0px;margin:0px auto;}</style>'  # noqa
-
-BASE_HTML = '''
-<html>
-    <head>
-    %s
-    </head>
-    <body>%%s</body>
-</html>
-''' % STYLE
-
 
 def test_extract_html():
     file_path = path.join(
diff --git a/pydocx/tests/test_xml.py b/pydocx/tests/test_xml.py
