test: refactor tests.test_text to use cxml

Steve Canny · Steve Canny · commit 668f0ed54e28 · 2014-06-30T15:46:35.000-07:00
diff --git a/docx/enum/base.py b/docx/enum/base.py
@@ -159,12 +159,14 @@ class EnumerationBase(object):
     __ms_name__ = ''
 
     @classmethod
-    def is_valid_setting(cls, value):
+    def validate(cls, value):
         """
-        Return |True| if *value* is an assignable value, |False| if it is
-        a return value-only member or not a member value.
+        Raise |ValueError| if *value* is not an assignable value.
         """
-        return value in cls._valid_settings
+        if value not in cls._valid_settings:
+            raise ValueError(
+                "%s not a member of %s enumeration" % (value, cls.__name__)
+            )
 
 
 Enumeration = MetaEnumeration(
diff --git a/docx/oxml/simpletypes.py b/docx/oxml/simpletypes.py
@@ -8,6 +8,7 @@
 
 from __future__ import absolute_import, print_function
 
+from ..exceptions import InvalidXmlError
 from ..shared import Emu, Twips
 
 
@@ -95,6 +96,11 @@ class XsdBoolean(BaseSimpleType):
 
     @classmethod
     def convert_from_xml(cls, str_value):
+        if str_value not in ('1', '0', 'true', 'false'):
+            raise InvalidXmlError(
+                "value must be one of '1', '0', 'true' or 'false', got '%s'"
+                % str_value
+            )
         return str_value in ('1', 'true')
 
     @classmethod
@@ -216,6 +222,11 @@ class ST_OnOff(XsdBoolean):
 
     @classmethod
     def convert_from_xml(cls, str_value):
+        if str_value not in ('1', '0', 'true', 'false', 'on', 'off'):
+            raise InvalidXmlError(
+                "value must be one of '1', '0', 'true', 'false', 'on', or 'o"
+                "ff', got '%s'" % str_value
+            )
         return str_value in ('1', 'true', 'on')
 
 
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -237,7 +237,8 @@ def text(self):
         text = ''
         for child in self:
             if child.tag == qn('w:t'):
-                text += child.text
+                t_text = child.text
+                text += t_text if t_text is not None else ''
             elif child.tag == qn('w:tab'):
                 text += '\t'
             elif child.tag in (qn('w:br'), qn('w:cr')):
diff --git a/docx/text.py b/docx/text.py
@@ -6,7 +6,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from docx.enum.text import WD_BREAK, WD_UNDERLINE
+from docx.enum.text import WD_BREAK
 
 
 def boolproperty(f):
@@ -39,13 +39,17 @@ def getter(obj):
         return prop_value.val
 
     def setter(obj, value):
+        if value not in (True, False, None):
+            raise ValueError(
+                "assigned value must be True, False, or None, got '%s'"
+                % value
+            )
         r, attr_name = obj._r, f(obj)
         rPr = r.get_or_add_rPr()
         _remove_prop(rPr, attr_name)
         if value is not None:
             elm = _add_prop(rPr, attr_name)
-            if bool(value) is False:
-                elm.val = False
+            elm.val = value
 
     return property(getter, setter, doc=f.__doc__)
 
@@ -432,9 +436,6 @@ def underline(self):
 
     @underline.setter
     def underline(self, value):
-        if not WD_UNDERLINE.is_valid_setting(value):
-            tmpl = "'%s' is not a valid setting for Run.underline"
-            raise ValueError(tmpl % value)
         self._r.underline = value
 
     @boolproperty
diff --git a/tests/test_enum.py b/tests/test_enum.py
@@ -67,10 +67,12 @@ def it_provides_the_enumeration_value_for_each_named_member(self):
         assert FOOBAR.READ_ONLY == -2
 
     def it_knows_if_a_setting_is_valid(self):
-        assert FOOBAR.is_valid_setting(None)
-        assert FOOBAR.is_valid_setting(FOOBAR.READ_WRITE)
-        assert not FOOBAR.is_valid_setting('foobar')
-        assert not FOOBAR.is_valid_setting(FOOBAR.READ_ONLY)
+        FOOBAR.validate(None)
+        FOOBAR.validate(FOOBAR.READ_WRITE)
+        with pytest.raises(ValueError):
+            FOOBAR.validate('foobar')
+        with pytest.raises(ValueError):
+            FOOBAR.validate(FOOBAR.READ_ONLY)
 
     def it_can_be_referred_to_by_a_convenience_alias_if_defined(self):
         assert BARFOO is FOOBAR  # noqa
diff --git a/tests/test_text.py b/tests/test_text.py
