summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-12-14 17:25:23 +0000
committerMichael Williamson <mike@zwobble.org>2013-12-14 17:25:23 +0000
commitf5595b78f59d3f3a04c4e83702114dc2704f808a (patch)
treebb58b9fc9fc28ac81f7d96f1c48a2cbf9f09968a /tests
parenta5574fbb4540ca31ab0d4c639f6cd2a633e749fc (diff)
Match document matchers with numbering correctly
Diffstat (limited to 'tests')
-rw-r--r--tests/conversion_tests.py26
-rw-r--r--tests/docx/document_xml_tests.py2
-rw-r--r--tests/style_reader_tests.py4
3 files changed, 29 insertions, 3 deletions
diff --git a/tests/conversion_tests.py b/tests/conversion_tests.py
index 4732991..c0fab30 100644
--- a/tests/conversion_tests.py
+++ b/tests/conversion_tests.py
@@ -74,6 +74,32 @@ def no_warning_if_there_is_no_style_for_plain_paragraphs():
documents.paragraph(children=[_run_with_text("Tip")]),
)
assert_equal([], result.messages)
+
+
+@istest
+def bulleted_paragraphs_are_converted_using_matching_styles():
+ result = convert_document_element_to_html(
+ documents.paragraph(children=[
+ _run_with_text("Hello")
+ ], numbering=documents.numbering_level(level_index=1, is_ordered=False)),
+ styles=[
+ style_reader.read_style("p:unordered-list(1) => ul > li:fresh")
+ ]
+ )
+ assert_equal('<ul><li>Hello</li></ul>', result.value)
+
+
+@istest
+def bulleted_styles_dont_match_plain_paragraph():
+ result = convert_document_element_to_html(
+ documents.paragraph(children=[
+ _run_with_text("Hello")
+ ]),
+ styles=[
+ style_reader.read_style("p:unordered-list(1) => ul > li:fresh")
+ ]
+ )
+ assert_equal('<p>Hello</p>', result.value)
@istest
diff --git a/tests/docx/document_xml_tests.py b/tests/docx/document_xml_tests.py
index e6e8c88..75b0e20 100644
--- a/tests/docx/document_xml_tests.py
+++ b/tests/docx/document_xml_tests.py
@@ -68,7 +68,7 @@ class ReadXmlElementTests(object):
properties_xml = xml_element("w:pPr", {}, [numbering_properties_xml])
paragraph_xml = xml_element("w:p", {}, [properties_xml])
- numbering = Numbering({"42": {"1": documents.NumberingLevel("1", True)}})
+ numbering = Numbering({"42": {"1": documents.numbering_level("1", True)}})
paragraph = _read_and_get_document_xml_element(paragraph_xml, numbering=numbering)
assert_equal("1", paragraph.numbering.level_index)
diff --git a/tests/style_reader_tests.py b/tests/style_reader_tests.py
index 2f852e5..0d266d6 100644
--- a/tests/style_reader_tests.py
+++ b/tests/style_reader_tests.py
@@ -82,7 +82,7 @@ class ReadDocumentMatcherTests(object):
@istest
def reads_paragraph_ordered_list(self):
assert_equal(
- document_matchers.paragraph(numbering=documents.NumberingLevel(2, is_ordered=True)),
+ document_matchers.paragraph(numbering=documents.numbering_level(2, is_ordered=True)),
read_document_matcher("p:ordered-list(2)")
)
@@ -90,7 +90,7 @@ class ReadDocumentMatcherTests(object):
@istest
def reads_paragraph_unordered_list(self):
assert_equal(
- document_matchers.paragraph(numbering=documents.NumberingLevel(2, is_ordered=False)),
+ document_matchers.paragraph(numbering=documents.numbering_level(2, is_ordered=False)),
read_document_matcher("p:unordered-list(2)")
)