Commit 4f3d274f authored by Sebastien Robin's avatar Sebastien Robin

corrected bug when we cut big message with string wich contains -- character


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@922 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9e7d6d9a
...@@ -409,6 +409,8 @@ class Signature(SyncCode): ...@@ -409,6 +409,8 @@ class Signature(SyncCode):
deliver in the future deliver in the future
""" """
#LOG('Subscriber.getPartialXML',0,'partial_xml: %s' % str(self.partial_xml)) #LOG('Subscriber.getPartialXML',0,'partial_xml: %s' % str(self.partial_xml))
if self.partial_xml is not None:
self.partial_xml = self.partial_xml.replace('@-@@-@','--') # need to put back '--'
return self.partial_xml return self.partial_xml
def getAction(self): def getAction(self):
......
...@@ -63,7 +63,7 @@ class SyncCode(Persistent): ...@@ -63,7 +63,7 @@ class SyncCode(Persistent):
PUB_CONFLICT_MERGE = 6 PUB_CONFLICT_MERGE = 6
PUB_CONFLICT_CLIENT_WIN = 8 PUB_CONFLICT_CLIENT_WIN = 8
MAX_LINES = 10000 MAX_LINES = 1000
action_tag = 'workflow_action' action_tag = 'workflow_action'
#NOT_EDITABLE_PROPERTY = ('id','object','uid','xupdate:element',action_tag, #NOT_EDITABLE_PROPERTY = ('id','object','uid','xupdate:element',action_tag,
......
...@@ -572,6 +572,8 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject): ...@@ -572,6 +572,8 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject):
signature = Signature(gid=object_gid,id=object.getId()) signature = Signature(gid=object_gid,id=object.getId())
signature.setTempXML(xml_object) signature.setTempXML(xml_object)
if xml_string.count('\n') > self.MAX_LINES: if xml_string.count('\n') > self.MAX_LINES:
if xml_string.find('--') > 0: # This make comment fails, so we need to replace
xml_string = xml_string.replace('--','@-@@-@')
more_data=1 more_data=1
i = 0 i = 0
short_string = '' short_string = ''
...@@ -606,6 +608,8 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject): ...@@ -606,6 +608,8 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject):
xml_mapping=domain.xml_mapping, xml_mapping=domain.xml_mapping,
old_xml=signature.getXML()) old_xml=signature.getXML())
if xml_string.count('\n') > self.MAX_LINES: if xml_string.count('\n') > self.MAX_LINES:
if xml_string.find('--') > 0: # This make comment fails, so we need to replace
xml_string = xml_string.replace('--','@-@@-@')
i = 0 i = 0
more_data=1 more_data=1
short_string = '' short_string = ''
...@@ -642,6 +646,7 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject): ...@@ -642,6 +646,7 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject):
# XXX previous_xml will be getXML instead of getTempXML because # XXX previous_xml will be getXML instead of getTempXML because
# some modification was already made and the update # some modification was already made and the update
# may not apply correctly # may not apply correctly
xml_update = signature.getPartialXML()
conduit.updateNode(xml=signature.getPartialXML(), object=object, conduit.updateNode(xml=signature.getPartialXML(), object=object,
previous_xml=signature.getXML(),force=1) previous_xml=signature.getXML(),force=1)
xml_confirmation += self.SyncMLConfirmation(cmd_id,object_gid, xml_confirmation += self.SyncMLConfirmation(cmd_id,object_gid,
...@@ -650,6 +655,8 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject): ...@@ -650,6 +655,8 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject):
elif signature.getStatus()==self.PARTIAL: elif signature.getStatus()==self.PARTIAL:
xml_string = signature.getPartialXML() xml_string = signature.getPartialXML()
if xml_string.count('\n') > self.MAX_LINES: if xml_string.count('\n') > self.MAX_LINES:
if xml_string.find('--') > 0: # This make comment fails, so we need to replace
xml_string = xml_string.replace('--','@-@@-@')
i = 0 i = 0
more_data=1 more_data=1
short_string = '' short_string = ''
......
...@@ -57,14 +57,14 @@ class TestERP5SyncML(ERP5TypeTestCase): ...@@ -57,14 +57,14 @@ class TestERP5SyncML(ERP5TypeTestCase):
workflow_id = 'edit_workflow' workflow_id = 'edit_workflow'
first_name1 = 'Sebastien' first_name1 = 'Sebastien'
last_name1 = 'Robin' last_name1 = 'Robin'
description1 = 'description1 $sdfr_sdfsdf_oisfsopf' description1 = 'description1 --- $sdfr_sdfsdf_oisfsopf'
lang1 = 'fr' lang1 = 'fr'
format2 = 'html' format2 = 'html'
format3 = 'xml' format3 = 'xml'
format4 = 'txt' format4 = 'txt'
first_name2 = 'Jean-Paul' first_name2 = 'Jean-Paul'
last_name2 = 'Smets' last_name2 = 'Smets'
description2 = 'description2@ $*< <<< >>>></title>&oekd' description2 = 'description2@ $*< <<< ----- >>>></title>&oekd'
lang2 = 'en' lang2 = 'en'
first_name3 = 'Yoshinori' first_name3 = 'Yoshinori'
last_name3 = 'Okuji' last_name3 = 'Okuji'
...@@ -94,7 +94,7 @@ class TestERP5SyncML(ERP5TypeTestCase): ...@@ -94,7 +94,7 @@ class TestERP5SyncML(ERP5TypeTestCase):
Return the list of business templates. Return the list of business templates.
the business template sync_crm give 3 folders: the business template sync_crm give 3 folders:
/person_server with persons: 170,171, 180 /person_server
/person_client1 : empty /person_client1 : empty
/person_client2 : empty /person_client2 : empty
""" """
...@@ -122,9 +122,9 @@ class TestERP5SyncML(ERP5TypeTestCase): ...@@ -122,9 +122,9 @@ class TestERP5SyncML(ERP5TypeTestCase):
ZopeTestCase._print('\nTest Has Everything ') ZopeTestCase._print('\nTest Has Everything ')
LOG('Testing... ',0,'testHasEverything') LOG('Testing... ',0,'testHasEverything')
self.failUnless(self.getSynchronizationTool()!=None) self.failUnless(self.getSynchronizationTool()!=None)
self.failUnless(self.getPersonServer()!=None) #self.failUnless(self.getPersonServer()!=None)
self.failUnless(self.getPersonClient1()!=None) #self.failUnless(self.getPersonClient1()!=None)
self.failUnless(self.getPersonClient2()!=None) #self.failUnless(self.getPersonClient2()!=None)
def testAddPublication(self, quiet=0, run=run_all_test): def testAddPublication(self, quiet=0, run=run_all_test):
if not run: return if not run: return
...@@ -177,8 +177,21 @@ class TestERP5SyncML(ERP5TypeTestCase): ...@@ -177,8 +177,21 @@ class TestERP5SyncML(ERP5TypeTestCase):
ZopeTestCase._print('\nTest Populate Person Server ') ZopeTestCase._print('\nTest Populate Person Server ')
LOG('Testing... ',0,'populatePersonServer') LOG('Testing... ',0,'populatePersonServer')
self.login() self.login()
person_server = self.getPersonServer() portal = self.getPortal()
if not hasattr(portal,'person_server'):
portal.portal_types.constructContent(type_name = 'Person Module',
container = portal,
id = 'person_server')
if not hasattr(portal,'person_client1'):
portal.portal_types.constructContent(type_name = 'Person Module',
container = portal,
id = 'person_client1')
if not hasattr(portal,'person_client2'):
portal.portal_types.constructContent(type_name = 'Person Module',
container = portal,
id = 'person_client2')
person_id = '' person_id = ''
person_server = self.getPersonServer()
person1 = person_server.newContent(id=self.id1,portal_type='Person') person1 = person_server.newContent(id=self.id1,portal_type='Person')
kw = {'first_name':self.first_name1,'last_name':self.last_name1, kw = {'first_name':self.first_name1,'last_name':self.last_name1,
'description':self.description1} 'description':self.description1}
...@@ -350,6 +363,36 @@ class TestERP5SyncML(ERP5TypeTestCase): ...@@ -350,6 +363,36 @@ class TestERP5SyncML(ERP5TypeTestCase):
self.failUnless(person2_c.getFirstName()==self.first_name1) self.failUnless(person2_c.getFirstName()==self.first_name1)
self.failUnless(person2_c.getLastName()==self.last_name1) self.failUnless(person2_c.getLastName()==self.last_name1)
def testFirstSynchronizationWithLongLines(self, quiet=0, run=run_all_test):
# We will try to populate the folder person_client1
# with the data form person_server
if not run: return
if not quiet:
ZopeTestCase._print('\nTest First Synchronization With Long Lines ')
LOG('Testing... ',0,'testFirstSynchronizationWithLongLines')
self.login()
self.setupPublicationAndSubscription(quiet=1,run=1)
nb_person = self.populatePersonServer(quiet=1,run=1)
person_server = self.getPersonServer()
long_line = 'a' * 10000 + ' --- '
person1_s = person_server._getOb(self.id1)
kw = {'first_name':long_line}
person1_s.edit(**kw)
# Synchronize the first client
nb_message1 = self.synchronize(self.sub_id1)
self.failUnless(nb_message1==self.nb_message_first_synchronization)
portal_sync = self.getSynchronizationTool()
subscription1 = portal_sync.getSubscription(self.sub_id1)
self.failUnless(len(subscription1.getObjectList())==nb_person)
self.failUnless(person1_s.getId()==self.id1)
self.failUnless(person1_s.getFirstName()==long_line)
self.failUnless(person1_s.getLastName()==self.last_name1)
person_client1 = self.getPersonClient1()
person1_c = person_client1._getOb(self.id1)
self.failUnless(person1_c.getId()==self.id1)
self.failUnless(person1_c.getFirstName()==long_line)
self.failUnless(person1_c.getLastName()==self.last_name1)
def testGetObjectFromGid(self, quiet=0, run=run_all_test): def testGetObjectFromGid(self, quiet=0, run=run_all_test):
# We will try to get an object from a publication # We will try to get an object from a publication
# just by givin the gid # just by givin the gid
...@@ -1029,12 +1072,12 @@ class TestERP5SyncML(ERP5TypeTestCase): ...@@ -1029,12 +1072,12 @@ class TestERP5SyncML(ERP5TypeTestCase):
self.failUnless(len_path==3) self.failUnless(len_path==3)
len_path = len(sub_sub_person2.getPhysicalPath()) - 3 len_path = len(sub_sub_person2.getPhysicalPath()) - 3
self.failUnless(len_path==3) self.failUnless(len_path==3)
self.failUnless(sub_sub_person1.getDescription()==self.description1) self.assertEquals(sub_sub_person1.getDescription(),self.description1)
self.failUnless(sub_sub_person1.getFirstName()==self.first_name1) self.assertEquals(sub_sub_person1.getFirstName(),self.first_name1)
self.failUnless(sub_sub_person1.getLastName()==self.last_name1) self.assertEquals(sub_sub_person1.getLastName(),self.last_name1)
self.failUnless(sub_sub_person2.getDescription()==self.description2) self.assertEquals(sub_sub_person2.getDescription(),self.description2)
self.failUnless(sub_sub_person2.getFirstName()==self.first_name2) self.assertEquals(sub_sub_person2.getFirstName(),self.first_name2)
self.failUnless(sub_sub_person2.getLastName()==self.last_name2) self.assertEquals(sub_sub_person2.getLastName(),self.last_name2)
SyncCode.MAX_LINES = previous_max_lines SyncCode.MAX_LINES = previous_max_lines
# We may add a test in order to check if the slow_sync mode works fine, ie # We may add a test in order to check if the slow_sync mode works fine, ie
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment