test_text: added bool prop test for underline

Added bool prop tests for underline. Moved from `WD_UNDERLINE`
conversion to string into `docx\oxml\text.py`

Author: onlyjus

docx/oxml/text.py

@@ -9,7 +9,7 @@
 from docx.oxml.shared import (
     CT_String, nsdecls, OxmlBaseElement, OxmlElement, oxml_fromstring, qn
 )
-
+from docx.enum.text import WD_UNDERLINE
 
 class CT_Br(OxmlBaseElement):
     """
@@ -299,7 +299,7 @@ def add_underline(self, style):
         """
         Return a newly added <w:u w:val=style/> child element.
         """
-        u = CT_String.new('w:u', str(style))
+        u = CT_String.new('w:u', WD_UNDERLINE.stringDict[style]))
         self.insert(0, u)
         return u
 

docx/text.py

@@ -236,8 +236,6 @@ def underline(self, style):
             style = WD_UNDERLINE.NONE
         if type(style)==bool:
             style = WD_UNDERLINE.SINGLE if style else WD_UNDERLINE.NONE
-            
-        style = WD_UNDERLINE.stringDict[style]
 
         u = self._r.get_or_add_rPr().underline
         if u is None:

tests/oxml/unitdata/text.py

@@ -136,7 +136,9 @@ def an_emboss():
 
 def an_i():
     return CT_OnOffBuilder('w:i')
-
+    
+def an_underline():
+    return CT_OnOffBuilder('w:u')
 
 def an_iCs():
     return CT_OnOffBuilder('w:iCs')

tests/test_text.py

@@ -20,7 +20,7 @@
     a_b, a_bCs, a_br, a_caps, a_cs, a_dstrike, a_p, a_shadow, a_smallCaps,
     a_snapToGrid, a_specVanish, a_strike, a_t, a_vanish, a_webHidden,
     an_emboss, an_i, an_iCs, an_imprint, an_oMath, a_noProof, an_outline,
-    an_r, an_rPr, an_rtl
+    an_r, an_rPr, an_rtl, an_underline
 )
 from .unitutil import class_mock, instance_mock
 
@@ -186,6 +186,7 @@ def add_text_fixture(self, request, run, Text_):
         ('all_caps', True), ('all_caps', False), ('all_caps', None),
         ('bold', True), ('bold', False), ('bold', None),
         ('italic', True), ('italic', False), ('italic', None),
+        ('underline', True), ('underline', False), ('underline', None),
         ('complex_script', True), ('complex_script', False),
         ('complex_script', None),
         ('cs_bold', True), ('cs_bold', False), ('cs_bold', None),
@@ -231,6 +232,7 @@ def bool_prop_get_fixture(self, request):
             'spec_vanish':    a_specVanish,
             'strike':         a_strike,
             'web_hidden':     a_webHidden,
+            'underline':      an_underline,
         }[bool_prop_name]
         r_bldr = an_r().with_nsdecls()
         if expected_state is not None:
@@ -247,6 +249,7 @@ def bool_prop_get_fixture(self, request):
         ('all_caps', True), ('all_caps', False), ('all_caps', None),
         ('bold', True), ('bold', False), ('bold', None),
         ('italic', True), ('italic', False), ('italic', None),
+        ('underline', True), ('underline', False), ('underline', None),
         ('complex_script', True), ('complex_script', False),
         ('complex_script', None),
         ('cs_bold', True), ('cs_bold', False), ('cs_bold', None),
@@ -292,6 +295,7 @@ def bool_prop_set_fixture(self, request):
             'spec_vanish':    a_specVanish,
             'strike':         a_strike,
             'web_hidden':     a_webHidden,
+            'underline':      an_underline,
         }[bool_prop_name]
         # run --------------------------
         r = an_r().with_nsdecls().element