[Erp5-report] r38695 ivan - in /erp5/trunk/products/ERP5OOo: Document/ tests/

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Sep 28 09:13:38 2010
New Revision: 38695

URL: http://svn.erp5.org?rev=38695&view=rev
Log:
Rather than simply raise return empty list for list of possible export formats for empty documents. Add test to cover this use case.

Modified:
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
    erp5/trunk/products/ERP5OOo/tests/testDms.py

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=38695&r1=38694&r2=38695&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Tue Sep 28 09:13:38 2010
@@ -175,7 +175,8 @@ class OOoDocument(OOoDocumentExtensibleT
       to provide an extensive list of conversion formats.
     """
     if not self.hasBaseData():
-      raise NotConvertedError
+      # if we have no date we can not format it
+      return []
 
     def cached_getTargetFormatItemList(content_type):
       server_proxy = self._mkProxy()

Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=38695&r1=38694&r2=38695&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] Tue Sep 28 09:13:38 2010
@@ -1927,6 +1927,21 @@ return 1
     image=self.portal.image_module.newContent(portal_type='Image',
                                                     content_type='image/png')
     self.assertTrue('txt' in image.getTargetFormatList())
+    
+    # test Not converted (i.e. empty) OOoDocument instances
+    presentation=self.portal.document_module.newContent(portal_type='Presentation')
+    self.assertSameSet([], presentation.getTargetFormatList())
+    
+    # test uploading some data
+    upload_file = makeFileUpload('Foo_001.odg')
+    presentation.edit(file=upload_file)
+    self.stepTic()
+    self.assertTrue('odg' in presentation.getTargetFormatList())
+    self.assertTrue('jpg' in presentation.getTargetFormatList())
+    self.assertTrue('png' in presentation.getTargetFormatList())
+
+    
+    
 
   def test_convertToImageOnTraversal(self):
     """