OCA
/
partner-contact
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[FIX] check all tests

pull/347/head
Nicolas JEUDY 8 years ago
parent
50419a809b
commit
e26ec8a79c
3 changed files with 77 additions and 114 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      partner_contact_in_several_companies/models/ir_actions.py
  2. 5
      partner_contact_in_several_companies/models/res_partner.py
  3. 184
      partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py

2
partner_contact_in_several_companies/models/ir_actions.py
View File

@ -11,7 +11,7 @@ class IRActionsWindow(models.Model):
def read(self, fields=None, context=None, load='_classic_read'):
actions = super(IRActionsWindow, self).read(fields=fields, load=load)
for action in actions:
if action.get('res_model', '') == 'res.partner':
if action.get('res_model', '') == u'res.partner':
# By default, only show standalone contact
action_context = action.get('context', '{}') or '{}'
if 'search_show_all_positions' not in action_context:

5
partner_contact_in_several_companies/models/res_partner.py
View File

@ -12,7 +12,7 @@ class ResPartner(models.Model):
[('standalone', _('Standalone Contact')),
('attached', _('Attached to existing Contact')),
],
comptute='_get_contact_type',
compute='_get_contact_type',
store=True,
required=True,
default='standalone')
@ -24,6 +24,7 @@ class ResPartner(models.Model):
other_contact_ids = fields.One2many('res.partner', 'contact_id',
string='Others Positions')
@api.multi
@api.depends('contact_id')
def _get_contact_type(self):
for record in self:
@ -144,7 +145,7 @@ class ResPartner(models.Model):
record._contact_sync_from_parent()
# 2. To DOWNSTREAM: sync contact fields to parent or related
elif any(field in contact_fields for field in update_values):
update_ids = record.other_contact_ids.filter(lambda p: not p.is_company)
update_ids = record.other_contact_ids.filtered(lambda p: not p.is_company)
if record.contact_id:
update_ids |= record.contact_id
update_ids.update_contact(update_values)

