Skip to content

Commit c65f16e

Browse files
committed
[IMP] base/saas~18.1: remove res.partner.title model and field
The enterprise and community PR does a lot of changes on the partner form. One of the change was to remove the title field and so the model. This commit will adapt the tests accordingly closes #177 See: odoo/odoo#187357 See: odoo/enterprise#73879 See: odoo/upgrade#6779 Task: 4306429 Related: odoo/upgrade#6779 Signed-off-by: Alvaro Fuentes Suarez (afu) <[email protected]>
1 parent 93e50b2 commit c65f16e

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

src/base/tests/test_util.py

+36-36
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@ def test_any_operator(self):
305305
self.assertEqual(new_domain, expected)
306306

307307
# test it also works recursively
308-
domain = [("partner_id", "any", [("title", "not any", [("shortcut", "like", "S.A.")])])]
309-
expected = [("partner_id", "any", [("title", "not any", [("abbr", "like", "S.A.")])])]
308+
domain = [("partner_id", "any", [("bank_ids", "not any", [("acc_number", "like", "S.A.")])])]
309+
expected = [("partner_id", "any", [("bank_ids", "not any", [("acc_nbr", "like", "S.A.")])])]
310310

311-
new_domain = _adapt_one_domain(self.cr, "res.partner.title", "shortcut", "abbr", "res.company", domain)
311+
new_domain = _adapt_one_domain(self.cr, "res.partner.bank", "acc_number", "acc_nbr", "res.company", domain)
312312
self.assertEqual(new_domain, expected)
313313

314314

@@ -570,17 +570,17 @@ def test_iter_browse_call(self):
570570
self.assertEqual(write.call_count, expected)
571571

572572
def test_iter_browse_create_non_empty(self):
573-
RPT = self.env["res.partner.title"]
573+
RP = self.env["res.partner"]
574574
with self.assertRaises(ValueError):
575-
util.iter_browse(RPT, [42]).create([{}])
575+
util.iter_browse(RP, [42]).create([{}])
576576

577577
@parametrize([(True,), (False,)])
578578
def test_iter_browse_create(self, multi):
579579
chunk_size = 2
580-
RPT = self.env["res.partner.title"]
580+
RP = self.env["res.partner"]
581581

582-
names = [f"Title {i}" for i in range(7)]
583-
ib = util.iter_browse(RPT, [], chunk_size=chunk_size)
582+
names = [f"Name {i}" for i in range(7)]
583+
ib = util.iter_browse(RP, [], chunk_size=chunk_size)
584584
records = ib.create([{"name": name} for name in names], multi=multi)
585585
self.assertEqual([t.name for t in records], names)
586586

