From d072e6a860bd624a77cd66ae03c37074704b0640 Mon Sep 17 00:00:00 2001 From: Zelong Lin Date: Wed, 27 Jul 2022 13:26:34 +0000 Subject: [PATCH] [REF] discuss: rewrite setup classes on mail tests rewrite setup classes on test files. Making it clear for adding asserts in the future. task-2893661 Part-of: odoo/odoo#94510 --- addons/mail/tests/test_mail_channel.py | 29 +++++---------------- addons/test_mail/tests/test_mail_message.py | 16 +++--------- 2 files changed, 11 insertions(+), 34 deletions(-) diff --git a/addons/mail/tests/test_mail_channel.py b/addons/mail/tests/test_mail_channel.py index 9ab7a417b06..c8aad7ed7e9 100644 --- a/addons/mail/tests/test_mail_channel.py +++ b/addons/mail/tests/test_mail_channel.py @@ -22,25 +22,17 @@ class TestChannelAccessRights(MailCommon): @classmethod def setUpClass(cls): super(TestChannelAccessRights, cls).setUpClass() - Channel = cls.env['mail.channel'].with_context(cls._test_context) + cls.user_employee_1 = mail_new_test_user(cls.env, login='user_employee_1', groups='base.group_user', name='Tao Lee') cls.user_public = mail_new_test_user(cls.env, login='user_public', groups='base.group_public', name='Bert Tartignole') cls.user_portal = mail_new_test_user(cls.env, login='user_portal', groups='base.group_portal', name='Chell Gladys') # Channel for certain group - cls.group_restricted_channel = Channel.create({ - 'name': 'Channel for Group', - 'public': 'groups', - 'group_public_id': cls.env.ref('base.group_user').id}) + cls.group_restricted_channel = cls.env['mail.channel'].browse(cls.env['mail.channel'].channel_create(name='Channel for Groups', privacy='groups', group_id=cls.env.ref('base.group_user').id)['id']) # Public Channel - cls.public_channel = Channel.create({ - 'name': 'Public Channel', - 'description': 'NotFalse', - 'public': 'public'}) + cls.public_channel = cls.env['mail.channel'].browse(cls.env['mail.channel'].channel_create(name='Public Channel', privacy='public')['id']) # Group - cls.private_group = Channel.create({ - 'name': 'Group', - 'public': 'private'}) + cls.private_group = cls.env['mail.channel'].browse(cls.env['mail.channel'].create_group(partners_to=cls.user_employee.partner_id.ids, name="Group")['id']) @mute_logger('odoo.addons.base.models.ir_rule', 'odoo.addons.base.models.ir_model', 'odoo.models') @users('user_portal') @@ -155,9 +147,8 @@ class TestChannelInternals(MailCommon): def setUpClass(cls): super(TestChannelInternals, cls).setUpClass() cls.test_channel = cls.env['mail.channel'].with_context(cls._test_context).create({ - 'name': 'Channel', 'channel_type': 'channel', - 'description': 'Description', + 'name': 'Channel', 'public': 'public', }) cls.test_partner = cls.env['res.partner'].with_context(cls._test_context).create({ @@ -272,10 +263,7 @@ class TestChannelInternals(MailCommon): 'description': 'Channel to travel through time', 'public': 'private', }) - group_restricted_channel = self.env['mail.channel'].with_context(self._test_context).create({ - 'name': 'Sic Mundus', - 'public': 'groups', - 'group_public_id': self.env.ref('base.group_user').id}) + group_restricted_channel = self.env['mail.channel'].browse(self.env['mail.channel'].channel_create(name='Sic Mundus', privacy='groups', group_id=self.env.ref('base.group_user').id)['id']) self.test_channel.add_members((self.partner_employee | self.partner_employee_nomail).ids) test_channel_private.add_members((self.partner_employee | self.partner_employee_nomail).ids) @@ -409,10 +397,7 @@ class TestChannelInternals(MailCommon): @users('employee') def test_channel_private_unfollow(self): """ Test that a partner can leave (unfollow) a private channel. """ - group_restricted_channel = self.env['mail.channel'].create({ - 'name': 'Winden caves', - 'public': 'private', - }) + group_restricted_channel = self.env['mail.channel'].browse(self.env['mail.channel'].channel_create(name='Channel for Groups', privacy='groups', group_id=self.env.ref('base.group_user').id)['id']) group_restricted_channel.action_unfollow() self.assertEqual(group_restricted_channel.channel_partner_ids, self.env['res.partner']) diff --git a/addons/test_mail/tests/test_mail_message.py b/addons/test_mail/tests/test_mail_message.py index 57cad1260a7..24c2d8cf6ad 100644 --- a/addons/test_mail/tests/test_mail_message.py +++ b/addons/test_mail/tests/test_mail_message.py @@ -258,21 +258,13 @@ class TestMessageAccess(TestMailCommon): def setUpClass(cls): super(TestMessageAccess, cls).setUpClass() + cls.user_employee_1 = mail_new_test_user(cls.env, login='tao', groups='base.group_user', name='Tao Lee') cls.user_public = mail_new_test_user(cls.env, login='bert', groups='base.group_public', name='Bert Tartignole') cls.user_portal = mail_new_test_user(cls.env, login='chell', groups='base.group_portal', name='Chell Gladys') - Channel = cls.env['mail.channel'].with_context(cls._test_context) - cls.group_restricted_channel = Channel.create({ - 'name': 'Channel for Groups', - 'public': 'groups', - 'group_public_id': cls.env.ref('base.group_user').id}) - cls.public_channel = Channel.create({ - 'name': 'Public Channel', - 'description': 'NotFalse', - 'public': 'public'}) - cls.private_group = Channel.create({ - 'name': 'Group', - 'public': 'private'}) + cls.group_restricted_channel = cls.env['mail.channel'].browse(cls.env['mail.channel'].channel_create(name='Channel for Groups', privacy='groups', group_id=cls.env.ref('base.group_user').id)['id']) + cls.public_channel = cls.env['mail.channel'].browse(cls.env['mail.channel'].channel_create(name='Public Channel', privacy='public')['id']) + cls.private_group = cls.env['mail.channel'].browse(cls.env['mail.channel'].create_group(partners_to=cls.user_employee_1.partner_id.ids, name="Group")['id']) cls.message = cls.env['mail.message'].create({ 'body': 'My Body', 'model': 'mail.channel',