Author: jm
Date: Fri Oct 9 12:10:49 2009
New Revision: 29517
URL: http://svn.erp5.org?rev=29517&view=rev
Log:
Test that images are converted to the correct size (cf r29505)
Modified:
erp5/trunk/products/ERP5/tests/testERP5Base.py
Modified: erp5/trunk/products/ERP5/tests/testERP5Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Base.py?rev=29517&r1=29516&r2=29517&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Base.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Base.py [utf8] Fri Oct 9 12:10:49 2009
@@ -1253,22 +1253,20 @@
def test_ConvertImage(self):
image = self.portal.newContent(portal_type='Image', id='test_image')
image.edit(file=self.makeImageFileUpload('erp5_logo.png'))
- image_type, image_data = image.convert('jpg', display='thumbnail')
- self.assertEquals('image/jpeg', image_type)
- # magic
- self.assertEquals('\xff', image_data[0])
- self.assertEquals('\xd8', image_data[1])
-
- def test_ConvertImageQuality(self):
- image = self.portal.newContent(portal_type='Image', id='test_image')
- image.edit(file=self.makeImageFileUpload('erp5_logo.png'))
- image_type, image_data = image.convert('jpg', display='thumbnail',
- quality=100)
- self.assertEquals('image/jpeg', image_type)
- # magic
- self.assertEquals('\xff', image_data[0])
- self.assertEquals('\xd8', image_data[1])
-
+ self.assertEqual('image/png', image.getContentType())
+ self.assertEqual((320, 250), (image.getWidth(), image.getHeight()))
+
+ from Products.ERP5Type.Document import newTempImage
+ def convert(**kw):
+ image_type, image_data = image.convert('jpg', display='thumbnail', **kw)
+ self.assertEqual('image/jpeg', image_type)
+ thumbnail = newTempImage(self.portal, 'thumbnail', data=image_data)
+ self.assertEqual(image_type, thumbnail.getContentType())
+ self.assertEqual((128, 100), (thumbnail.getWidth(),
+ thumbnail.getHeight()))
+ return thumbnail.getSize()
+ self.assertTrue(convert() < convert(quality=100))
+
def test_ConvertImagePdata(self):
image = self.portal.newContent(portal_type='Image', id='test_image')
image.edit(file=self.makeImageFileUpload('erp5_logo.bmp'))