[Erp5-report] r35833 nicolas - /erp5/trunk/products/ERP5SyncML/tests/testERP5DocumentSyncML.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon May 31 19:08:20 2010
New Revision: 35833

URL: http://svn.erp5.org?rev=35833&view=rev
Log:
Fix assertXMLViewIsEqual

Modified:
    erp5/trunk/products/ERP5SyncML/tests/testERP5DocumentSyncML.py

Modified: erp5/trunk/products/ERP5SyncML/tests/testERP5DocumentSyncML.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/tests/testERP5DocumentSyncML.py?rev=35833&r1=35832&r2=35833&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/tests/testERP5DocumentSyncML.py [utf8] (original)
+++ erp5/trunk/products/ERP5SyncML/tests/testERP5DocumentSyncML.py [utf8] Mon May 31 19:08:20 2010
@@ -529,8 +529,8 @@
                        size_filename=self.size_filename_odt)
     self.checkXMLsSynchronized() 
 
-  def assertXMLViewIsEqual(self, sub_id, object_pub=None, object_sub=None,\
-                           force=0):
+  def assertXMLViewIsEqual(self, sub_id, object_pub=None, object_sub=None,
+                                                                  force=False):
     """
       Check the equality between two xml objects with gid as id
     """
@@ -541,28 +541,29 @@
     gid_sub = publication.getGidFromObject(object_sub)
     self.assertEqual(gid_pub, gid_sub)
     conduit = ERP5DocumentConduit()
-    xml_pub = conduit.getXMLFromObjectWithGid(object=object_pub, gid=gid_pub,\
-              xml_mapping=publication.getXMLMapping())
+    xml_pub = conduit.getXMLFromObjectWithGid(object=object_pub, gid=gid_pub,
+                                       xml_mapping=publication.getXMLMapping())
     #if One Way From Server there is not xml_mapping for subscription
-    xml_sub = conduit.getXMLFromObjectWithGid(object=object_sub, gid=gid_sub,\
-              xml_mapping=subscription.getXMLMapping(force))
+    xml_sub = conduit.getXMLFromObjectWithGid(object=object_sub, gid=gid_sub,
+                                 xml_mapping=subscription.getXMLMapping(force))
     erp5diff = ERP5Diff()
     erp5diff.compare(xml_pub, xml_sub)
-    result = erp5diff.outputString()
-    result = etree.XML(result)
-    if len(result) != 0 :
-      for update in result:
-        #XXX edit workflow is not replaced, so discard workflow checking
-        if update.get('select').find('workflow') != -1 or\
-           update.find('block_data') != -1:
-          continue
-        else :
-          self.fail('diff between pub:\n%s \n => \n%s' %\
-              (xml_pub, etree.tostring(result, pretty_print=True)))
-  
-  
-class TestERP5DocumentSyncML(TestERP5DocumentSyncMLMixin, ERP5TypeTestCase):
-  
+    result =  etree.XML(erp5diff.outputString())
+    identity = True
+    for update in result:
+      #XXX edit workflow is not replaced, so discard workflow checking
+      if 'workflow' not in update.get('select', ''):
+        identity = False
+        break
+    if not identity:
+      self.fail('diff between %s and %s \nxupdate:\n%s' %\
+                                                  (object_pub.getRelativeUrl(),
+                                                   object_sub.getRelativeUrl(),
+                                    etree.tostring(result, pretty_print=True)))
+
+
+class TestERP5DocumentSyncML(TestERP5DocumentSyncMLMixin):
+
   def getTitle(self):
     """
     """