[Erp5-report] r33689 ivan - /erp5/trunk/products/ERP5OOo/tests/testDms.py

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Mar 12 10:58:28 2010
New Revision: 33689

URL: http://svn.erp5.org?rev=33689&view=rev
Log:
Fix testing for external state whenever conversion has failed.

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

Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=33689&r1=33688&r2=33689&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] Fri Mar 12 10:58:28 2010
@@ -1232,24 +1232,29 @@
     document = self.portal.document_module.newContent(portal_type='Drawing')
     self.assertEquals('empty', document.getExternalProcessingState())
 
-    filename = 'TEST-en-002.odt'
-    upload_file = makeFileUpload(filename)
+    upload_file = makeFileUpload('TEST-en-002.odt')
     document.edit(file=upload_file)
-    transaction.commit()
-    self.tic()
+    self.stepTic()
     self.assertEquals('converted', document.getExternalProcessingState())
 
-    # Upload different type of file inside
+    # Upload different type of file inside which can not be converted to base format
     upload_file = makeFileUpload('REF-en-001.pdf')
     document.edit(file=upload_file)
+    self.stepTic()
     self.assertEquals('application/pdf', document.getContentType())
-    self.assertEquals('converting', document.getExternalProcessingState())
+    self.assertEquals('conversion_failed', document.getExternalProcessingState())
     # As document is not converted, text convertion is impossible
     # But document can still be retrive with portal catalog
     self.assertRaises(NotConvertedError, document.asText)
     self.assertRaises(NotConvertedError, document.getSearchableText)
     self.assertEquals('This document is not converted yet.',
                       document.Base_showFoundText())
+    
+    # upload again good content
+    upload_file = makeFileUpload('TEST-en-002.odt')
+    document.edit(file=upload_file)
+    self.stepTic()
+    self.assertEquals('converted', document.getExternalProcessingState())
 
   def test_Base_createNewFile(self):
     """