184
partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py
View File

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import api, SUPERUSER_ID
from odoo.tests import common
@ -10,45 +9,26 @@ class PartnerContactInSeveralCompaniesCase(common.TransactionCase):
def setUp(self):
"""*****setUp*****"""
super(PartnerContactInSeveralCompaniesCase, self).setUp()
cr, uid = self.cr, self.uid
env = api.Environment(cr, SUPERUSER_ID, {})
ModelData = env['ir.model.data']
self.partner = env['res.partner']
self.action = env['ir.actions.act_window']
self.partner = self.env['res.partner']
self.action = self.env['ir.actions.act_window']
# Get test records reference
for attr, module, name in [
('main_partner_id', 'base', 'main_partner'),
('bob_contact_id',
'partner_contact_in_several_companies',
'res_partner_contact1'),
('bob_job1_id',
'partner_contact_in_several_companies',
'res_partner_contact1_work_position1'),
('roger_contact_id', 'base', 'res_partner_main2'),
('roger_job2_id',
'partner_contact_in_several_companies',
'res_partner_main2_position_consultant'),
('base_partner_action_id', 'base', 'action_partner_form'),
('custom_partner_action_id',
'partner_contact_in_several_companies',
'action_partner_form'),
]:
r = ModelData.get_object_reference(module, name)
setattr(self, attr, r[1] if r else False)
self.main_partner = self.env.ref('base.main_partner')
self.bob_contact = self.env.ref('partner_contact_in_several_companies.res_partner_contact1')
self.bob_job1 = self.env.ref('partner_contact_in_several_companies.res_partner_contact1_work_position1')
self.roger_contact = self.env.ref('base.res_partner_main2')
self.roger_job2 = self.env.ref('partner_contact_in_several_companies.res_partner_main2_position_consultant')
def test_00_show_only_standalone_contact(self):
"""Check that only standalone contact are shown if context
explicitly state to not display all positions
"""
cr, uid = self.cr, self.uid
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': False
}}
partner_ids = self.partner.search([])
partner_ids.sort()
self.assertTrue(self.bob_job1_id not in partner_ids)
self.assertTrue(self.roger_job2_id not in partner_ids)
partner_ids = self.partner.with_context(ctx).search([])
self.assertTrue(len(self.bob_job1 & partner_ids) != 0)
self.assertTrue(len(self.roger_job2 & partner_ids) != 0)
def test_01_show_all_positions(self):
"""Check that all contact are show if context is empty or
@ -57,83 +37,70 @@ class PartnerContactInSeveralCompaniesCase(common.TransactionCase):
"""
partner_ids = self.partner.search([])
self.assertTrue(self.bob_job1_id in partner_ids)
self.assertTrue(self.roger_job2_id in partner_ids)
self.assertTrue(self.bob_job1 in partner_ids)
self.assertTrue(self.roger_job2 in partner_ids)
ctx = {'search_show_all_positions': {'is_set': False}}
partner_ids = self.partner.search([])
self.assertTrue(self.bob_job1_id in partner_ids)
self.assertTrue(self.roger_job2_id in partner_ids)
partner_ids = self.partner.with_context(ctx).search([])
self.assertTrue(self.bob_job1 in partner_ids)
self.assertTrue(self.roger_job2 in partner_ids)
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': True
}}
partner_ids = self.partner.search([])
self.assertTrue(self.bob_job1_id in partner_ids)
self.assertTrue(self.roger_job2_id in partner_ids)
partner_ids = self.partner.with_context(ctx).search([])
self.assertTrue(self.bob_job1 in partner_ids)
self.assertTrue(self.roger_job2 in partner_ids)
def test_02_reading_other_contact_one2many_show_all_positions(self):
"""Check that readonly partner's ``other_contact_ids`` return
all values whatever the context
"""
def read_other_contacts(pid, context=None):
return self.partner.read(
[pid], ['other_contact_ids'])[0]['other_contact_ids']
def read_contacts(pid, context=None):
return self.partner.read(
[pid], ['child_ids'])[0]['child_ids']
ctx = None
ctx = {}
self.assertEqual(
read_other_contacts(self.bob_contact_id, context=ctx),
[self.bob_job1_id],
self.bob_job1, self.bob_contact.with_context(ctx).other_contact_ids
)
ctx = {'search_show_all_positions': {'is_set': False}}
self.assertEqual(read_other_contacts(
self.bob_contact_id),
[self.bob_job1_id],
self.assertEqual(
self.bob_job1, self.bob_contact.with_context(ctx).other_contact_ids
)
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': False
'set_value': False,
}}
self.assertEqual(read_other_contacts(
self.bob_contact_id,),
[self.bob_job1_id],
self.assertEqual(
self.bob_job1, self.bob_contact.with_context(ctx).other_contact_ids
)
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': True
'set_value': True,
}}
self.assertEqual(
read_other_contacts(self.bob_contact_id),
[self.bob_job1_id],
self.bob_job1, self.bob_contact.with_context(ctx).other_contact_ids
)
ctx = None
ctx = {}
self.assertIn(
self.bob_job1_id,
read_contacts(self.main_partner_id),
)
self.bob_job1,
self.main_partner.with_context(ctx).child_ids)
ctx = {'search_show_all_positions': {'is_set': False}}
self.assertIn(
self.bob_job1_id,
read_contacts(self.main_partner_id),
)
self.bob_job1,
self.main_partner.with_context(ctx).child_ids)
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': False
'set_value': False,
}}
self.assertIn(
self.bob_job1_id,
read_contacts(self.main_partner_id),
)
self.bob_job1,
self.main_partner.with_context(ctx).child_ids)
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': True
'set_value': True,
}}
self.assertIn(
self.bob_job1_id,
read_contacts(self.main_partner_id),
)
self.bob_job1,
self.main_partner.with_context(ctx).child_ids)
def test_03_search_match_attached_contacts(self):
"""Check that searching partner also return partners having
@ -145,64 +112,62 @@ class PartnerContactInSeveralCompaniesCase(common.TransactionCase):
# should contain Bob position.
partner_ids = self.partner.search(
[('parent_id', 'ilike', 'YourCompany')])
self.assertIn(self.bob_job1_id, partner_ids, )
self.assertTrue(len(self.bob_job1 & partner_ids) != 0)
# but when searching without 'all positions',
# we should get the position standalone contact instead.
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': False
'set_value': False,
}}
partner_ids = self.partner.search(
partner_ids = self.partner.with_context(ctx).search(
[('parent_id', 'ilike', 'YourCompany')])
self.assertIn(self.bob_contact_id, partner_ids, )
self.assertTrue(len(self.bob_contact & partner_ids) == 0)
def test_04_contact_creation(self):
"""Check that we're begin to create a contact"""
# Create a contact using only name
new_contact_id = self.partner.create({'name': 'Bob Egnops'})
new_contact=self.partner.create({'name': 'Bob Egnops'})
self.assertEqual(
self.partner.browse(cr, uid, new_contact_id).contact_type,
new_contact.contact_type,
'standalone',
)
# Create a contact with only contact_id
new_contact_id = self.partner.create(
{'contact_id': self.bob_contact_id}
new_contact = self.partner.create(
{'contact_id': self.bob_contact.id}
)
new_contact = self.partner.browse(new_contact_id)
self.assertEqual(new_contact.name, 'Bob Egnops')
self.assertEqual(new_contact.contact_type, 'attached')
self.assertEqual(new_contact.name, u'Bob Egnops')
self.assertEqual(new_contact.contact_type, u'attached')
# Create a contact with both contact_id and name;
# contact's name should override provided value in that case
new_contact_id = self.partner.create(
{'contact_id': self.bob_contact_id, 'name': 'Rob Egnops'}
new_contact = self.partner.create(
{'contact_id': self.bob_contact.id, 'name': 'Rob Egnops'}
)
self.assertEqual(
new_contact_id.name,
'Bob Egnops'
new_contact.name,
u'Bob Egnops'
)
# Reset contact to standalone
new_contact_id.write({'contact_id': False})
new_contact.write({'contact_id': False})
self.assertEqual(
new_contact_id.contact_type,
'standalone',
new_contact.contact_type,
u'standalone',
)
# Reset contact to attached, and ensure only it is unlinked (i.e.
# context is ignored).
new_contact_id.write([
{'contact_id': self.bob_contact_id})
new_contact.write({'contact_id': self.bob_contact.id})
ctx = {'search_show_all_positions': {'is_set': True,
'set_value': True
}}
new_contact_id.with_context(ctx).unlink()
partner_ids = self.partner.search(
[('id', 'in', [new_contact_id, self.bob_contact_id])])
self.assertIn(self.bob_contact_id, partner_ids)
self.assertNotIn(new_contact_id, partner_ids)
new_contact.with_context(ctx).unlink()
partner_ids = self.partner.with_context(ctx).search(
[('id', 'in', [new_contact.id, self.bob_contact.id])])
self.assertIn(self.bob_contact, partner_ids)
self.assertNotIn(new_contact, partner_ids)
def test_05_contact_fields_sync(self):
"""Check that contact's fields are correctly synced between
@ -210,18 +175,18 @@ class PartnerContactInSeveralCompaniesCase(common.TransactionCase):
"""
# Test DOWNSTREAM sync
self.bob_contact_id.write(
self.bob_contact.write(
{'name': 'Rob Egnops'}
)
self.assertEqual(
self.partner.browse(self.bob_job1_id).name,
self.bob_job1.name,
'Rob Egnops',
)
# Test UPSTREAM sync
self.bob_job1_id.write({'name': 'Bob Egnops'})
self.bob_job1.write({'name': 'Bob Egnops'})
self.assertEqual(
self.partner.browse(self.bob_contact_id).name,
self.bob_contact.name,
'Bob Egnops',
)
@ -231,21 +196,18 @@ class PartnerContactInSeveralCompaniesCase(common.TransactionCase):
new_context_val = "'search_show_all_positions': " \
"{'is_set': True, 'set_value': False},"
details = self.env.ref('base.action_partner_form')
details = self.action.read(
[self.base_partner_action_id]
)
self.assertIn(
new_context_val,
details[0]['context'],
details.context,
msg='Default actions not updated with new context'
)
details = self.action.read(
[self.custom_partner_action_id]
)
details = self.env.ref('partner_contact_in_several_companies.action_partner_form')
self.assertNotIn(
new_context_val,
details[0]['context'],
details.context,
msg='Custom actions incorrectly updated with new context'
)
Write Preview
Loading…
Cancel
Save