[Erp5-report] r41670 nicolas - /erp5/trunk/products/ERP5OOo/tests/testFormPrintoutAsODT.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Dec 22 15:54:02 2010
New Revision: 41670

URL: http://svn.erp5.org?rev=41670&view=rev
Log:
Depending of Language local settings of openoffice instance,
the size values can be converted from centimeter to inch.
Add support of this value.

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

Modified: erp5/trunk/products/ERP5OOo/tests/testFormPrintoutAsODT.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testFormPrintoutAsODT.py?rev=41670&r1=41669&r2=41670&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testFormPrintoutAsODT.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testFormPrintoutAsODT.py [utf8] Wed Dec 22 15:54:02 2010
@@ -1138,10 +1138,10 @@ return []
     image_frame_list = content.xpath(image_frame_xpath, namespaces=content.nsmap)
     self.assertTrue(len(image_frame_list) > 0)
     image_frame = image_frame_list[0]
-    self.assertEqual(image_frame.attrib['{%s}height' % content.nsmap['svg']],
-                     '0.838cm')
-    self.assertEqual(image_frame.attrib['{%s}width' % content.nsmap['svg']],
-                     '0.838cm')
+    height = image_frame.attrib['{%s}height' % content.nsmap['svg']]
+    self.assertTrue(height in ('0.838cm', '0.3299in'))
+    width = image_frame.attrib['{%s}width' % content.nsmap['svg']]
+    self.assertTrue(width in ('0.838cm', '0.3299in'))
     self._validate(odf_document)
 
     # 02: no image data