text: add Paragraph.text

Steve Canny · Steve Canny · commit ea71fc2dfab1 · 2014-01-03T23:39:54.000-08:00
diff --git a/docx/text.py b/docx/text.py
@@ -44,6 +44,17 @@ def style(self):
     def style(self, style):
         self._p.style = None if style == 'Normal' else style
 
+    @property
+    def text(self):
+        """
+        A string formed by concatenating the text of each run in the
+        paragraph.
+        """
+        text = ''
+        for run in self.runs:
+            text += run.text
+        return text
+
 
 class Run(object):
     """
diff --git a/features/api-add-paragraph.feature b/features/api-add-paragraph.feature
@@ -3,20 +3,17 @@ Feature: Add a paragraph with optional text and style
   As a programmer using the basic python-docx API
   I want to add a styled paragraph of text in a single step
 
-  @wip
   Scenario: Add an empty paragraph
     Given a document
      When I add a paragraph without specifying text or style
      Then the last paragraph is the empty paragraph I added
 
-  @wip
   Scenario: Add a paragraph specifying its text
     Given a document
-     When I add a paragraph spefifying its text
+     When I add a paragraph specifying its text
      Then the last paragraph contains the text I specified
 
-  @wip
   Scenario: Add a paragraph specifying its style
     Given a document
-     When I add a paragraph spefifying its style
-     Then the style of the last paragraph is the style I specified
+     When I add a paragraph specifying its style
+     Then the last paragraph has the style I specified
diff --git a/features/steps/api.py b/features/steps/api.py
@@ -9,16 +9,46 @@
 
 # when ====================================================
 
+@when('I add a paragraph specifying its style')
+def when_add_paragraph_specifying_style(context):
+    document = context.document
+    context.paragraph_style = 'barfoo'
+    document.add_paragraph(style=context.paragraph_style)
+
+
+@when('I add a paragraph specifying its text')
+def when_add_paragraph_specifying_text(context):
+    document = context.document
+    context.paragraph_text = 'foobar'
+    document.add_paragraph(context.paragraph_text)
+
+
 @when('I add a paragraph without specifying text or style')
-def step_when_add_paragraph_without_specifying_text_or_style(context):
+def when_add_paragraph_without_specifying_text_or_style(context):
     document = context.document
     document.add_paragraph()
 
 
 # then =====================================================
 
+@then('the last paragraph contains the text I specified')
+def then_last_p_contains_specified_text(context):
+    document = context.document
+    text = context.paragraph_text
+    p = document.paragraphs[-1]
+    assert p.text == text
+
+
 @then('the last paragraph is the empty paragraph I added')
-def step_then_document_contains_text_I_added(context):
+def then_last_p_is_empty_paragraph_added(context):
     document = context.document
     p = document.paragraphs[-1]
     assert p.text == ''
+
+
+@then('the last paragraph has the style I specified')
+def then_last_p_has_specified_style(context):
+    document = context.document
+    style = context.paragraph_style
+    p = document.paragraphs[-1]
+    assert p.style == style
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -14,7 +14,7 @@
 
 from mock import call, create_autospec, Mock
 
-from .oxml.unitdata.text import a_br, a_t, an_r
+from .oxml.unitdata.text import a_br, a_t, a_p, an_r
 from .unitutil import class_mock
 
 
@@ -69,6 +69,24 @@ def it_can_set_its_paragraph_style(self):
             p.style = style
             assert p_elm.style == expected_setting
 
+    def it_knows_the_text_it_contains(self, text_prop_fixture):
+        p, expected_text = text_prop_fixture
+        assert p.text == expected_text
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def text_prop_fixture(self):
+        p = (
+            a_p().with_nsdecls().with_child(
+                an_r().with_child(
+                    a_t().with_text('foo'))).with_child(
+                an_r().with_child(
+                    a_t().with_text(' de bar')))
+        ).element
+        paragraph = Paragraph(p)
+        return paragraph, 'foo de bar'
+
 
 class DescribeRun(object):
 
