txt: replace Paragraph.style getter

Steve Canny · Steve Canny · commit c95b480283aa · 2015-02-08T00:01:14.000-08:00
This change causes a number of acceptance tests to fail. Temporarily
return these to WIP.
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -66,6 +66,14 @@ def get_or_add_image_part(self, image_descriptor):
         rId = self.relate_to(image_part, RT.IMAGE)
         return (image_part, rId)
 
+    def get_style(self, style_id, style_type):
+        """
+        Return the style in this document matching *style_id*. Returns the
+        default style for *style_type* if *style_id* is |None| or does not
+        match a defined style of *style_type*.
+        """
+        raise NotImplementedError
+
     @lazyproperty
     def inline_shapes(self):
         """
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
@@ -6,6 +6,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+from ..enum.style import WD_STYLE_TYPE
 from .run import Run
 from ..shared import Parented
 
@@ -85,8 +86,8 @@ def style(self):
         """
         Paragraph style for this paragraph. Read/Write.
         """
-        style = self._p.style
-        return style if style is not None else 'Normal'
+        style_id = self._p.style
+        return self.part.get_style(style_id, WD_STYLE_TYPE.PARAGRAPH)
 
     @style.setter
     def style(self, style):
diff --git a/features/api-add-heading.feature b/features/api-add-heading.feature
@@ -3,12 +3,14 @@ Feature: Add a section heading with text
   As a programmer using the basic python-docx API
   I need a method to add a heading with its text in a single step
 
+  @wip
   Scenario: Add a heading specifying only its text
     Given a document
      When I add a heading specifying only its text
      Then the style of the last paragraph is 'Heading1'
       And the last paragraph contains the heading text
 
+  @wip
   Scenario Outline: Add a heading specifying level
     Given a document
      When I add a heading specifying level=<heading level>
diff --git a/features/par-clear-paragraph.feature b/features/par-clear-paragraph.feature
@@ -4,6 +4,7 @@ Feature: Clear paragraph content
   I need a way to remove the content of a paragraph
 
 
+  @wip
   Scenario: Clear paragraph content
     Given a paragraph with content and formatting
      When I clear the paragraph content
diff --git a/features/par-insert-paragraph.feature b/features/par-insert-paragraph.feature
@@ -4,6 +4,7 @@ Feature: Insert a paragraph before or after a paragraph
   I need a way to insert a paragraph relative to another paragraph
 
 
+  @wip
   Scenario: Add a new paragraph above an existing paragraph
     Given a document containing three paragraphs
      When I insert a paragraph above the second paragraph
diff --git a/features/par-set-text.feature b/features/par-set-text.feature
@@ -4,6 +4,7 @@ Feature: Replace paragraph text
   I need a writable text property on paragraph
 
 
+  @wip
   Scenario: Set paragraph text
     Given a paragraph with content and formatting
      When I set the paragraph text
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -8,16 +8,20 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_ALIGN_PARAGRAPH
 from docx.oxml.text.paragraph import CT_P
 from docx.oxml.text.run import CT_R
+from docx.parts.document import DocumentPart
 from docx.text.paragraph import Paragraph
 from docx.text.run import Run
 
 import pytest
 
 from ..unitutil.cxml import element, xml
-from ..unitutil.mock import call, class_mock, instance_mock, method_mock
+from ..unitutil.mock import (
+    call, class_mock, instance_mock, method_mock, property_mock
+)
 
 
 class DescribeParagraph(object):
@@ -47,8 +51,12 @@ def it_can_change_its_alignment_value(self, alignment_set_fixture):
         assert paragraph._p.xml == expected_xml
 
     def it_knows_its_paragraph_style(self, style_get_fixture):
-        paragraph, expected_style = style_get_fixture
-        assert paragraph.style == expected_style
+        paragraph, style_id_, style_ = style_get_fixture
+        style = paragraph.style
+        paragraph.part.get_style.assert_called_once_with(
+            style_id_, WD_STYLE_TYPE.PARAGRAPH
+        )
+        assert style is style_
 
     def it_can_change_its_paragraph_style(self, style_set_fixture):
         paragraph, value, expected_xml = style_set_fixture
@@ -175,15 +183,13 @@ def runs_fixture(self, p_, Run_, r_, r_2_, runs_):
         run_, run_2_ = runs_
         return paragraph, Run_, r_, r_2_, run_, run_2_
 
-    @pytest.fixture(params=[
-        ('w:p', 'Normal'),
-        ('w:p/w:pPr', 'Normal'),
-        ('w:p/w:pPr/w:pStyle{w:val=Heading1}', 'Heading1'),
-    ])
-    def style_get_fixture(self, request):
-        p_cxml, expected_style = request.param
+    @pytest.fixture
+    def style_get_fixture(self, part_prop_):
+        style_id = 'Foobar'
+        p_cxml = 'w:p/w:pPr/w:pStyle{w:val=%s}' % style_id
         paragraph = Paragraph(element(p_cxml), None)
-        return paragraph, expected_style
+        style_ = part_prop_.return_value.get_style.return_value
+        return paragraph, style_id, style_
 
     @pytest.fixture(params=[
         ('w:p',                                'Heading1',
@@ -233,6 +239,10 @@ def text_set_fixture(self):
     def add_run_(self, request):
         return method_mock(request, Paragraph, 'add_run')
 
+    @pytest.fixture
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)
+
     @pytest.fixture
     def _insert_paragraph_before_(self, request):
         return method_mock(request, Paragraph, '_insert_paragraph_before')
@@ -241,6 +251,12 @@ def _insert_paragraph_before_(self, request):
     def p_(self, request, r_, r_2_):
         return instance_mock(request, CT_P, r_lst=(r_, r_2_))
 
+    @pytest.fixture
+    def part_prop_(self, request, document_part_):
+        return property_mock(
+            request, Paragraph, 'part', return_value=document_part_
+        )
+
     @pytest.fixture
     def Run_(self, request, runs_):
         run_, run_2_ = runs_
