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

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Dec 21 18:37:30 CET 2010


Author: nicolas
Date: Tue Dec 21 18:37:29 2010
New Revision: 41625

URL: http://svn.erp5.org?rev=41625&view=rev
Log:
OOo after refresh can decide to cleanup text:span elements
Take into account this behaviour.

Before refresh:
  <text:reference-mark-start text:name="week"/>
      <text:span>Monday</text:span>
    <text:reference-mark-end text:name="week"/
After refresh:
  <text:reference-mark-start text:name="week"/>Monday<text:reference-mark-end text:name="week"/>

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=41625&r1=41624&r2=41625&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testFormPrintoutAsODT.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testFormPrintoutAsODT.py [utf8] Tue Dec 21 18:37:29 2010
@@ -259,10 +259,16 @@ class TestFormPrintoutAsODT(TestFormPrin
     content_tree = etree.XML(content_xml)
     span_list = content_tree.xpath('//text:reference-mark-start[@text:name="week"]/following-sibling::text:span',
                                    namespaces=content_tree.nsmap)
-    self.assertEquals(1, len(span_list))
-    span = span_list[0]
-    self.assertEquals('line1', span.text)
-    self.assertEquals('line2', span[0].tail)
+    if span_list:
+      self.assertEquals(1, len(span_list))
+      span = span_list[0]
+      self.assertEquals('line1', span.text)
+      self.assertEquals('line2', span[0].tail)
+    else:
+      reference_mark_node = content_tree.xpath('//text:reference-mark-start[@text:name="week"][1]',
+                                               namespaces=content_tree.nsmap)[0]
+      self.assertEquals('line1', reference_mark_node.tail)
+      self.assertEquals('line2', reference_mark_node.getnext().tail)
     self._validate(odf_document)
 
   def test_01_Paragraph_08_Field_Format(self):



More information about the Erp5-report mailing list