tbl: rewrite Table.style setter

Steve Canny · Steve Canny · commit a6bef96ecf1e · 2015-02-08T15:40:43.000-08:00
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
@@ -96,6 +96,18 @@ def tblStyle_val(self):
             return None
         return tblStyle.val
 
+    @tblStyle_val.setter
+    def tblStyle_val(self, styleId):
+        """
+        Set the value of `w:tblPr/w:tblStyle/@w:val` (a table style id) to
+        *styleId*. If *styleId* is None, remove the `w:tblStyle` element.
+        """
+        tblPr = self.tblPr
+        tblPr._remove_tblStyle()
+        if styleId is None:
+            return
+        tblPr._add_tblStyle().val = styleId
+
     @classmethod
     def _tbl_xml(cls):
         return (
diff --git a/docx/table.py b/docx/table.py
@@ -125,8 +125,11 @@ def style(self):
         return self.part.get_style(style_id, WD_STYLE_TYPE.TABLE)
 
     @style.setter
-    def style(self, value):
-        self._tblPr.style = value
+    def style(self, style_or_name):
+        style_id = self.part.get_style_id(
+            style_or_name, WD_STYLE_TYPE.TABLE
+        )
+        self._tbl.tblStyle_val = style_id
 
     @property
     def table(self):
diff --git a/features/api-add-table.feature b/features/api-add-table.feature
@@ -11,7 +11,6 @@ Feature: Add a table
       And table.style is styles['Light Shading Accent 1']
 
 
-  @wip
   Scenario: Add a table specifying style
     Given a document
      When I add a 2 x 2 table specifying style 'Table Grid'
diff --git a/features/tbl-style.feature b/features/tbl-style.feature
@@ -15,7 +15,6 @@ Feature: Query and apply a table style
       | Light Shading - Accent 1 | Light Shading Accent 1 |
 
 
-  @wip
   Scenario Outline: Apply a table style
     Given a table having <style> style
      When I assign <value> to table.style
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -52,9 +52,12 @@ def it_knows_its_table_style(self, style_get_fixture):
         )
         assert style is style_
 
-    def it_can_apply_a_table_style_by_name(self, table_style_set_fixture):
-        table, style_name, expected_xml = table_style_set_fixture
-        table.style = style_name
+    def it_can_change_its_table_style(self, style_set_fixture):
+        table, value, expected_xml = style_set_fixture
+        table.style = value
+        table.part.get_style_id.assert_called_once_with(
+            value, WD_STYLE_TYPE.TABLE
+        )
         assert table._tbl.xml == expected_xml
 
     def it_knows_it_is_the_table_its_children_belong_to(self, table_fixture):
@@ -233,26 +236,25 @@ def style_get_fixture(self, part_prop_):
         style_ = part_prop_.return_value.get_style.return_value
         return table, style_id, style_
 
-    @pytest.fixture
-    def table_fixture(self):
-        table = Table(None, None)
-        return table
-
     @pytest.fixture(params=[
-        ('w:tbl/w:tblPr', 'foobar',
-         'w:tbl/w:tblPr/w:tblStyle{w:val=foobar}'),
-        ('w:tbl/w:tblPr/w:tblStyle{w:val=foobar}', 'barfoo',
-         'w:tbl/w:tblPr/w:tblStyle{w:val=barfoo}'),
-        ('w:tbl/w:tblPr/w:tblStyle{w:val=foobar}', None,
-         'w:tbl/w:tblPr'),
-        ('w:tbl/w:tblPr', None,
+        ('w:tbl/w:tblPr',                         'Tbl A', 'TblA',
+         'w:tbl/w:tblPr/w:tblStyle{w:val=TblA}'),
+        ('w:tbl/w:tblPr/w:tblStyle{w:val=TblA}',  'Tbl B', 'TblB',
+         'w:tbl/w:tblPr/w:tblStyle{w:val=TblB}'),
+        ('w:tbl/w:tblPr/w:tblStyle{w:val=TblB}',  None,    None,
          'w:tbl/w:tblPr'),
     ])
-    def table_style_set_fixture(self, request):
-        tbl_cxml, new_style, expected_cxml = request.param
+    def style_set_fixture(self, request, part_prop_):
+        tbl_cxml, value, style_id, expected_cxml = request.param
         table = Table(element(tbl_cxml), None)
+        part_prop_.return_value.get_style_id.return_value = style_id
         expected_xml = xml(expected_cxml)
-        return table, new_style, expected_xml
+        return table, value, expected_xml
+
+    @pytest.fixture
+    def table_fixture(self):
+        table = Table(None, None)
+        return table
 
     # fixture components ---------------------------------------------
 
