fixup! [UPD] web_m2x_options_manager: overhaul

SilvioC2C · SilvioC2C · commit b774f8e237a0 · 2025-11-10T12:36:32.000+01:00
Lesser test refactoring
diff --git a/web_m2x_options_manager/models/m2x_create_edit_option.py b/web_m2x_options_manager/models/m2x_create_edit_option.py
@@ -1,7 +1,6 @@
 # Copyright 2021 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools.cache import ormcache
diff --git a/web_m2x_options_manager/tests/__init__.py b/web_m2x_options_manager/tests/__init__.py
@@ -1 +1,3 @@
+from . import test_ir_model
+from . import test_ir_model_fields
 from . import test_m2x_create_edit_option
diff --git a/web_m2x_options_manager/tests/common.py b/web_m2x_options_manager/tests/common.py
@@ -0,0 +1,42 @@
+# Copyright 2025 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from lxml import etree
+
+from odoo.tests.common import SavepointCase
+from odoo.tools.safe_eval import safe_eval
+
+
+class Common(SavepointCase):
+    @classmethod
+    def _create_opt(cls, model_name, field_name, vals=None):
+        field = cls._get_field(model_name, field_name)
+        vals = dict(vals or [])
+        return cls.env["m2x.create.edit.option"].create(dict(field_id=field.id, **vals))
+
+    @classmethod
+    def _get_field(cls, model_name, field_name):
+        return cls.env["ir.model.fields"]._get(model_name, field_name)
+
+    @classmethod
+    def _get_model(cls, model_name):
+        return cls.env["ir.model"]._get(model_name)
+
+    @staticmethod
+    def _eval_node_options(node):
+        opt = node.attrib.get("options")
+        if opt:
+            return safe_eval(opt, nocopy=True)
+        return {}
+
+    @classmethod
+    def _get_test_view(cls):
+        return cls.env.ref("web_m2x_options_manager.res_partner_demo_form_view")
+
+    @classmethod
+    def _get_test_view_fields_view_get(cls):
+        return cls.env["res.partner"].fields_view_get(cls._get_test_view().id)
+
+    @classmethod
+    def _get_test_view_parsed(cls):
+        return etree.XML(cls._get_test_view_fields_view_get()["arch"])
diff --git a/web_m2x_options_manager/tests/test_ir_model.py b/web_m2x_options_manager/tests/test_ir_model.py
@@ -0,0 +1,37 @@
+# Copyright 2025 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tools import mute_logger
+
+from .common import Common
+
+
+class TestIrModel(Common):
+    @mute_logger("odoo.models.unlink")
+    def test_model_buttons(self):
+        model = self._get_model("res.users")
+        (model.m2x_option_ids + model.m2x_comodels_option_ids).unlink()
+
+        # Model's fields workflow
+        # 1- fill: check options have been created
+        model.button_fill_m2x_options()
+        options = model.m2x_option_ids
+        self.assertTrue(options)
+        # 2- refill: check no option has been created (they all existed already)
+        model.button_fill_m2x_options()
+        self.assertFalse(model.m2x_option_ids - options)
+        # 3- empty: check no option exists anymore
+        model.button_empty_m2x_options()
+        self.assertFalse(model.m2x_option_ids)
+
+        # Model's inverse fields workflow
+        # 1- fill: check options have been created
+        model.button_fill_m2x_comodels_options()
+        comodels_options = model.m2x_comodels_option_ids
+        self.assertTrue(comodels_options)
+        # 2- refill: check no option has been created (they all existed already)
+        model.button_fill_m2x_comodels_options()
+        self.assertFalse(model.m2x_comodels_option_ids - comodels_options)
+        # 3- empty: check no option exists anymore
+        model.button_empty_m2x_comodels_options()
+        self.assertFalse(model.m2x_comodels_option_ids)
diff --git a/web_m2x_options_manager/tests/test_ir_model_fields.py b/web_m2x_options_manager/tests/test_ir_model_fields.py
@@ -0,0 +1,99 @@
+# Copyright 2025 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo_test_helper import FakeModelLoader
+
+from odoo import fields, models
+
+from .common import Common
+
+
+class TestIrModelFields(Common):
+    def test_field_can_have_options(self):
+        # M2O field
+        self.assertTrue(self._get_field("res.partner", "parent_id").can_have_options)
+        # M2M field
+        self.assertTrue(self._get_field("res.partner", "category_id").can_have_options)
+        # O2M field
+        self.assertFalse(self._get_field("res.partner", "user_ids").can_have_options)
+        # non-relational field
+        self.assertFalse(self._get_field("res.partner", "id").can_have_options)
+
+    def test_field_comodel_id(self):
+        # M2O field
+        self.assertEqual(
+            self._get_field("res.partner", "parent_id").comodel_id,
+            self._get_model("res.partner"),
+        )
+        # M2M field
+        self.assertEqual(
+            self._get_field("res.partner", "category_id").comodel_id,
+            self._get_model("res.partner.category"),
+        )
+        # O2M field
+        self.assertEqual(
+            self._get_field("res.partner", "user_ids").comodel_id,
+            self._get_model("res.users"),
+        )
+        # Non-relational field
+        self.assertFalse(self._get_field("res.partner", "id").comodel_id)
+
+    def test_field_search(self):
+        loader = FakeModelLoader(self.env, self.__module__)
+        loader.backup_registry()
+
+        class ResUsers(models.Model):
+            _inherit = "res.users"
+
+            test_field = fields.Many2one("res.groups", string="Abc")
+
+        class ResGroups(models.Model):
+            _inherit = "res.groups"
+
+            test_field_abc = fields.Many2one("res.users", string="Abc")
+
+        loader.update_registry((ResUsers, ResGroups))
+
+        test_field = self._get_field("res.users", "test_field")
+        test_field_abc = self._get_field("res.groups", "test_field_abc")
+
+        ir_model_fields = self.env["ir.model.fields"]
+        name = "ABC"
+        domain = [("model", "in", ("res.users", "res.groups"))]
+
+        # String "abc" is contained in both fields' description: basic ``name_search()``
+        # will return them both sorted by ID
+        ir_model_fields = ir_model_fields.with_context(search_by_technical_name=False)
+        self.assertEqual(
+            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
+            [test_field.id, test_field_abc.id],
+        )
+
+        # Use context key ``search_by_technical_name``: ``test_field_abc`` should now be
+        # returned first
+        ir_model_fields = ir_model_fields.with_context(search_by_technical_name=True)
+        self.assertEqual(
+            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
+            [test_field_abc.id, test_field.id],
+        )
+
+        ir_model_fields.with_context(search_by_technical_name=False)
+
+        # Search again by mimicking the ``ir.model`` Form view for m2x options
+        users_model = self._get_model("res.users")
+        ir_model_fields = ir_model_fields.with_context(
+            o2m_list_view_m2x_domain=[("model_id", "=", users_model.id)]
+        )
+        self.assertEqual(
+            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
+            [test_field.id],
+        )
+        ir_model_fields = ir_model_fields.with_context(
+            o2m_list_view_m2x_domain=[("comodel_id", "=", users_model.id)]
+        )
+        self.assertEqual(
+            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
+            [test_field_abc.id],
+        )
+
+        loader.restore_registry()
diff --git a/web_m2x_options_manager/tests/test_m2x_create_edit_option.py b/web_m2x_options_manager/tests/test_m2x_create_edit_option.py
@@ -1,49 +1,13 @@
 # Copyright 2021 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from lxml import etree
