[Erp5-report] r31156 nicolas - /erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Dec  8 14:30:29 2009
New Revision: 31156

URL: http://svn.erp5.org?rev=31156&view=rev
Log:
Improve test to avoid confusion

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

Modified: erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py?rev=31156&r1=31155&r2=31156&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py [utf8] Tue Dec  8 14:30:29 2009
@@ -270,9 +270,13 @@
     #test_output.write(odf_document)
     builder = OOoBuilder(odf_document)
     content_xml = builder.extract("content.xml")
-    self.assertTrue(content_xml.find("line1") > 0)
-    self.assertTrue(content_xml.find("line2") > 0)
-    self.assertTrue(content_xml.find("line2") > content_xml.find("line1"))
+    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)
     self._validate(odf_document)
 
   def test_01_Paragraph_08_Field_Format(self, run=run_all_test):