pythoningLearning
diff --git a/‎opc/oxml.py‎
Lines changed: 7 additions & 0 deletions b/‎opc/oxml.py‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎tests/test_oxml.py‎
Lines changed: 12 additions & 1 deletion b/‎tests/test_oxml.py‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎tests/unitdata.py‎
Lines changed: 32 additions & 2 deletions b/‎tests/unitdata.py‎
Lines changed: 32 additions & 2 deletions
@@ -154,6 +154,13 @@ class CT_Types(OxmlBaseElement):
     ``<Types>`` element, the container element for Default and Override
     elements in [Content_Types].xml.
     """
+    @property
+    def defaults(self):
+        try:
+            return self.Default[:]
+        except AttributeError:
+            return []
+
     @property
     def overrides(self):
         try:
 
@@ -10,7 +10,7 @@
 """Test suite for opc.oxml module."""
 
 from opc.constants import RELATIONSHIP_TARGET_MODE as RTM
-from opc.oxml import CT_Override
+from opc.oxml import CT_Default, CT_Override
 
 from .unitdata import a_Default, an_Override, a_Relationship, a_Types
 
@@ -43,8 +43,19 @@ def it_provides_read_access_to_xml_values(self):
 
 class DescribeCT_Types(object):
 
+    def it_provides_access_to_default_child_elements(self):
+        types = a_Types().element
+        assert len(types.defaults) == 2
+        for default in types.defaults:
+            assert isinstance(default, CT_Default)
+
     def it_provides_access_to_override_child_elements(self):
         types = a_Types().element
         assert len(types.overrides) == 3
         for override in types.overrides:
             assert isinstance(override, CT_Override)
+
+    def it_should_have_empty_list_on_no_matching_elements(self):
+        types = a_Types().empty().element
+        assert types.defaults == []
+        assert types.overrides == []
@@ -37,13 +37,26 @@ def __init__(self):
         """Establish instance variables with default values"""
         self._content_type = 'application/xml'
         self._extension = 'xml'
+        self._indent = 0
         self._namespace = ' xmlns="%s"' % NS.OPC_CONTENT_TYPES
 
+    def with_content_type(self, content_type):
+        """Set ContentType attribute to *content_type*"""
+        self._content_type = content_type
+        return self
+
+    def with_extension(self, extension):
+        """Set Extension attribute to *extension*"""
+        self._extension = extension
+        return self
+
     @property
     def xml(self):
         """Return Default element"""
-        tmpl = '<Default%s Extension="%s" ContentType="%s"/>\n'
-        return tmpl % (self._namespace, self._extension, self._content_type)
+        tmpl = '%s<Default%s Extension="%s" ContentType="%s"/>\n'
+        indent = ' ' * self._indent
+        return tmpl % (indent, self._namespace, self._extension,
+                       self._content_type)
 
 
 class CT_OverrideBuilder(BaseBuilder):
@@ -111,18 +124,35 @@ class CT_TypesBuilder(BaseBuilder):
     """
     def __init__(self):
         """Establish instance variables with default values"""
+        self._defaults = (
+            ('xml', 'application/xml'),
+            ('jpeg', 'image/jpeg'),
+        )
+        self._empty = False
         self._overrides = (
             ('/docProps/core.xml', 'app/vnd.type1'),
             ('/ppt/presentation.xml', 'app/vnd.type2'),
             ('/docProps/thumbnail.jpeg', 'image/jpeg'),
         )
 
+    def empty(self):
+        self._empty = True
+        return self
+
     @property
     def xml(self):
         """
         Return XML string based on settings accumulated via method calls
         """
+        if self._empty:
+            return '<Types xmlns="%s"/>\n' % NS.OPC_CONTENT_TYPES
+
         xml = '<Types xmlns="%s">\n' % NS.OPC_CONTENT_TYPES
+        for extension, content_type in self._defaults:
+            xml += (a_Default().with_extension(extension)
+                               .with_content_type(content_type)
+                               .with_indent(2)
+                               .xml)
         for partname, content_type in self._overrides:
             xml += (an_Override().with_partname(partname)
                                  .with_content_type(content_type)