-from odoo_test_helper import FakeModelLoader
 
-from odoo import fields, models
 from odoo.exceptions import ValidationError
-from odoo.tests.common import SavepointCase
-from odoo.tools.safe_eval import safe_eval
 
+from .common import Common
 
-class TestM2xCreateEditOption(SavepointCase):
-    @classmethod
-    def _create_opt(cls, model_name, field_name, vals=None):
-        field = cls._get_field(model_name, field_name)
-        vals = dict(vals or [])
-        return cls.env["m2x.create.edit.option"].create(dict(field_id=field.id, **vals))
-
-    @classmethod
-    def _get_field(cls, model_name, field_name):
-        return cls.env["ir.model.fields"]._get(model_name, field_name)
-
-    @classmethod
-    def _get_model(cls, model_name):
-        return cls.env["ir.model"]._get(model_name)
-
-    @staticmethod
-    def _eval_node_options(node):
-        opt = node.attrib.get("options")
-        if opt:
-            return safe_eval(opt, nocopy=True)
-        return {}
-
-    @classmethod
-    def _get_test_view(cls):
-        return cls.env.ref("web_m2x_options_manager.res_partner_demo_form_view")
-
-    @classmethod
-    def _get_test_view_fields_view_get(cls):
-        return cls.env["res.partner"].fields_view_get(cls._get_test_view().id)
-
-    @classmethod
-    def _get_test_view_parsed(cls):
-        return etree.XML(cls._get_test_view_fields_view_get()["arch"])
 
+class TestM2xCreateEditOption(Common):
     def test_errors(self):
         with self.assertRaises(ValidationError):
             # Fails ``_check_field_type``: users_field is a One2many
