[Erp5-report] r35271 nicolas - /erp5/trunk/products/ERP5OOo/tests/testDms.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed May 12 20:03:13 2010
New Revision: 35271

URL: http://svn.erp5.org?rev=35271&view=rev
Log:
parameter handling of Image conversion changed, so follow new implemenation

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=35271&r1=35270&r2=35271&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] Wed May 12 20:03:13 2010
@@ -1563,6 +1563,14 @@
     transaction.commit()
     self.tic()
 
+    preference_tool = getToolByName(self.portal, 'portal_preferences')
+    image_size = preference_tool.getPreferredThumbnailImageHeight(),\
+                              preference_tool.getPreferredThumbnailImageWidth()
+    convert_kw = {'format': 'png',
+                  'quality': 75,
+                  'display': 'thumbnail',
+                  'resolution': None}
+
     class ThreadWrappedConverter(Thread):
       """Use this class to run different convertion
       inside distinct Thread.
@@ -1578,13 +1586,15 @@
       def run(self):
         for frame in self.frame_list:
           # Use publish method to dispatch conversion among
-          # all available Zserver threads.
-          response = self.publish_method('%s/index_html?format=png'\
-                              '&display=thumbnail&quality:int=75&resolution='\
-                              '&frame=%s' % (self.document_path, frame),
-                                                               self.credential)
-          assert response.getHeader('content-type') == 'image/png'
-          assert response.getStatus() ==  httplib.OK
+          # all available ZServer threads.
+          convert_kw['frame'] = frame
+          response = self.publish_method(self.document_path,
+                                         basic=self.credential,
+                                         extra=convert_kw)
+
+          assert response.getHeader('content-type') == 'image/png', \
+                                             response.getHeader('content-type')
+          assert response.getStatus() == httplib.OK
         transaction.commit()
 
     # assume there is no password
@@ -1607,18 +1617,15 @@
     transaction.commit()
     self.tic()
 
-    preference_tool = getToolByName(self.portal, 'portal_preferences')
-    image_size = preference_tool.getPreferredThumbnailImageHeight(),\
-                              preference_tool.getPreferredThumbnailImageWidth()
     convert_kw = {'format': 'png',
-                  'display': 'thumbnail',
                   'quality': 75,
                   'image_size': image_size,
-                  'resolution': ''}
+                  'resolution': None}
+
     result_list = []
     for i in xrange(pages_number):
       # all conversions should succeeded and stored in cache storage
-      convert_kw['frame'] = str(i)
+      convert_kw['frame'] = i
       if not document.hasConversion(**convert_kw):
         result_list.append(i)
     self.assertEquals(result_list, [])