[Erp5-report] r41729 jm - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: jm
Date: Thu Dec 23 19:07:52 2010
New Revision: 41729

URL: http://svn.erp5.org?rev=41729&view=rev
Log:
Fix test_20_reStructuredText

Modified:
    erp5/trunk/products/ERP5/Document/TextDocument.py
    erp5/trunk/products/ERP5/tests/testERP5Web.py

Modified: erp5/trunk/products/ERP5/Document/TextDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TextDocument.py?rev=41729&r1=41728&r2=41729&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TextDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TextDocument.py [utf8] Thu Dec 23 19:07:52 2010
@@ -148,6 +148,10 @@ class TextDocument(CachedConvertableMixi
         text_content = self.getTextContent()
       if text_content:
         kw['format'] = format
+        convert_kw = {}
+        # PortalTransforms does not accept empty values for 'encoding' parameter
+        if charset:
+          kw['charset'] = convert_kw['encoding'] = charset
         if not self.hasConversion(**kw):
           portal_transforms = getToolByName(portal, 'portal_transforms')
           filename = self.getStandardFilename(format=format)
@@ -157,7 +161,7 @@ class TextDocument(CachedConvertableMixi
                                                    object=self, context=self,
                                                    filename=filename,
                                                    mimetype=src_mimetype,
-                                                   encoding=charset)
+                                                   **convert_kw)
           if result is None:
             raise ConversionError('TextDocument conversion error. '
                                   'portal_transforms failed to convert '

Modified: erp5/trunk/products/ERP5/tests/testERP5Web.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Web.py?rev=41729&r1=41728&r2=41729&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Web.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Web.py [utf8] Thu Dec 23 19:07:52 2010
@@ -1313,16 +1313,10 @@ Hé Hé Hé!""", page.asText().strip())
     self.assertEquals(1, getattr(website, 'person_module').isEditableMode())
 
   def test_20_reStructuredText(self):
-    def clearAllCache():
-      self.portal.portal_caches.clearAllCache()
-      getTransactionalVariable().clear()
     web_page = self.portal.web_page_module.newContent(portal_type='Web Page',
-                                                      content_type='text/x-rst',
-                                                      text_content="`foo`")
-    clearAllCache()
+                                                      content_type='text/x-rst')
+    web_page.edit(text_content="`foo`")
     self.assertTrue('<cite>foo</cite>' in web_page.asEntireHTML(charset='utf-8'))
-    # XXX: It currently fails if charset is not given. Is it normal ?
-    clearAllCache()
     self.assertTrue('<cite>foo</cite>' in web_page.asEntireHTML())