tbl: add _Row.height setter

revossen-asml · Steve Canny · commit 254d2ef97c7a · 2016-10-29T19:44:05.000-07:00
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
@@ -87,6 +87,11 @@ def trHeight_val(self):
             return None
         return trPr.trHeight_val
 
+    @trHeight_val.setter
+    def trHeight_val(self, value):
+        trPr = self.get_or_add_trPr()
+        trPr.trHeight_val = value
+
     def _insert_tblPrEx(self, tblPrEx):
         self.insert(0, tblPrEx)
 
@@ -852,6 +857,13 @@ def trHeight_val(self):
             return None
         return trHeight.val
 
+    @trHeight_val.setter
+    def trHeight_val(self, value):
+        if value is None and self.trHeight is None:
+            return
+        trHeight = self.get_or_add_trHeight()
+        trHeight.val = value
+
 
 class CT_VMerge(BaseOxmlElement):
     """
diff --git a/docx/table.py b/docx/table.py
@@ -391,6 +391,10 @@ def height(self):
         """
         return self._tr.trHeight_val
 
+    @height.setter
+    def height(self, value):
+        self._tr.trHeight_val = value
+
     @property
     def height_rule(self):
         """
diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
@@ -39,7 +39,6 @@ Feature: Get and set table row properties
       | 3 inches            | 2743200 |
 
 
-  @wip
   Scenario Outline: Set row height
     Given a table row having height of <state>
      When I assign <value> to row.height
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -657,6 +657,11 @@ def it_knows_its_height(self, height_get_fixture):
         row, expected_height = height_get_fixture
         assert row.height == expected_height
 
+    def it_can_change_its_height(self, height_set_fixture):
+        row, value, expected_xml = height_set_fixture
+        row.height = value
+        assert row._tr.xml == expected_xml
+
     def it_knows_its_height_rule(self, height_rule_get_fixture):
         row, expected_rule = height_rule_get_fixture
         assert row.height_rule == expected_rule
@@ -702,6 +707,27 @@ def height_get_fixture(self, request):
         row = _Row(element(tr_cxml), None)
         return row, expected_height
 
+    @pytest.fixture(params=[
+        ('w:tr',                               Inches(1),
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr/w:trPr',                        Inches(1),
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr/w:trPr/w:trHeight',             Inches(1),
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440}', Inches(2),
+         'w:tr/w:trPr/w:trHeight{w:val=2880}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=2880}', None,
+         'w:tr/w:trPr/w:trHeight'),
+        ('w:tr',                   None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr',            None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr/w:trHeight', None, 'w:tr/w:trPr/w:trHeight'),
+    ])
+    def height_set_fixture(self, request):
+        tr_cxml, new_value, expected_cxml = request.param
+        row = _Row(element(tr_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return row, new_value, expected_xml
+
     @pytest.fixture(params=[
         ('w:tr',        None),
         ('w:tr/w:trPr', None),
