From e039dc6a0bb5a1007b87c3913bb58ae9a0f78fa8 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 15 Oct 2015 16:10:42 +0200 Subject: [PATCH] [FIX] test_impex: fix tests, do not create languages but activate them --- openerp/addons/test_impex/tests/test_export.py | 9 +-------- openerp/addons/test_impex/tests/test_import.py | 18 ++---------------- openerp/addons/test_impex/tests/test_load.py | 10 +--------- 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/openerp/addons/test_impex/tests/test_export.py b/openerp/addons/test_impex/tests/test_export.py index 26f39db62e5..8aca2746a41 100644 --- a/openerp/addons/test_impex/tests/test_export.py +++ b/openerp/addons/test_impex/tests/test_export.py @@ -238,14 +238,7 @@ class test_selection(CreatorCase): [[u"Bar"]]) def test_localized_export(self): - self.registry('res.lang').create(self.cr, openerp.SUPERUSER_ID, { - 'name': u'Français', - 'code': 'fr_FR', - 'translatable': True, - 'date_format': '%d.%m.%Y', - 'decimal_point': ',', - 'thousands_sep': ' ', - }) + self.registry('res.lang').load_lang(self.cr, openerp.SUPERUSER_ID, 'fr_FR') Translations = self.registry('ir.translation') for source, value in self.translations_fr: Translations.create(self.cr, openerp.SUPERUSER_ID, { diff --git a/openerp/addons/test_impex/tests/test_import.py b/openerp/addons/test_impex/tests/test_import.py index eab986fb29a..8693b9b389e 100644 --- a/openerp/addons/test_impex/tests/test_import.py +++ b/openerp/addons/test_impex/tests/test_import.py @@ -394,14 +394,7 @@ class test_selection(ImporterCase): self.assertEqual([3, 2, 1, 2], values(self.read())) def test_imported_translated(self): - self.registry('res.lang').create(self.cr, openerp.SUPERUSER_ID, { - 'name': u'Français', - 'code': 'fr_FR', - 'translatable': True, - 'date_format': '%d.%m.%Y', - 'decimal_point': ',', - 'thousands_sep': ' ', - }) + self.registry('res.lang').load_lang(self.cr, openerp.SUPERUSER_ID, 'fr_FR') Translations = self.registry('ir.translation') for source, value in self.translations_fr: Translations.create(self.cr, openerp.SUPERUSER_ID, { @@ -461,14 +454,7 @@ class test_selection_function(ImporterCase): def test_translated(self): """ Expects output of selection function returns translated labels """ - self.registry('res.lang').create(self.cr, openerp.SUPERUSER_ID, { - 'name': u'Français', - 'code': 'fr_FR', - 'translatable': True, - 'date_format': '%d.%m.%Y', - 'decimal_point': ',', - 'thousands_sep': ' ', - }) + self.registry('res.lang').load_lang(self.cr, openerp.SUPERUSER_ID, 'fr_FR') Translations = self.registry('ir.translation') for source, value in self.translations_fr: Translations.create(self.cr, openerp.SUPERUSER_ID, { diff --git a/openerp/addons/test_impex/tests/test_load.py b/openerp/addons/test_impex/tests/test_load.py index 2739fc3cc3e..6677e3ff687 100644 --- a/openerp/addons/test_impex/tests/test_load.py +++ b/openerp/addons/test_impex/tests/test_load.py @@ -76,15 +76,7 @@ class ImporterCase(common.TransactionCase): return '__test__.' + name def add_translations(self, name, type, code, *tnx): - Lang = self.registry('res.lang') - if not Lang.search(self.cr, openerp.SUPERUSER_ID, [('code', '=', code)]): - Lang.create(self.cr, openerp.SUPERUSER_ID, { - 'name': code, - 'code': code, - 'translatable': True, - 'date_format': '%d.%m.%Y', - 'decimal_point': ',', - }) + self.registry('res.lang').load_lang(self.cr, openerp.SUPERUSER_ID, code) Translations = self.registry('ir.translation') for source, value in tnx: Translations.create(self.cr, openerp.SUPERUSER_ID, {