Commit aced0684 authored by Jérome Perrin's avatar Jérome Perrin

testERP5Coordinate: fix preference usage

preferences are based on catalog, it's required to tic() before a new
activated preference is effective. This test was working by chance.
parent dab26b0d
...@@ -49,6 +49,13 @@ class TestERP5Coordinate(ERP5TypeTestCase): ...@@ -49,6 +49,13 @@ class TestERP5Coordinate(ERP5TypeTestCase):
'erp5_full_text_mroonga_catalog', 'erp5_full_text_mroonga_catalog',
'erp5_base',) 'erp5_base',)
def afterSetUp(self):
ERP5TypeTestCase.afterSetUp(self)
self.default_site_preference = self.portal.portal_preferences.default_site_preference
if self.default_site_preference.getPreferenceState() != 'global':
self.default_site_preference.enable()
self.tic()
def beforeTearDown(self): def beforeTearDown(self):
self.abort() self.abort()
for module in ( self.portal.person_module, for module in ( self.portal.person_module,
...@@ -109,20 +116,20 @@ class TestERP5Coordinate(ERP5TypeTestCase): ...@@ -109,20 +116,20 @@ class TestERP5Coordinate(ERP5TypeTestCase):
def test_TelephonePreference(self): def test_TelephonePreference(self):
pers = self.getPersonModule().newContent(portal_type='Person') pers = self.getPersonModule().newContent(portal_type='Person')
tel = pers.newContent(portal_type='Telephone') tel = pers.newContent(portal_type='Telephone')
pref = self.portal.portal_preferences.default_site_preference self.default_site_preference.setPreferredTelephoneDefaultCountryNumber('33')
pref.setPreferredTelephoneDefaultCountryNumber('33') self.default_site_preference.setPreferredTelephoneDefaultAreaNumber('2')
pref.setPreferredTelephoneDefaultAreaNumber('2') self.tic()
pref.enable()
tel.fromText(coordinate_text='11111111') tel.fromText(coordinate_text='11111111')
self.assertEqual('+33(0)2-11111111',tel.asText()) self.assertEqual('+33(0)2-11111111',tel.asText())
def test_TelephoneCountryAndAreaCodeRemains(self): def test_TelephoneCountryAndAreaCodeRemains(self):
pers = self.getPersonModule().newContent(portal_type='Person') pers = self.getPersonModule().newContent(portal_type='Person')
tel = pers.newContent(portal_type='Telephone') tel = pers.newContent(portal_type='Telephone')
pref = self.portal.portal_preferences.default_site_preference self.default_site_preference.setPreferredTelephoneDefaultCountryNumber('')
pref.setPreferredTelephoneDefaultCountryNumber('') self.default_site_preference.setPreferredTelephoneDefaultAreaNumber('')
pref.setPreferredTelephoneDefaultAreaNumber('') self.tic()
pref.enable()
tel.fromText(coordinate_text='+11 1 11111111') tel.fromText(coordinate_text='+11 1 11111111')
tel.fromText(coordinate_text='+22333445555') tel.fromText(coordinate_text='+22333445555')
self.assertEqual('+(0)-22333445555',tel.asText()) self.assertEqual('+(0)-22333445555',tel.asText())
...@@ -312,10 +319,9 @@ class TestERP5Coordinate(ERP5TypeTestCase): ...@@ -312,10 +319,9 @@ class TestERP5Coordinate(ERP5TypeTestCase):
def test_TelephoneWhenTheDefaultCountryAndAreaPreferenceIsBlank(self): def test_TelephoneWhenTheDefaultCountryAndAreaPreferenceIsBlank(self):
pers = self.getPersonModule().newContent(portal_type='Person') pers = self.getPersonModule().newContent(portal_type='Person')
tel = pers.newContent(portal_type='Telephone') tel = pers.newContent(portal_type='Telephone')
pref = self.portal.portal_preferences.default_site_preference self.default_site_preference.setPreferredTelephoneDefaultCountryNumber('')
pref.setPreferredTelephoneDefaultCountryNumber('') self.default_site_preference.setPreferredTelephoneDefaultAreaNumber('')
pref.setPreferredTelephoneDefaultAreaNumber('') self.tic()
pref.enable()
tel.fromText(coordinate_text='12345678') tel.fromText(coordinate_text='12345678')
self.assertEqual('+(0)-12345678',tel.asText()) self.assertEqual('+(0)-12345678',tel.asText())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment