Commit a74a2ace authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

test: use acl_users.getUserById() instead of getUser().

parent dc989d26
...@@ -111,7 +111,7 @@ class TestBug(ERP5TypeTestCase): ...@@ -111,7 +111,7 @@ class TestBug(ERP5TypeTestCase):
portal = self.getPortal() portal = self.getPortal()
uf = portal.acl_users uf = portal.acl_users
uf._doAddUser('mame', '', ['Assignor','Assignee'], []) uf._doAddUser('mame', '', ['Assignor','Assignee'], [])
if not uf.getUser('dummy'): if not uf.getUserById('dummy'):
uf._doAddUser('manager', '', ['Manager'], []) uf._doAddUser('manager', '', ['Manager'], [])
self.login('manager') self.login('manager')
person_module = portal.getDefaultModule(self.person_portal_type) person_module = portal.getDefaultModule(self.person_portal_type)
......
...@@ -99,8 +99,8 @@ class TestQueryModule(ERP5TypeTestCase): ...@@ -99,8 +99,8 @@ class TestQueryModule(ERP5TypeTestCase):
assignment.validate() assignment.validate()
self.tic() self.tic()
uf = self.portal.acl_users uf = self.portal.acl_users
owner_user = uf.getUser('owner_user').__of__(uf) owner_user = uf.getUserById('owner_user').__of__(uf)
question_user = uf.getUser('question_user').__of__(uf) question_user = uf.getUserById('question_user').__of__(uf)
# add Author local roles on person and query modules # add Author local roles on person and query modules
self.portal.person_module.manage_setLocalRoles('owner_user', ['Author']) self.portal.person_module.manage_setLocalRoles('owner_user', ['Author'])
......
...@@ -127,7 +127,7 @@ class TestTaskMixin: ...@@ -127,7 +127,7 @@ class TestTaskMixin:
# def stepLogin(self, **kw): # def stepLogin(self, **kw):
# portal = self.getPortal() # portal = self.getPortal()
# uf = portal.acl_users # uf = portal.acl_users
# if not uf.getUser('dummy'): # if not uf.getUserById('dummy'):
# uf._doAddUser('manager', '', ['Manager'], []) # uf._doAddUser('manager', '', ['Manager'], [])
# self.login('manager') # self.login('manager')
# person_module = portal.getDefaultModule(self.person_portal_type) # person_module = portal.getDefaultModule(self.person_portal_type)
...@@ -718,7 +718,7 @@ class TestTask(TestTaskMixin, ERP5TypeTestCase): ...@@ -718,7 +718,7 @@ class TestTask(TestTaskMixin, ERP5TypeTestCase):
simulation_tool = self.getPortal().portal_simulation simulation_tool = self.getPortal().portal_simulation
uf = self.getPortal().acl_users uf = self.getPortal().acl_users
if not uf.getUser('manager'): if not uf.getUserById('manager'):
uf._doAddUser('manager', '', ['Manager'], []) uf._doAddUser('manager', '', ['Manager'], [])
self.login('manager') self.login('manager')
try: try:
......
...@@ -99,7 +99,7 @@ class TestTaskReportDivergenceMixin(TestTaskMixin, SecurityTestCase): ...@@ -99,7 +99,7 @@ class TestTaskReportDivergenceMixin(TestTaskMixin, SecurityTestCase):
simulation_tool = portal.portal_simulation simulation_tool = portal.portal_simulation
rule_tool = portal.portal_rules rule_tool = portal.portal_rules
uf = self.getPortal().acl_users uf = self.getPortal().acl_users
if not uf.getUser('manager'): if not uf.getUserById('manager'):
uf._doAddUser('manager', '', ['Manager'], []) uf._doAddUser('manager', '', ['Manager'], [])
self.login('manager') self.login('manager')
simulation_tool.Base_setDefaultSecurity() simulation_tool.Base_setDefaultSecurity()
......
...@@ -73,7 +73,7 @@ class TestZODBHistory(ERP5TypeTestCase): ...@@ -73,7 +73,7 @@ class TestZODBHistory(ERP5TypeTestCase):
def addUser(self, user_name, role=['Member', 'Owner', 'Assignor']): def addUser(self, user_name, role=['Member', 'Owner', 'Assignor']):
""" Create a test user.""" """ Create a test user."""
uf = self.portal.acl_users uf = self.portal.acl_users
if not uf.getUser(user_name): if not uf.getUserById(user_name):
uf._doAddUser(user_name, '', role, []) uf._doAddUser(user_name, '', role, [])
def _clearCache(self): def _clearCache(self):
......
...@@ -2090,7 +2090,7 @@ return 1 ...@@ -2090,7 +2090,7 @@ return 1
""" """
# Create a root level zope user # Create a root level zope user
root_user_folder = self.getPortalObject().aq_parent.acl_users root_user_folder = self.getPortalObject().aq_parent.acl_users
if not root_user_folder.getUser('zope_user'): if not root_user_folder.getUserById('zope_user'):
root_user_folder._doAddUser('zope_user', '', ['Manager',], []) root_user_folder._doAddUser('zope_user', '', ['Manager',], [])
self.commit() self.commit()
# Create document with good content # Create document with good content
......
...@@ -260,7 +260,7 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase): ...@@ -260,7 +260,7 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
'''Creates the default user.''' '''Creates the default user.'''
uf = self.portal.acl_users uf = self.portal.acl_users
# do nothing if the user already exists # do nothing if the user already exists
if not uf.getUser(user_name): if not uf.getUserById(user_name):
uf._doAddUser(user_name, 'secret', ['Member'], []) uf._doAddUser(user_name, 'secret', ['Member'], [])
def _setUpDummyMailHost(self): def _setUpDummyMailHost(self):
......
...@@ -1366,7 +1366,7 @@ class _TestZodbComponent(SecurityTestCase): ...@@ -1366,7 +1366,7 @@ class _TestZodbComponent(SecurityTestCase):
otherwise it should not be importable at all otherwise it should not be importable at all
""" """
uf = self.portal.acl_users uf = self.portal.acl_users
if not uf.getUser('ERP5TypeTestCase_NonDeveloper'): if not uf.getUserById('ERP5TypeTestCase_NonDeveloper'):
uf._doAddUser('ERP5TypeTestCase_NonDeveloper', uf._doAddUser('ERP5TypeTestCase_NonDeveloper',
'', ['Manager', 'Member', 'Assignee', '', ['Manager', 'Member', 'Assignee',
'Assignor', 'Author', 'Auditor', 'Associate'], []) 'Assignor', 'Author', 'Auditor', 'Associate'], [])
......
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