font: add Font.underline setter

Steve Canny · Steve Canny · commit a74b0bfe4fd5 · 2015-02-08T00:01:41.000-08:00
diff --git a/docx/oxml/text/run.py b/docx/oxml/text/run.py
@@ -269,6 +269,12 @@ def u_val(self):
             return None
         return u.val
 
+    @u_val.setter
+    def u_val(self, value):
+        self._remove_u()
+        if value is not None:
+            self._add_u().val = value
+
     @property
     def underline(self):
         """
diff --git a/docx/text/run.py b/docx/text/run.py
@@ -441,6 +441,11 @@ def underline(self):
             return None
         return rPr.u_val
 
+    @underline.setter
+    def underline(self, value):
+        rPr = self._element.get_or_add_rPr()
+        rPr.u_val = value
+
 
 class _Text(object):
     """
diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
@@ -60,7 +60,6 @@ Feature: Get or set font properties
       | double         | WD_UNDERLINE.DOUBLE |
 
 
-  @wip
   Scenario Outline: Change font underline
     Given a font having <underline-type> underline
      When I assign <new-value> to font.underline
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
@@ -394,6 +394,11 @@ def it_knows_its_underline_type(self, underline_get_fixture):
         font, expected_value = underline_get_fixture
         assert font.underline is expected_value
 
+    def it_can_change_its_underline_type(self, underline_set_fixture):
+        font, underline, expected_xml = underline_set_fixture
+        font.underline = underline
+        assert font._element.xml == expected_xml
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -457,3 +462,26 @@ def underline_get_fixture(self, request):
         r_cxml, expected_value = request.param
         run = Font(element(r_cxml), None)
         return run, expected_value
+
+    @pytest.fixture(params=[
+        ('w:r', True,                'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r', False,               'w:r/w:rPr/w:u{w:val=none}'),
+        ('w:r', None,                'w:r/w:rPr'),
+        ('w:r', WD_UNDERLINE.SINGLE, 'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r', WD_UNDERLINE.THICK,  'w:r/w:rPr/w:u{w:val=thick}'),
+        ('w:r/w:rPr/w:u{w:val=single}', True,
+         'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r/w:rPr/w:u{w:val=single}', False,
+         'w:r/w:rPr/w:u{w:val=none}'),
+        ('w:r/w:rPr/w:u{w:val=single}', None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.SINGLE,
+         'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.DOTTED,
+         'w:r/w:rPr/w:u{w:val=dotted}'),
+    ])
+    def underline_set_fixture(self, request):
+        initial_r_cxml, value, expected_cxml = request.param
+        run = Font(element(initial_r_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return run, value, expected_xml
