diff options
Diffstat (limited to 'addons/test_mail')
| -rw-r--r-- | addons/test_mail/__manifest__.py | 5 | ||||
| -rw-r--r-- | addons/test_mail/data/demo.xml | 30 | ||||
| -rw-r--r-- | addons/test_mail/data/subtype_data.xml (renamed from addons/test_mail/data/subtype_demo.xml) | 0 | ||||
| -rw-r--r-- | addons/test_mail/data/template_data.xml (renamed from addons/test_mail/data/template_demo.xml) | 0 | ||||
| -rw-r--r-- | addons/test_mail/tests/test_ir_actions.py | 5 | ||||
| -rw-r--r-- | addons/test_mail/tests/test_performance.py | 48 |
6 files changed, 51 insertions, 37 deletions
diff --git a/addons/test_mail/__manifest__.py b/addons/test_mail/__manifest__.py index 9f716d8786f..18516b56e90 100644 --- a/addons/test_mail/__manifest__.py +++ b/addons/test_mail/__manifest__.py @@ -14,11 +14,10 @@ tests independently to functional aspects of other models. """, 'security/ir.model.access.csv', 'security/test_mail_security.xml', 'data/data.xml', + 'data/subtype_data.xml', + 'data/template_data.xml', ], 'demo': [ - 'data/demo.xml', - 'data/subtype_demo.xml', - 'data/template_demo.xml', ], 'installable': True, 'application': False, diff --git a/addons/test_mail/data/demo.xml b/addons/test_mail/data/demo.xml deleted file mode 100644 index 552d20d439d..00000000000 --- a/addons/test_mail/data/demo.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<odoo> - - <record id="object5" model="test_performance.mail"> - <field name="name">Object 0</field> - <field name="value">0</field> - <field name="partner_id" ref="base.res_partner_3"/> - </record> - <record id="object6" model="test_performance.mail"> - <field name="name">Object 1</field> - <field name="value">10</field> - <field name="partner_id" ref="base.res_partner_3"/> - </record> - <record id="object7" model="test_performance.mail"> - <field name="name">Object 2</field> - <field name="value">20</field> - <field name="partner_id" ref="base.res_partner_4"/> - </record> - <record id="object8" model="test_performance.mail"> - <field name="name">Object 3</field> - <field name="value">30</field> - <field name="partner_id" ref="base.res_partner_10"/> - </record> - <record id="object9" model="test_performance.mail"> - <field name="name">Object 4</field> - <field name="value">40</field> - <field name="partner_id" ref="base.res_partner_12"/> - </record> - -</odoo> diff --git a/addons/test_mail/data/subtype_demo.xml b/addons/test_mail/data/subtype_data.xml index 076f4cbbf9b..076f4cbbf9b 100644 --- a/addons/test_mail/data/subtype_demo.xml +++ b/addons/test_mail/data/subtype_data.xml diff --git a/addons/test_mail/data/template_demo.xml b/addons/test_mail/data/template_data.xml index 35bdbedd7a2..35bdbedd7a2 100644 --- a/addons/test_mail/data/template_demo.xml +++ b/addons/test_mail/data/template_data.xml diff --git a/addons/test_mail/tests/test_ir_actions.py b/addons/test_mail/tests/test_ir_actions.py index 9a20ee94db3..52a65232985 100644 --- a/addons/test_mail/tests/test_ir_actions.py +++ b/addons/test_mail/tests/test_ir_actions.py @@ -19,13 +19,14 @@ class TestServerActionsEmail(BaseFunctionalTest, TestServerActionsBase): def test_action_followers(self): self.test_partner.message_unsubscribe(self.test_partner.message_partner_ids.ids) + random_partner = self.env['res.partner'].create({'name': 'Thierry Wololo'}) self.action.write({ 'state': 'followers', - 'partner_ids': [(4, self.env.ref('base.partner_admin').id), (4, self.env.ref('base.partner_demo').id)], + 'partner_ids': [(4, self.env.ref('base.partner_admin').id), (4, random_partner.id)], 'channel_ids': [(4, self.env.ref('mail.channel_all_employees').id)] }) self.action.with_context(self.context).run() - self.assertEqual(self.test_partner.message_partner_ids, self.env.ref('base.partner_admin') | self.env.ref('base.partner_demo')) + self.assertEqual(self.test_partner.message_partner_ids, self.env.ref('base.partner_admin') | random_partner) self.assertEqual(self.test_partner.message_channel_ids, self.env.ref('mail.channel_all_employees')) def test_action_next_activity(self): diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index 33a3bccb149..c26fe1a81f4 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -2,13 +2,14 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. import base64 +from odoo.addons.base.tests.common import TransactionCaseWithUserDemo from odoo.tests.common import TransactionCase, users, warmup from odoo.tests import tagged from odoo.tools import mute_logger, formataddr @tagged('mail_performance') -class BaseMailPerformance(TransactionCase): +class BaseMailPerformance(TransactionCaseWithUserDemo): def setUp(self): super(BaseMailPerformance, self).setUp() @@ -34,6 +35,49 @@ class BaseMailPerformance(TransactionCase): @tagged('mail_performance') class TestMailPerformance(BaseMailPerformance): + def setUp(self): + super(TestMailPerformance, self).setUp() + + self.res_partner_3 = self.env['res.partner'].create({ + 'name': 'Gemini Furniture', + 'email': 'gemini.furniture39@example.com', + }) + self.res_partner_4 = self.env['res.partner'].create({ + 'name': 'Ready Mat', + 'email': 'ready.mat28@example.com', + }) + self.res_partner_10 = self.env['res.partner'].create({ + 'name': 'The Jackson Group', + 'email': 'jackson.group82@example.com', + }) + self.res_partner_12 = self.env['res.partner'].create({ + 'name': 'Azure Interior', + 'email': 'azure.Interior24@example.com', + }) + self.env['test_performance.mail'].create([ + { + 'name': 'Object 0', + 'value': 0, + 'partner_id': self.res_partner_3.id, + }, { + 'name': 'Object 1', + 'value': 10, + 'partner_id': self.res_partner_3.id, + }, { + 'name': 'Object 2', + 'value': 20, + 'partner_id': self.res_partner_4.id, + }, { + 'name': 'Object 3', + 'value': 30, + 'partner_id': self.res_partner_10.id, + }, { + 'name': 'Object 4', + 'value': 40, + 'partner_id': self.res_partner_12.id, + } + ]) + @users('__system__', 'demo') @warmup def test_read_mail(self): @@ -84,7 +128,7 @@ class TestMailPerformance(BaseMailPerformance): 'name': 'Test', 'track': 'Y', 'value': 40, - 'partner_id': self.env.ref('base.res_partner_12').id, + 'partner_id': self.res_partner_12.id, }) with self.assertQueryCount(__system__=3, demo=3): |