@@ -616,20 +616,20 @@ def test_alter_column_type(self):
616616
cr = self.env.cr
617617
cr.execute(
618618
"""
619-
ALTER TABLE res_partner_title ADD COLUMN x bool;
619+
ALTER TABLE res_partner_bank ADD COLUMN x bool;
620620
621-
UPDATE res_partner_title
621+
UPDATE res_partner_bank
622622
SET x = CASE id % 3
623623
WHEN 1 THEN NULL
624624
WHEN 2 THEN True
625625
ELSE False
626626
END
627627
"""
628628
)
629-
self.assertEqual(util.column_type(cr, "res_partner_title", "x"), "bool")
630-
util.alter_column_type(cr, "res_partner_title", "x", "int", using="CASE {0} WHEN True THEN 2 ELSE 1 END")
631-
self.assertEqual(util.column_type(cr, "res_partner_title", "x"), "int4")
632-
cr.execute("SELECT id, x FROM res_partner_title")
629+
self.assertEqual(util.column_type(cr, "res_partner_bank", "x"), "bool")
630+
util.alter_column_type(cr, "res_partner_bank", "x", "int", using="CASE {0} WHEN True THEN 2 ELSE 1 END")
631+
self.assertEqual(util.column_type(cr, "res_partner_bank", "x"), "int4")
632+
cr.execute("SELECT id, x FROM res_partner_bank")
633633
data = cr.fetchall()
634634
self.assertTrue(
635635
all(x == 1 or (x == 2 and id_ % 3 == 2) for id_, x in data),
@@ -700,22 +700,22 @@ def test_explode_mult_filters(self):
700700
def test_explode_query_range(self):
701701
cr = self.env.cr
702702

703-
cr.execute("SELECT count(id) FROM res_partner_title")
703+
cr.execute("SELECT count(id) FROM res_partner_category")
704704
count = cr.fetchone()[0]
705705
# ensure there start with at least 10 records
706706
for _ in range(10 - count):
707707
count += 1
708-
self.env["res.partner.title"].create({"name": "x"})
708+
self.env["res.partner.category"].create({"name": "x"})
709709

710710
# set one record with very high id
711-
tid = self.env["res.partner.title"].create({"name": "x"}).id
711+
tid = self.env["res.partner.category"].create({"name": "x"}).id
712712
count += 1
713-
cr.execute("UPDATE res_partner_title SET id = 10000000 WHERE id = %s", [tid])
713+
cr.execute("UPDATE res_partner_category SET id = 10000000 WHERE id = %s", [tid])
714714

715-
qs = util.explode_query_range(cr, "SELECT 1", table="res_partner_title", bucket_size=count)
715+
qs = util.explode_query_range(cr, "SELECT 1", table="res_partner_category", bucket_size=count)
716716
self.assertEqual(len(qs), 1) # one bucket should be enough for all records
717717

718-
qs = util.explode_query_range(cr, "SELECT 1", table="res_partner_title", bucket_size=count - 1)
718+
qs = util.explode_query_range(cr, "SELECT 1", table="res_partner_category", bucket_size=count - 1)
719719
self.assertEqual(len(qs), 1) # 10% rule for second bucket, 1 <= 0.1(count - 1) since count >= 11
720720

721721
def test_parallel_rowcount(self):
@@ -1060,8 +1060,8 @@ def test_rename_xmlid(self):
10601060

10611061
def test_update_record_from_xml(self):
10621062
# reset all fields on a <record>
1063-
xmlid = "base.res_partner_title_mister"
1064-
data_after = {"name": "Fortytwo", "shortcut": "42"}
1063+
xmlid = "base.res_partner_industry_A"
1064+
data_after = {"name": "42", "full_name": "Fortytwo"}
10651065
record = self.env.ref(xmlid)
10661066
data_before = {key: record[key] for key in data_after}
10671067
for key, value in data_after.items():
@@ -1158,14 +1158,14 @@ def test_update_record_translations_from_xml(self):
11581158
be_lang = self.env["res.lang"].with_context(active_test=False).search([("code", "=", "fr_BE")])
11591159
be_lang.write({"active": True})
11601160

1161-
xmlid = "base.res_partner_title_mister"
1161+
xmlid = "base.res_partner_industry_A"
11621162
util.update_record_from_xml(self.env.cr, xmlid, reset_translations=True)
11631163

11641164
# change the translations to something arbitrary for all installed languages
11651165
langs = self.env["res.lang"].get_installed()
11661166
filter_lang = [code for code, _ in langs]
11671167
self.assertIn(be_lang.code, filter_lang)
1168-
data_after = {"name": "Fortytwo", "shortcut": "42"}
1168+
data_after = {"name": "42", "full_name": "Fortytwo"}
11691169
fieldnames = list(data_after.keys())
11701170
template_record = self.env.ref(xmlid)
11711171

@@ -1268,31 +1268,31 @@ def test_ensure_xmlid_match_record(self):
12681268

12691269
@unittest.skipUnless(util.version_gte("16.0"), "Only work on Odoo >= 16")
12701270
def test_replace_in_all_jsonb_values(self):
1271-
test_partner_title = self.env["res.partner.title"].create(
1271+
test_partner_category = self.env["res.partner.category"].create(
12721272
{"name": r"""object.number '<"x">\y object.numbercombined"""}
12731273
)
12741274

12751275
pattern_old = re.compile(r"\b\.number\b")
12761276
pattern_new = re.compile(r"\b\.name\b")
12771277
pattern_notouch = re.compile(r"\b\.numbercombined\b")
12781278

1279-
self.assertNotRegex(test_partner_title.name, pattern_new)
1280-
self.assertRegex(test_partner_title.name, pattern_notouch)
1281-
self.assertRegex(test_partner_title.name, pattern_old)
1279+
self.assertNotRegex(test_partner_category.name, pattern_new)
1280+
self.assertRegex(test_partner_category.name, pattern_notouch)
1281+
self.assertRegex(test_partner_category.name, pattern_old)
12821282

1283-
extra_filter = self.env.cr.mogrify("t.id = %s", (test_partner_title.id,)).decode()
1284-
util.replace_in_all_jsonb_values(self.env.cr, "res_partner_title", "name", ".number", ".name", extra_filter)
1283+
extra_filter = self.env.cr.mogrify("t.id = %s", (test_partner_category.id,)).decode()
1284+
util.replace_in_all_jsonb_values(self.env.cr, "res_partner_category", "name", ".number", ".name", extra_filter)
12851285
util.replace_in_all_jsonb_values(
1286-
self.env.cr, "res_partner_title", "name", r"""'<"x">\y""", "GONE", extra_filter
1286+
self.env.cr, "res_partner_category", "name", r"""'<"x">\y""", "GONE", extra_filter
12871287
)
1288-
test_partner_title.invalidate_recordset(["name"])
1288+
test_partner_category.invalidate_recordset(["name"])
12891289

1290-
self.assertRegex(test_partner_title.name, pattern_new)
1291-
self.assertRegex(test_partner_title.name, pattern_notouch)
1292-
self.assertNotRegex(test_partner_title.name, pattern_old)
1290+
self.assertRegex(test_partner_category.name, pattern_new)
1291+
self.assertRegex(test_partner_category.name, pattern_notouch)
1292+
self.assertNotRegex(test_partner_category.name, pattern_old)
12931293
# ensure replacing works for patterns that do not start with a valid word start \w
12941294
# also ensure the replace works for multiple embedded quotes
1295-
self.assertEqual(test_partner_title.name, "object.name GONE object.numbercombined")
1295+
self.assertEqual(test_partner_category.name, "object.name GONE object.numbercombined")
12961296

12971297
def test_replace_record_references_batch__uniqueness(self):
12981298
c1 = self.env["res.country"].create(

0 commit comments

Comments
 (0)