run: rewrite Run.style setter

Steve Canny · Steve Canny · commit 66f5b7874427 · 2015-02-08T15:38:03.000-08:00
* revise test for Paragraph.add_run() to mock out assignment to
Run.style.
diff --git a/docx/text/run.py b/docx/text/run.py
@@ -144,8 +144,11 @@ def style(self):
         return self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
 
     @style.setter
-    def style(self, char_style):
-        self._r.style = char_style
+    def style(self, style_or_name):
+        style_id = self.part.get_style_id(
+            style_or_name, WD_STYLE_TYPE.CHARACTER
+        )
+        self._r.style = style_id
 
     @property
     def text(self):
diff --git a/features/run-char-style.feature b/features/run-char-style.feature
@@ -15,7 +15,6 @@ Feature: Each run has a read/write style
       | Strong      | Strong                 |
 
 
-  @wip
   Scenario Outline: Set the style of a run
     Given a run having <style> style
      When I assign <value> to run.style
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -78,11 +78,13 @@ def it_provides_access_to_the_runs_it_contains(self, runs_fixture):
         assert runs == [run_, run_2_]
 
     def it_can_add_a_run_to_itself(self, add_run_fixture):
-        paragraph, text, style, expected_xml = add_run_fixture
+        paragraph, text, style, style_prop_, expected_xml = add_run_fixture
         run = paragraph.add_run(text, style)
         assert paragraph._p.xml == expected_xml
         assert isinstance(run, Run)
         assert run._r is paragraph._p.r_lst[0]
+        if style:
+            style_prop_.assert_called_once_with(style)
 
     def it_can_insert_a_paragraph_before_itself(self, insert_before_fixture):
         paragraph, text, style, paragraph_, add_run_calls = (
@@ -111,20 +113,16 @@ def it_inserts_a_paragraph_before_to_help(self, _insert_before_fixture):
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
-        ('w:p', None, None,
-         'w:p/w:r'),
-        ('w:p', 'foobar', None,
-         'w:p/w:r/w:t"foobar"'),
-        ('w:p', None, 'Strong',
-         'w:p/w:r/w:rPr/w:rStyle{w:val=Strong}'),
-        ('w:p', 'foobar', 'Strong',
-         'w:p/w:r/(w:rPr/w:rStyle{w:val=Strong}, w:t"foobar")'),
+        ('w:p', None,     None,     'w:p/w:r'),
+        ('w:p', 'foobar', None,     'w:p/w:r/w:t"foobar"'),
+        ('w:p', None,     'Strong', 'w:p/w:r'),
+        ('w:p', 'foobar', 'Strong', 'w:p/w:r/w:t"foobar"'),
     ])
-    def add_run_fixture(self, request):
+    def add_run_fixture(self, request, run_style_prop_):
         before_cxml, text, style, after_cxml = request.param
         paragraph = Paragraph(element(before_cxml), None)
         expected_xml = xml(after_cxml)
-        return paragraph, text, style, expected_xml
+        return paragraph, text, style, run_style_prop_, expected_xml
 
     @pytest.fixture(params=[
         ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.CENTER),
@@ -301,6 +299,10 @@ def r_(self, request):
     def r_2_(self, request):
         return instance_mock(request, CT_R)
 
+    @pytest.fixture
+    def run_style_prop_(self, request):
+        return property_mock(request, Run, 'style')
+
     @pytest.fixture
     def runs_(self, request):
         run_ = instance_mock(request, Run, name='run_')
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
@@ -42,8 +42,11 @@ def it_knows_its_character_style(self, style_get_fixture):
         assert style is style_
 
     def it_can_change_its_character_style(self, style_set_fixture):
-        run, style, expected_xml = style_set_fixture
-        run.style = style
+        run, value, expected_xml = style_set_fixture
+        run.style = value
+        run.part.get_style_id.assert_called_once_with(
+            value, WD_STYLE_TYPE.CHARACTER
+        )
         assert run._r.xml == expected_xml
 
     def it_knows_its_underline_type(self, underline_get_fixture):
@@ -234,20 +237,23 @@ def style_get_fixture(self, part_prop_):
         return run, style_id, style_
 
     @pytest.fixture(params=[
-        ('w:r',                            None,
+        ('w:r',                                'Foo Font', 'FooFont',
+         'w:r/w:rPr/w:rStyle{w:val=FooFont}'),
+        ('w:r/w:rPr',                          'Foo Font', 'FooFont',
+         'w:r/w:rPr/w:rStyle{w:val=FooFont}'),
+        ('w:r/w:rPr/w:rStyle{w:val=FooFont}',  'Bar Font', 'BarFont',
+         'w:r/w:rPr/w:rStyle{w:val=BarFont}'),
+        ('w:r/w:rPr/w:rStyle{w:val=FooFont}',  None,       None,
          'w:r/w:rPr'),
-        ('w:r',                            'Foo',
-         'w:r/w:rPr/w:rStyle{w:val=Foo}'),
-        ('w:r/w:rPr/w:rStyle{w:val=Foo}',  None,
+        ('w:r',                                None,       None,
          'w:r/w:rPr'),
-        ('w:r/w:rPr/w:rStyle{w:val=Foo}',  'Bar',
-         'w:r/w:rPr/w:rStyle{w:val=Bar}'),
     ])
-    def style_set_fixture(self, request):
-        initial_r_cxml, new_style, expected_cxml = request.param
-        run = Run(element(initial_r_cxml), None)
+    def style_set_fixture(self, request, part_prop_):
+        r_cxml, value, style_id, expected_cxml = request.param
+        run = Run(element(r_cxml), None)
+        part_prop_.return_value.get_style_id.return_value = style_id
         expected_xml = xml(expected_cxml)
-        return run, new_style, expected_xml
+        return run, value, expected_xml
 
     @pytest.fixture(params=[
         ('w:r', ''),
