run: rewrite Run.style getter

Steve Canny · Steve Canny · commit 3f1a01a1ad18 · 2015-02-08T00:26:27.000-08:00
... to return a _CharacterStyle object rather than a styleId string.
diff --git a/docx/text/run.py b/docx/text/run.py
@@ -6,6 +6,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+from ..enum.style import WD_STYLE_TYPE
 from ..enum.text import WD_BREAK
 from ..shared import ElementProxy, Parented
 
@@ -133,13 +134,14 @@ def italic(self, value):
     @property
     def style(self):
         """
-        Read/write. The string style ID of the character style applied to
-        this run, or |None| if it has no directly-applied character style.
-        Setting this property to |None| causes any directly-applied character
-        style to be removed such that the run inherits character formatting
-        from its containing paragraph.
+        Read/write. A |_CharacterStyle| object representing the character
+        style applied to this run. The default character style for the
+        document (often `Default Character Font`) is returned if the run has
+        no directly-applied character style. Setting this property to |None|
+        removes any directly-applied character style.
         """
-        return self._r.style
+        style_id = self._r.style
+        return self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
 
     @style.setter
     def style(self, char_style):
diff --git a/features/par-add-run.feature b/features/par-add-run.feature
@@ -10,7 +10,6 @@ Feature: Add a run with optional text and style
      Then the run contains the text I specified
 
 
-  @wip
   Scenario: Add a run specifying its style
     Given a paragraph
      When I add a run specifying the character style Emphasis
diff --git a/features/run-char-style.feature b/features/run-char-style.feature
@@ -4,7 +4,6 @@ Feature: Each run has a read/write style
   I need the ability to get and set the character style of a run
 
 
-  @wip
   Scenario Outline: Get the character style of a run
     Given a run having <style> style
      Then run.style is styles['<value>']
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
@@ -8,8 +8,9 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
-from docx.parts.document import InlineShapes
+from docx.parts.document import DocumentPart, InlineShapes
 from docx.shape import InlineShape
 from docx.shared import Pt
 from docx.text.paragraph import Paragraph
@@ -18,7 +19,7 @@
 import pytest
 
 from ..unitutil.cxml import element, xml
-from ..unitutil.mock import class_mock, instance_mock
+from ..unitutil.mock import class_mock, instance_mock, property_mock
 
 
 class DescribeRun(object):
@@ -33,8 +34,12 @@ def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
         assert run._r.xml == expected_xml
 
     def it_knows_its_character_style(self, style_get_fixture):
-        run, expected_style = style_get_fixture
-        assert run.style == expected_style
+        run, style_id_, style_ = style_get_fixture
+        style = run.style
+        run.part.get_style.assert_called_once_with(
+            style_id_, WD_STYLE_TYPE.CHARACTER
+        )
+        assert style is style_
 
     def it_can_change_its_character_style(self, style_set_fixture):
         run, style, expected_xml = style_set_fixture
@@ -220,14 +225,13 @@ def font_fixture(self, Font_, font_):
         run = Run(element('w:r'), None)
         return run, Font_, font_
 
-    @pytest.fixture(params=[
-        ('w:r',                              None),
-        ('w:r/w:rPr/w:rStyle{w:val=Foobar}', 'Foobar'),
-    ])
-    def style_get_fixture(self, request):
-        r_cxml, expected_style = request.param
+    @pytest.fixture
+    def style_get_fixture(self, part_prop_):
+        style_id = 'Barfoo'
+        r_cxml = 'w:r/w:rPr/w:rStyle{w:val=%s}' % style_id
         run = Run(element(r_cxml), None)
-        return run, expected_style
+        style_ = part_prop_.return_value.get_style.return_value
+        return run, style_id, style_
 
     @pytest.fixture(params=[
         ('w:r',                            None,
@@ -313,6 +317,10 @@ def underline_raise_fixture(self, request):
 
     # fixture components ---------------------------------------------
 
+    @pytest.fixture
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)
+
     @pytest.fixture
     def Font_(self, request, font_):
         return class_mock(request, 'docx.text.run.Font', return_value=font_)
@@ -331,6 +339,12 @@ def inline_shapes_(self, request, picture_):
     def paragraph_(self, request):
         return instance_mock(request, Paragraph)
 
+    @pytest.fixture
+    def part_prop_(self, request, document_part_):
+        return property_mock(
+            request, Run, 'part', return_value=document_part_
+        )
+
     @pytest.fixture
     def picture_(self, request):
         return instance_mock(request, InlineShape)
