Skip to content

Commit

Permalink
[FIX] fix test by using use odoo-test-helper lib \o/
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastienbeau committed Apr 24, 2020
1 parent 3f4407e commit f387422
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 136 deletions.
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ force_grid_wrap=0
combine_as_imports=True
use_parentheses=True
line_length=79
known_third_party = StringIO,cerberus,mock,odoo,openupgradelib,psycopg2,requests,setuptools,urllib2,urlparse,vcr,vcr_unittest,werkzeug
known_third_party = StringIO,cerberus,mock,odoo,odoo_test_helper,openupgradelib,psycopg2,requests,setuptools,urllib2,urlparse,vcr,vcr_unittest,werkzeug
12 changes: 3 additions & 9 deletions base_url/tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,23 @@

from odoo import api, fields, models

from .models_mixin import TestMixin

_logger = logging.getLogger(__name__)


class UrlBackendFake(models.Model, TestMixin):

class UrlBackendFake(models.Model):
_name = "url.backend.fake"
_description = "Url Backend"

name = fields.Char(required=True)


class ResPartner(models.Model, TestMixin):
_name = "res.partner"
class ResPartner(models.Model):
_inherit = "res.partner"
_test_teardown_no_delete = True
_test_purge_fields = ["binding_ids"]

binding_ids = fields.One2many("res.partner.addressable.fake", "record_id")


class ResPartnerAddressableFake(models.Model, TestMixin):
class ResPartnerAddressableFake(models.Model):
_name = "res.partner.addressable.fake"
_inherit = "abstract.url"
_inherits = {"res.partner": "record_id"}
Expand Down
117 changes: 0 additions & 117 deletions base_url/tests/models_mixin.py

This file was deleted.

24 changes: 15 additions & 9 deletions base_url/tests/test_abstract_url.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,25 @@
import mock
from odoo.exceptions import ValidationError
from odoo.tests import SavepointCase
from odoo_test_helper import FakeModelLoader

from .models import ResPartner, ResPartnerAddressableFake, UrlBackendFake


class TestAbstractUrl(SavepointCase):
class TestAbstractUrl(SavepointCase, FakeModelLoader):
@classmethod
def setUpClass(cls):
super(TestAbstractUrl, cls).setUpClass()
UrlBackendFake._test_setup_model(cls.env)
ResPartnerAddressableFake._test_setup_model(cls.env)
ResPartner._test_setup_model(cls.env)
cls.loader = FakeModelLoader(cls.env, cls.__module__)
cls.loader.backup_registry()
from .models import (
UrlBackendFake,
ResPartner,
ResPartnerAddressableFake,
)

cls.loader.update_registry(
(UrlBackendFake, ResPartner, ResPartnerAddressableFake)
)

cls.lang = cls.env.ref("base.lang_en")
cls.UrlUrl = cls.env["url.url"]
cls.ResPartnerAddressable = cls.env["res.partner.addressable.fake"]
Expand All @@ -26,9 +34,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
ResPartnerAddressableFake._test_teardown_model(cls.env)
UrlBackendFake._test_teardown_model(cls.env)
ResPartner._test_teardown_model(cls.env)
cls.loader.restore_registry()
super(TestAbstractUrl, cls).tearDownClass()

def _get_default_partner_value(self):
Expand Down
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ requests_mock
vcrpy
vcrpy-unittest
unittest2 # For shopinvader test_controller, which inherits component
odoo-test-helper

0 comments on commit f387422

Please sign in to comment.