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

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Dec  3 15:51:48 2009
New Revision: 31035

URL: http://svn.erp5.org?rev=31035&view=rev
Log:
Change the way to check some nodes as text:reference-mark nodes are removed

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=31035&r1=31034&r2=31035&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py [utf8] Thu Dec  3 15:51:48 2009
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 # -*- coding: utf-8 -*-
 # Copyright (c) 2009 Nexedi KK and Contributors. All Rights Reserved.
@@ -283,11 +284,7 @@
     builder = OOoBuilder(odf_document)
     content_xml = builder.extract("content.xml")
     content = etree.XML(content_xml)
-    number_xpath = '//text:reference-mark[@text:name="number"]' 
-    number_reference = content.xpath(number_xpath, namespaces=content.nsmap)
-    self.assertTrue(len(number_reference) > 0)
-    number_paragraph = number_reference[0].getparent()
-    self.assertEqual(number_paragraph.text, "543 210.0")
+    self.assertTrue(content.xpath('//text:p = "543 210.0"', namespaces=content.nsmap))
     self._validate(odf_document)
     
     # change format
@@ -297,11 +294,7 @@
     builder = OOoBuilder(odf_document)
     content_xml = builder.extract("content.xml")
     content = etree.XML(content_xml)
-    number_xpath = '//text:reference-mark[@text:name="number"]' 
-    number_reference = content.xpath(number_xpath, namespaces=content.nsmap)
-    self.assertTrue(len(number_reference) > 0)
-    number_paragraph = number_reference[0].getparent()
-    self.assertEqual(number_paragraph.text, "543210.0")
+    self.assertTrue(content.xpath('//text:p = "543210.0"', namespaces=content.nsmap))
     
     self._validate(odf_document)