Skip to content

erp5
erp5
Commit 0ff92486 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

this test was broken today because Guillaume fixed something in ERP5Type!!... 

this test was broken today because Guillaume fixed something in ERP5Type!! (setTitle now call reindexObject with an activity)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3823 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 478c63dd
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 27 deletions
product/CMFActivity/tests/testCMFActivity.py
View file @ 0ff92486
...@@ -90,7 +90,7 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -90,7 +90,7 @@ class TestCMFActivity(ERP5TypeTestCase):
def getOrganisationModule(self): def getOrganisationModule(self):
return getattr(self.getPortal(), 'organisation', None) return getattr(self.getPortal(), 'organisation', None)
def afterSetUp(self, quiet=1, run=1): def afterSetUp(self):
self.login() self.login()
portal = self.getPortal() portal = self.getPortal()
# Then add new components # Then add new components
...@@ -101,6 +101,13 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -101,6 +101,13 @@ class TestCMFActivity(ERP5TypeTestCase):
organisation_module = self.getOrganisationModule() organisation_module = self.getOrganisationModule()
if not(organisation_module.hasContent(self.company_id)): if not(organisation_module.hasContent(self.company_id)):
o1 = organisation_module.newContent(id=self.company_id) o1 = organisation_module.newContent(id=self.company_id)
# remove all message in the message_table because
# reindex might have been called
message_list = portal.portal_activities.getMessageList()
for message in message_list:
portal.portal_activities.manageCancel(message.object_path,message.method_id)
get_transaction().commit()
def login(self, quiet=0, run=run_all_test): def login(self, quiet=0, run=run_all_test):
uf = self.getPortal().acl_users uf = self.getPortal().acl_users
...@@ -115,25 +122,25 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -115,25 +122,25 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
self.assertEquals(self.title1,organisation.getTitle()) self.assertEquals(self.title1,organisation.getTitle())
organisation.activate(activity=activity).setTitle(self.title2) organisation.activate(activity=activity)._setTitle(self.title2)
# Needed so that the message are commited into the queue # Needed so that the message are commited into the queue
get_transaction().commit() get_transaction().commit()
message_list = portal.portal_activities.getMessageList() message_list = portal.portal_activities.getMessageList()
self.assertEquals(len(message_list),1) self.assertEquals(len(message_list),1)
portal.portal_activities.manageCancel(organisation.getPhysicalPath(),'setTitle') portal.portal_activities.manageCancel(organisation.getPhysicalPath(),'_setTitle')
# Needed so that the message are removed from the queue # Needed so that the message are removed from the queue
get_transaction().commit() get_transaction().commit()
self.assertEquals(self.title1,organisation.getTitle()) self.assertEquals(self.title1,organisation.getTitle())
message_list = portal.portal_activities.getMessageList() message_list = portal.portal_activities.getMessageList()
self.assertEquals(len(message_list),0) self.assertEquals(len(message_list),0)
organisation.activate(activity=activity).setTitle(self.title2) organisation.activate(activity=activity)._setTitle(self.title2)
# Needed so that the message are commited into the queue # Needed so that the message are commited into the queue
get_transaction().commit() get_transaction().commit()
message_list = portal.portal_activities.getMessageList() message_list = portal.portal_activities.getMessageList()
self.assertEquals(len(message_list),1) self.assertEquals(len(message_list),1)
portal.portal_activities.manageInvoke(organisation.getPhysicalPath(),'setTitle') portal.portal_activities.manageInvoke(organisation.getPhysicalPath(),'_setTitle')
# Needed so that the message are removed from the queue # Needed so that the message are removed from the queue
get_transaction().commit() get_transaction().commit()
self.assertEquals(self.title2,organisation.getTitle()) self.assertEquals(self.title2,organisation.getTitle())
...@@ -147,9 +154,9 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -147,9 +154,9 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
self.assertEquals(self.title1,organisation.getTitle()) self.assertEquals(self.title1,organisation.getTitle())
organisation.activate(activity=activity).setTitle(self.title2) organisation.activate(activity=activity)._setTitle(self.title2)
# Needed so that the message are commited into the queue # Needed so that the message are commited into the queue
get_transaction().commit() get_transaction().commit()
self.assertEquals(self.title1,organisation.getTitle()) self.assertEquals(self.title1,organisation.getTitle())
...@@ -179,7 +186,7 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -179,7 +186,7 @@ class TestCMFActivity(ERP5TypeTestCase):
Organisation.setFoobar = setFoobar Organisation.setFoobar = setFoobar
Organisation.getFoobar = getFoobar Organisation.getFoobar = getFoobar
organisation.foobar = 0 organisation.foobar = 0
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
self.assertEquals(0,organisation.getFoobar()) self.assertEquals(0,organisation.getFoobar())
organisation.activate(activity=activity).setFoobar() organisation.activate(activity=activity).setFoobar()
# Needed so that the message are commited into the queue # Needed so that the message are commited into the queue
...@@ -209,8 +216,8 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -209,8 +216,8 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
organisation.activate(activity=activity).setTitle(self.title2) organisation.activate(activity=activity)._setTitle(self.title2)
organisation.flushActivity(invoke=1) organisation.flushActivity(invoke=1)
self.assertEquals(organisation.getTitle(),self.title2) self.assertEquals(organisation.getTitle(),self.title2)
get_transaction().commit() get_transaction().commit()
...@@ -218,8 +225,8 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -218,8 +225,8 @@ class TestCMFActivity(ERP5TypeTestCase):
self.assertEquals(len(message_list),0) self.assertEquals(len(message_list),0)
self.assertEquals(organisation.getTitle(),self.title2) self.assertEquals(organisation.getTitle(),self.title2)
# Try again with different commit order # Try again with different commit order
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
organisation.activate(activity=activity).setTitle(self.title2) organisation.activate(activity=activity)._setTitle(self.title2)
get_transaction().commit() get_transaction().commit()
organisation.flushActivity(invoke=1) organisation.flushActivity(invoke=1)
self.assertEquals(len(message_list),0) self.assertEquals(len(message_list),0)
...@@ -232,11 +239,11 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -232,11 +239,11 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
def DeferredSetTitle(self,value): def DeferredSetTitle(self,value):
self.activate(activity=activity).setTitle(value) self.activate(activity=activity)._setTitle(value)
from Products.ERP5Type.Document.Organisation import Organisation from Products.ERP5Type.Document.Organisation import Organisation
Organisation.DeferredSetTitle = DeferredSetTitle Organisation.DeferredSetTitle = DeferredSetTitle
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
organisation.activate(activity=activity).DeferredSetTitle(self.title2) organisation.activate(activity=activity).DeferredSetTitle(self.title2)
organisation.flushActivity(invoke=1) organisation.flushActivity(invoke=1)
get_transaction().commit() get_transaction().commit()
...@@ -255,12 +262,12 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -255,12 +262,12 @@ class TestCMFActivity(ERP5TypeTestCase):
def DeferredSetDescription(self,value): def DeferredSetDescription(self,value):
self.setDescription(value) self.setDescription(value)
def DeferredSetTitle(self,value): def DeferredSetTitle(self,value):
self.setTitle(value) self._setTitle(value)
from Products.ERP5Type.Document.Organisation import Organisation from Products.ERP5Type.Document.Organisation import Organisation
Organisation.DeferredSetTitle = DeferredSetTitle Organisation.DeferredSetTitle = DeferredSetTitle
Organisation.DeferredSetDescription = DeferredSetDescription Organisation.DeferredSetDescription = DeferredSetDescription
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(None) organisation._setTitle(None)
organisation.setDescription(None) organisation.setDescription(None)
organisation.activate(activity=activity).DeferredSetTitle(self.title1) organisation.activate(activity=activity).DeferredSetTitle(self.title1)
organisation.activate(activity=activity).DeferredSetDescription(self.title1) organisation.activate(activity=activity).DeferredSetDescription(self.title1)
...@@ -279,14 +286,14 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -279,14 +286,14 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
def DeferredSetTitle(self,value): def DeferredSetTitle(self,value):
self.activate(activity=activity).setTitle(value) self.activate(activity=activity)._setTitle(value)
def DeferredSetDescription(self,value): def DeferredSetDescription(self,value):
self.activate(activity=activity).setDescription(value) self.activate(activity=activity).setDescription(value)
from Products.ERP5Type.Document.Organisation import Organisation from Products.ERP5Type.Document.Organisation import Organisation
Organisation.DeferredSetTitle = DeferredSetTitle Organisation.DeferredSetTitle = DeferredSetTitle
Organisation.DeferredSetDescription = DeferredSetDescription Organisation.DeferredSetDescription = DeferredSetDescription
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(None) organisation._setTitle(None)
organisation.setDescription(None) organisation.setDescription(None)
organisation.activate(activity=activity).DeferredSetTitle(self.title1) organisation.activate(activity=activity).DeferredSetTitle(self.title1)
organisation.activate(activity=activity).DeferredSetDescription(self.title1) organisation.activate(activity=activity).DeferredSetDescription(self.title1)
...@@ -308,7 +315,7 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -308,7 +315,7 @@ class TestCMFActivity(ERP5TypeTestCase):
def DeferredSetTitle(self,value,commit_sub=0): def DeferredSetTitle(self,value,commit_sub=0):
if commit_sub: if commit_sub:
get_transaction().commit(1) get_transaction().commit(1)
self.activate(activity=second or activity,priority=4).setTitle(value) self.activate(activity=second or activity,priority=4)._setTitle(value)
def DeferredSetDescription(self,value,commit_sub=0): def DeferredSetDescription(self,value,commit_sub=0):
if commit_sub: if commit_sub:
get_transaction().commit(1) get_transaction().commit(1)
...@@ -317,7 +324,7 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -317,7 +324,7 @@ class TestCMFActivity(ERP5TypeTestCase):
Organisation.DeferredSetTitle = DeferredSetTitle Organisation.DeferredSetTitle = DeferredSetTitle
Organisation.DeferredSetDescription = DeferredSetDescription Organisation.DeferredSetDescription = DeferredSetDescription
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(None) organisation._setTitle(None)
organisation.setDescription(None) organisation.setDescription(None)
organisation.activate(activity=activity).DeferredSetTitle(self.title1,commit_sub=commit_sub) organisation.activate(activity=activity).DeferredSetTitle(self.title1,commit_sub=commit_sub)
organisation.flushActivity(invoke=1) organisation.flushActivity(invoke=1)
...@@ -348,6 +355,7 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -348,6 +355,7 @@ class TestCMFActivity(ERP5TypeTestCase):
# Needed so that the message are commited into the queue # Needed so that the message are commited into the queue
get_transaction().commit() get_transaction().commit()
message_list = portal.portal_activities.getMessageList() message_list = portal.portal_activities.getMessageList()
LOG('Before MessageWithErrorOnActivityFails, message_list',0,[x.__dict__ for x in message_list])
self.assertEquals(len(message_list),1) self.assertEquals(len(message_list),1)
portal.portal_activities.distribute() portal.portal_activities.distribute()
portal.portal_activities.tic() portal.portal_activities.tic()
...@@ -368,9 +376,9 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -368,9 +376,9 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
self.assertEquals(self.title1,organisation.getTitle()) self.assertEquals(self.title1,organisation.getTitle())
organisation.activate(activity=activity).setTitle(self.title2) organisation.activate(activity=activity)._setTitle(self.title2)
# Needed so that the message are commited into the queue # Needed so that the message are commited into the queue
get_transaction().commit() get_transaction().commit()
self.assertEquals(self.title1,organisation.getTitle()) self.assertEquals(self.title1,organisation.getTitle())
...@@ -390,7 +398,7 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -390,7 +398,7 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
active_process = portal.portal_activities.newActiveProcess() active_process = portal.portal_activities.newActiveProcess()
self.assertEquals(self.title1,organisation.getTitle()) self.assertEquals(self.title1,organisation.getTitle())
organisation.activate(activity=activity,active_process=active_process).getTitle() organisation.activate(activity=activity,active_process=active_process).getTitle()
...@@ -413,7 +421,7 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -413,7 +421,7 @@ class TestCMFActivity(ERP5TypeTestCase):
""" """
portal = self.getPortal() portal = self.getPortal()
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
organisation.setTitle(self.title1) organisation._setTitle(self.title1)
def Organisation_test(self): def Organisation_test(self):
active_process = self.portal_activities.newActiveProcess() active_process = self.portal_activities.newActiveProcess()
self.activate(active_process=active_process).getTitle() self.activate(active_process=active_process).getTitle()
...@@ -444,13 +452,13 @@ class TestCMFActivity(ERP5TypeTestCase): ...@@ -444,13 +452,13 @@ class TestCMFActivity(ERP5TypeTestCase):
def DeferredSetDescription(self,value): def DeferredSetDescription(self,value):
self.setDescription(value) self.setDescription(value)
def DeferredSetTitle(self,value): def DeferredSetTitle(self,value):
self.setTitle(value) self._setTitle(value)
from Products.ERP5Type.Document.Organisation import Organisation from Products.ERP5Type.Document.Organisation import Organisation
Organisation.DeferredSetTitle = DeferredSetTitle Organisation.DeferredSetTitle = DeferredSetTitle
Organisation.DeferredSetDescription = DeferredSetDescription Organisation.DeferredSetDescription = DeferredSetDescription
organisation = portal.organisation._getOb(self.company_id) organisation = portal.organisation._getOb(self.company_id)
default_title = 'my_test_title' default_title = 'my_test_title'
organisation.setTitle(default_title) organisation._setTitle(default_title)
organisation.setDescription(None) organisation.setDescription(None)
organisation.activate(activity=activity,after_method_id='DeferredSetDescription').DeferredSetTitle(self.title1) organisation.activate(activity=activity,after_method_id='DeferredSetDescription').DeferredSetTitle(self.title1)
organisation.activate(activity=activity).DeferredSetDescription(self.title1) organisation.activate(activity=activity).DeferredSetDescription(self.title1)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7