From 92c97ecd904fa407d4fd462cd3b818cdc2f6aa9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 6 Nov 2012 13:15:31 +0100 Subject: [PATCH] [REF] mail: tests: moved test class with mockup in a dedicated file, to clean the directoy structure. bzr revid: tde@openerp.com-20121106121531-0bmki7skb8b1xc8y --- addons/mail/tests/__init__.py | 1 + addons/mail/tests/test_mail.py | 37 ++---------------- addons/mail/tests/test_mail_mockup.py | 54 +++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 addons/mail/tests/test_mail_mockup.py diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py index 2d48fa233c4..3dcddf769e8 100644 --- a/addons/mail/tests/__init__.py +++ b/addons/mail/tests/__init__.py @@ -18,6 +18,7 @@ # along with this program. If not, see . # ############################################################################## + from . import test_mail, test_mail_access_rights checks = [ diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py index 6af0aba633c..5e19a8f0ce4 100644 --- a/addons/mail/tests/test_mail.py +++ b/addons/mail/tests/test_mail.py @@ -21,8 +21,9 @@ import tools +from openerp.addons.mail.tests import test_mail from openerp.tests import common -from openerp.tools.html_sanitize import html_sanitize +from openerp.tools.mail import html_sanitize MAIL_TEMPLATE = """Return-Path: To: {to} @@ -84,39 +85,7 @@ Sylvie """ -class TestMailMockups(common.TransactionCase): - - def _mock_smtp_gateway(self, *args, **kwargs): - return True - - def _init_mock_build_email(self): - self._build_email_args_list = [] - self._build_email_kwargs_list = [] - - def _mock_build_email(self, *args, **kwargs): - """ Mock build_email to be able to test its values. Store them into - some internal variable for latter processing. """ - self._build_email_args_list.append(args) - self._build_email_kwargs_list.append(kwargs) - return self._build_email(*args, **kwargs) - - def setUp(self): - super(TestMailMockups, self).setUp() - # Install mock SMTP gateway - self._init_mock_build_email() - self._build_email = self.registry('ir.mail_server').build_email - self.registry('ir.mail_server').build_email = self._mock_build_email - self._send_email = self.registry('ir.mail_server').send_email - self.registry('ir.mail_server').send_email = self._mock_smtp_gateway - - def tearDown(self): - # Remove mocks - self.registry('ir.mail_server').build_email = self._build_email - self.registry('ir.mail_server').send_email = self._send_email - super(TestMailMockups, self).tearDown() - - -class test_mail(TestMailMockups): +class test_mail(test_mail.TestMailMockups): def _mock_send_get_mail_body(self, *args, **kwargs): # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None) diff --git a/addons/mail/tests/test_mail_mockup.py b/addons/mail/tests/test_mail_mockup.py new file mode 100644 index 00000000000..cba04a0c6b3 --- /dev/null +++ b/addons/mail/tests/test_mail_mockup.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Business Applications +# Copyright (c) 2012-TODAY OpenERP S.A. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.tests import common + + +class TestMailMockups(common.TransactionCase): + + def _mock_smtp_gateway(self, *args, **kwargs): + return True + + def _init_mock_build_email(self): + self._build_email_args_list = [] + self._build_email_kwargs_list = [] + + def _mock_build_email(self, *args, **kwargs): + """ Mock build_email to be able to test its values. Store them into + some internal variable for latter processing. """ + self._build_email_args_list.append(args) + self._build_email_kwargs_list.append(kwargs) + return self._build_email(*args, **kwargs) + + def setUp(self): + super(TestMailMockups, self).setUp() + # Install mock SMTP gateway + self._init_mock_build_email() + self._build_email = self.registry('ir.mail_server').build_email + self.registry('ir.mail_server').build_email = self._mock_build_email + self._send_email = self.registry('ir.mail_server').send_email + self.registry('ir.mail_server').send_email = self._mock_smtp_gateway + + def tearDown(self): + # Remove mocks + self.registry('ir.mail_server').build_email = self._build_email + self.registry('ir.mail_server').send_email = self._send_email + super(TestMailMockups, self).tearDown()