sect: add Section.start_type.setter

Steve Canny · Steve Canny · commit ab625af6eccc · 2014-06-20T16:21:28.000-07:00
Add key check to XmlEnumeration.to_xml() that raises ValueError on
value not a member of enumeration.
diff --git a/docx/enum/base.py b/docx/enum/base.py
@@ -197,6 +197,10 @@ def to_xml(cls, enum_val):
         """
         Return the XML value of the enumeration value *enum_val*.
         """
+        if enum_val not in cls._member_to_xml:
+            raise ValueError(
+                "value '%s' not in enumeration %s" % (enum_val, cls.__name__)
+            )
         return cls._member_to_xml[enum_val]
 
 
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
@@ -26,6 +26,14 @@ def start_type(self):
             return WD_SECTION_START.NEW_PAGE
         return type.val
 
+    @start_type.setter
+    def start_type(self, value):
+        if value is None or value is WD_SECTION_START.NEW_PAGE:
+            self._remove_type()
+            return
+        type = self.get_or_add_type()
+        type.val = value
+
 
 class CT_SectType(BaseOxmlElement):
     """
diff --git a/docx/section.py b/docx/section.py
@@ -23,3 +23,7 @@ def start_type(self):
         if the section should begin on the next odd page.
         """
         return self._sectPr.start_type
+
+    @start_type.setter
+    def start_type(self, value):
+        self._sectPr.start_type = value
diff --git a/features/sct-section-props.feature b/features/sct-section-props.feature
@@ -17,7 +17,6 @@ Feature: Access and change section properties
       | ODD_PAGE   |
 
 
-  @wip
   Scenario Outline: Set section start type
     Given a section having start type <initial-start-type>
      When I set the section start type to <new-start-type>
diff --git a/tests/test_enum.py b/tests/test_enum.py
@@ -90,7 +90,7 @@ class DescribeXmlEnumeration(object):
     def it_knows_the_XML_value_for_each_of_its_xml_members(self):
         assert XMLFOO.to_xml(XMLFOO.XML_RW) == 'attrVal'
         assert XMLFOO.to_xml(42) == 'attrVal'
-        with pytest.raises(KeyError):
+        with pytest.raises(ValueError):
             XMLFOO.to_xml(XMLFOO.RO)
 
     def it_can_map_each_of_its_xml_members_from_the_XML_value(self):
diff --git a/tests/test_section.py b/tests/test_section.py
@@ -16,10 +16,15 @@
 
 class DescribeSection(object):
 
-    def it_knows_its_start_type(self, start_type_fixture):
-        section, expected_start_type = start_type_fixture
+    def it_knows_its_start_type(self, start_type_get_fixture):
+        section, expected_start_type = start_type_get_fixture
         assert section.start_type is expected_start_type
 
+    def it_can_change_its_start_type(self, start_type_set_fixture):
+        section, new_start_type, expected_xml = start_type_set_fixture
+        section.start_type = new_start_type
+        assert section._sectPr.xml == expected_xml
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -30,11 +35,31 @@ def it_knows_its_start_type(self, start_type_fixture):
         ('evenPage',   WD_SECTION.EVEN_PAGE),
         ('nextColumn', WD_SECTION.NEW_COLUMN),
     ])
-    def start_type_fixture(self, request):
+    def start_type_get_fixture(self, request):
         type_val, expected_start_type = request.param
-        sectPr_bldr = a_sectPr().with_nsdecls()
-        if type_val is not None:
-            sectPr_bldr.with_child(a_type().with_val(type_val))
-        sectPr = sectPr_bldr.element
+        sectPr = self.sectPr_bldr(type_val).element
         section = Section(sectPr)
         return section, expected_start_type
+
+    @pytest.fixture(params=[
+        ('oddPage',    WD_SECTION.EVEN_PAGE,  'evenPage'),
+        ('nextPage',   None,                  None),
+        ('continuous', WD_SECTION.NEW_PAGE,   None),
+        (None,         WD_SECTION.NEW_COLUMN, 'nextColumn'),
+    ])
+    def start_type_set_fixture(self, request):
+        initial_type_val, new_type, expected_type_val = request.param
+        sectPr = self.sectPr_bldr(initial_type_val).element
+        section = Section(sectPr)
+        expected_xml = self.sectPr_bldr(expected_type_val).xml()
+        return section, new_type, expected_xml
+
+    # fixture components ---------------------------------------------
+
+    def sectPr_bldr(self, start_type=None):
+        sectPr_bldr = a_sectPr().with_nsdecls()
+        if start_type is not None:
+            sectPr_bldr.with_child(
+                a_type().with_val(start_type)
+            )
+        return sectPr_bldr
