test: refactor oxml.test_text.py to use cxml

Steve Canny · Steve Canny · commit 6ebedac6021f · 2014-06-30T15:46:35.000-07:00
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -85,8 +85,8 @@ def set_sectPr(self, sectPr):
     @property
     def style(self):
         """
-        String contained in w:val attribute of <w:pPr><w:pStyle> child, or
-        None if that element is not present.
+        String contained in w:val attribute of ./w:pPr/w:pStyle grandchild,
+        or |None| if not present.
         """
         pPr = self.pPr
         if pPr is None:
@@ -95,10 +95,6 @@ def style(self):
 
     @style.setter
     def style(self, style):
-        """
-        Set style of this <w:p> element to *style*. If *style* is None,
-        remove the style element.
-        """
         pPr = self.get_or_add_pPr()
         pPr.style = style
 
@@ -256,8 +252,8 @@ def text(self, text):
     @property
     def underline(self):
         """
-        String contained in w:val attribute of <w:u> grandchild, or |None| if
-        that element is not present.
+        String contained in w:val attribute of ./w:rPr/w:u grandchild, or
+        |None| if not present.
         """
         rPr = self.rPr
         if rPr is None:
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -4,106 +4,30 @@
 Test suite for the docx.oxml.text module.
 """
 
-from docx.oxml.text import CT_R, CT_Text
+from __future__ import absolute_import, print_function, unicode_literals
 
-from .unitdata.text import a_p, a_pPr, a_pStyle, a_t, an_r
+import pytest
 
-
-class DescribeCT_P(object):
-
-    def it_has_a_sequence_of_the_runs_it_contains(self):
-        p = a_p().with_nsdecls().with_child(an_r()).with_child(an_r()).element
-        assert len(p.r_lst) == 2
-        for r in p.r_lst:
-            assert isinstance(r, CT_R)
-
-    def it_can_add_an_r_to_itself(self):
-        p = a_p().with_nsdecls().element
-        # exercise -----------------
-        r = p.add_r()
-        # verify -------------------
-        assert p.xml == a_p().with_nsdecls().with_child(an_r()).xml()
-        assert isinstance(r, CT_R)
-
-    def it_knows_its_paragraph_style(self):
-        pPr_bldr = a_pPr().with_child(a_pStyle().with_val('foobar'))
-        cases = (
-            (a_p(), None),
-            (a_p().with_child(pPr_bldr), 'foobar'),
-        )
-        for builder, expected_value in cases:
-            p = builder.with_nsdecls().element
-            assert p.style == expected_value
-
-    def it_can_set_its_paragraph_style(self):
-        pPr = a_pPr().with_child(a_pStyle().with_val('foobar'))
-        pPr2 = a_pPr().with_child(a_pStyle().with_val('barfoo'))
-        cases = (
-            (1, a_p(), None, a_p().with_child(a_pPr())),
-            (2, a_p(), 'foobar', a_p().with_child(pPr)),
-            (3, a_p().with_child(pPr), None, a_p().with_child(a_pPr())),
-            (4, a_p().with_child(pPr), 'barfoo', a_p().with_child(pPr2)),
-        )
-        for case_nmbr, before_bldr, new_style, after_bldr in cases:
-            p = before_bldr.with_nsdecls().element
-            p.style = new_style
-            expected_xml = after_bldr.with_nsdecls().xml()
-            assert p.xml == expected_xml
-
-
-class DescribeCT_PPr(object):
-
-    def it_knows_the_paragraph_style(self):
-        cases = (
-            (a_pPr(), None),
-            (a_pPr().with_child(a_pStyle().with_val('foobar')), 'foobar'),
-        )
-        for builder, expected_value in cases:
-            pPr = builder.with_nsdecls().element
-            assert pPr.style == expected_value
-
-    def it_can_set_the_paragraph_style(self):
-        cases = (
-            (1, a_pPr(), None, a_pPr()),
-            (2, a_pPr(), 'foobar',
-             a_pPr().with_child(a_pStyle().with_val('foobar'))),
-            (3, a_pPr().with_child(a_pStyle().with_val('foobar')), None,
-             a_pPr()),
-            (4, a_pPr().with_child(a_pStyle().with_val('foobar')), 'barfoo',
-             a_pPr().with_child(a_pStyle().with_val('barfoo'))),
-        )
-        for case_nmbr, before_bldr, new_style, after_bldr in cases:
-            pPr = before_bldr.with_nsdecls().element
-            pPr.style = new_style
-            expected_xml = after_bldr.with_nsdecls().xml()
-            assert pPr.xml == expected_xml
+from ..unitutil.cxml import element, xml
 
 
 class DescribeCT_R(object):
 
-    def it_can_add_a_t_to_itself(self):
-        text = 'foobar'
-        r = an_r().with_nsdecls().element
-        # exercise -----------------
-        t = r.add_t(text)
-        # verify -------------------
-        assert (
-            r.xml ==
-            an_r().with_nsdecls().with_child(a_t().with_text(text)).xml()
-        )
-        assert isinstance(t, CT_Text)
-
-    def it_has_a_sequence_of_the_t_elms_it_contains(self):
-        cases = (
-            (an_r().with_nsdecls(), 0),
-            (an_r().with_nsdecls().with_child(
-                a_t().with_text('foo')), 1),
-            (an_r().with_nsdecls().with_child(
-                a_t().with_text('foo')).with_child(
-                a_t().with_text('bar')), 2),
-        )
-        for r_bldr, expected_len in cases:
-            r = r_bldr.element
-            assert len(r.t_lst) == expected_len
-            for t in r.t_lst:
-                assert isinstance(t, CT_Text)
+    def it_can_add_a_t_preserving_edge_whitespace(self, add_t_fixture):
+        r, text, expected_xml = add_t_fixture
+        r.add_t(text)
+        assert r.xml == expected_xml
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(params=[
+        ('w:r', 'foobar',  'w:r/w:t"foobar"'),
+        ('w:r', 'foobar ', 'w:r/w:t{xml:space=preserve}"foobar "'),
+        ('w:r/(w:rPr/w:rStyle{w:val=emphasis}, w:cr)', 'foobar',
+         'w:r/(w:rPr/w:rStyle{w:val=emphasis}, w:cr, w:t"foobar")'),
+    ])
+    def add_t_fixture(self, request):
+        initial_cxml, text, expected_cxml = request.param
+        r = element(initial_cxml)
+        expected_xml = xml(expected_cxml)
+        return r, text, expected_xml