@@ -121,116 +85,6 @@ def test_apply_options(self):
             {"create": True, "create_edit": True, "m2o_dialog": True},
         )
 
-    def test_model_buttons(self):
-        res_partner_model = self._get_model("res.partner")
-
-        # Model's fields workflow
-        res_partner_model.button_empty_m2x_options()
-        self.assertFalse(res_partner_model.m2x_option_ids)
-        res_partner_model.button_fill_m2x_options()
-        options = res_partner_model.m2x_option_ids
-        self.assertTrue(options)
-        res_partner_model.button_fill_m2x_options()
-        self.assertFalse(res_partner_model.m2x_option_ids - options)
-
-        # Model's FK fields workflow
-        res_partner_model.button_empty_m2x_comodels_options()
-        self.assertFalse(res_partner_model.m2x_comodels_option_ids)
-        res_partner_model.button_fill_m2x_comodels_options()
-        comodels_options = res_partner_model.m2x_comodels_option_ids
-        self.assertTrue(comodels_options)
-        res_partner_model.button_fill_m2x_comodels_options()
-        self.assertFalse(res_partner_model.m2x_comodels_option_ids - comodels_options)
-
-    def test_field_can_have_options(self):
-        # M2O field
-        self.assertTrue(self._get_field("res.partner", "parent_id").can_have_options)
-        # M2M field
-        self.assertTrue(self._get_field("res.partner", "category_id").can_have_options)
-        # O2M field
-        self.assertFalse(self._get_field("res.partner", "user_ids").can_have_options)
-        # non-relational field
-        self.assertFalse(self._get_field("res.partner", "id").can_have_options)
-
-    def test_field_comodel_id(self):
-        # M2O field
-        self.assertEqual(
-            self._get_field("res.partner", "parent_id").comodel_id,
-            self._get_model("res.partner"),
-        )
-        # M2M field
-        self.assertEqual(
-            self._get_field("res.partner", "category_id").comodel_id,
-            self._get_model("res.partner.category"),
-        )
-        # O2M field
-        self.assertEqual(
-            self._get_field("res.partner", "user_ids").comodel_id,
-            self._get_model("res.users"),
-        )
-        # Non-relational field
-        self.assertFalse(self._get_field("res.partner", "id").comodel_id)
-
-    def test_field_search(self):
-        loader = FakeModelLoader(self.env, self.__module__)
-        loader.backup_registry()
-
-        class ResUsers(models.Model):
-            _inherit = "res.users"
-
-            test_field = fields.Many2one("res.groups", string="Abc")
-
-        class ResGroups(models.Model):
-            _inherit = "res.groups"
-
-            test_field_abc = fields.Many2one("res.users", string="Abc")
-
-        loader.update_registry((ResUsers, ResGroups))
-
-        test_field = self._get_field("res.users", "test_field")
-        test_field_abc = self._get_field("res.groups", "test_field_abc")
-
-        ir_model_fields = self.env["ir.model.fields"]
-        name = "ABC"
-        domain = [("model", "in", ("res.users", "res.groups"))]
-
-        # String "abc" is contained in both fields' description: basic ``name_search()``
-        # will return them both sorted by ID
-        ir_model_fields = ir_model_fields.with_context(search_by_technical_name=False)
-        self.assertEqual(
-            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
-            [test_field.id, test_field_abc.id],
-        )
-
-        # Use context key ``search_by_technical_name``: ``test_field_abc`` should now be
-        # returned first
-        ir_model_fields = ir_model_fields.with_context(search_by_technical_name=True)
-        self.assertEqual(
-            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
-            [test_field_abc.id, test_field.id],
-        )
-
-        ir_model_fields.with_context(search_by_technical_name=False)
-
-        # Search again by mimicking the ``ir.model`` Form view for m2x options
-        users_model = self._get_model("res.users")
-        ir_model_fields = ir_model_fields.with_context(
-            o2m_list_view_m2x_domain=[("model_id", "=", users_model.id)]
-        )
-        self.assertEqual(
-            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
-            [test_field.id],
-        )
-        ir_model_fields = ir_model_fields.with_context(
-            o2m_list_view_m2x_domain=[("comodel_id", "=", users_model.id)]
-        )
-        self.assertEqual(
-            [r[0] for r in ir_model_fields.name_search(name, domain, limit=None)],
-            [test_field_abc.id],
-        )
-
-        loader.restore_registry()
-
     def test_m2x_option_name(self):
         # Mostly to make Codecov happy...
         opt = self._create_opt(

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+from . import test_ir_model`
	`2`	`+from . import test_ir_model_fields`
`1`	`3`	`from . import test_m2x_create_edit_option`