diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py index 01d501fe80f..e91633c2e15 100644 --- a/openerp/addons/base/res/res_lang.py +++ b/openerp/addons/base/res/res_lang.py @@ -317,52 +317,4 @@ def intersperse(string, counts, separator=''): res = separator.join(map(reverse, reverse(splits))) return left + res + right, len(splits) > 0 and len(splits) -1 or 0 -# TODO rewrite this with a unit test library -def _group_examples(): - for g in [original_group, intersperse]: - # print "asserts on", g.func_name - assert g("", []) == ("", 0) - assert g("0", []) == ("0", 0) - assert g("012", []) == ("012", 0) - assert g("1", []) == ("1", 0) - assert g("12", []) == ("12", 0) - assert g("123", []) == ("123", 0) - assert g("1234", []) == ("1234", 0) - assert g("123456789", []) == ("123456789", 0) - assert g("&ab%#@1", []) == ("&ab%#@1", 0) - - assert g("0", []) == ("0", 0) - assert g("0", [1]) == ("0", 0) - assert g("0", [2]) == ("0", 0) - assert g("0", [200]) == ("0", 0) - - # breaks original_group: - if g.func_name == 'intersperse': - assert g("12345678", [0], '.') == ('12345678', 0) - assert g("", [1], '.') == ('', 0) - assert g("12345678", [1], '.') == ('1234567.8', 1) - assert g("12345678", [1], '.') == ('1234567.8', 1) - assert g("12345678", [2], '.') == ('123456.78', 1) - assert g("12345678", [2,1], '.') == ('12345.6.78', 2) - assert g("12345678", [2,0], '.') == ('12.34.56.78', 3) - assert g("12345678", [-1,2], '.') == ('12345678', 0) - assert g("12345678", [2,-1], '.') == ('123456.78', 1) - assert g("12345678", [2,0,1], '.') == ('12.34.56.78', 3) - assert g("12345678", [2,0,0], '.') == ('12.34.56.78', 3) - assert g("12345678", [2,0,-1], '.') == ('12.34.56.78', 3) - assert g("12345678", [3,3,3,3], '.') == ('12.345.678', 2) - - assert original_group("abc1234567xy", [2], '.') == ('abc1234567.xy', 1) - assert original_group("abc1234567xy8", [2], '.') == ('abc1234567xy8', 0) # difference here... - assert original_group("abc12", [3], '.') == ('abc12', 0) - assert original_group("abc12", [2], '.') == ('abc12', 0) - assert original_group("abc12", [1], '.') == ('abc1.2', 1) - - assert intersperse("abc1234567xy", [2], '.') == ('abc1234567.xy', 1) - assert intersperse("abc1234567xy8", [2], '.') == ('abc1234567x.y8', 1) # ... w.r.t. here. - assert intersperse("abc12", [3], '.') == ('abc12', 0) - assert intersperse("abc12", [2], '.') == ('abc12', 0) - assert intersperse("abc12", [1], '.') == ('abc1.2', 1) - - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py index d891bc06fda..5023494172c 100644 --- a/openerp/addons/base/tests/__init__.py +++ b/openerp/addons/base/tests/__init__.py @@ -3,6 +3,7 @@ import test_expression import test_ir_attachment import test_ir_values import test_menu +import test_res_lang import test_search checks = [ @@ -11,5 +12,6 @@ checks = [ test_ir_attachment, test_ir_values, test_menu, + test_res_lang, test_search, ] diff --git a/openerp/addons/base/tests/res_lang.py b/openerp/addons/base/tests/res_lang.py deleted file mode 100644 index dbfa64f2993..00000000000 --- a/openerp/addons/base/tests/res_lang.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys -import openerp - -import openerp.addons.base.res.res_lang as res_lang -res_lang._group_examples() - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py index 285af8fbf6e..4e1de54920e 100644 --- a/openerp/addons/base/tests/test_base.py +++ b/openerp/addons/base/tests/test_base.py @@ -40,4 +40,4 @@ class test_base(common.TransactionCase): if __name__ == '__main__': - unittest2.main() \ No newline at end of file + unittest2.main() diff --git a/openerp/addons/base/tests/test_res_lang.py b/openerp/addons/base/tests/test_res_lang.py new file mode 100644 index 00000000000..3905dee0158 --- /dev/null +++ b/openerp/addons/base/tests/test_res_lang.py @@ -0,0 +1,55 @@ +import unittest2 + +import openerp.tests.common as common + +class test_res_lang(common.TransactionCase): + + def test_00(self): + from openerp.addons.base.res.res_lang import original_group, intersperse + + for g in [original_group, intersperse]: + # print "asserts on", g.func_name + assert g("", []) == ("", 0), "Assert passed" + assert g("0", []) == ("0", 0), "Assert passed" + assert g("012", []) == ("012", 0), "Assert passed" + assert g("1", []) == ("1", 0), "Assert passed" + assert g("12", []) == ("12", 0), "Assert passed" + assert g("123", []) == ("123", 0), "Assert passed" + assert g("1234", []) == ("1234", 0), "Assert passed" + assert g("123456789", []) == ("123456789", 0), "Assert passed" + assert g("&ab%#@1", []) == ("&ab%#@1", 0), "Assert passed" + + assert g("0", []) == ("0", 0), "Assert passed" + assert g("0", [1]) == ("0", 0), "Assert passed" + assert g("0", [2]) == ("0", 0), "Assert passed" + assert g("0", [200]) == ("0", 0), "Assert passed" + + # breaks original_group: + if g.func_name == 'intersperse': + assert g("12345678", [0], '.') == ('12345678', 0) + assert g("", [1], '.') == ('', 0) + assert g("12345678", [1], '.') == ('1234567.8', 1) + assert g("12345678", [1], '.') == ('1234567.8', 1) + assert g("12345678", [2], '.') == ('123456.78', 1) + assert g("12345678", [2,1], '.') == ('12345.6.78', 2) + assert g("12345678", [2,0], '.') == ('12.34.56.78', 3) + assert g("12345678", [-1,2], '.') == ('12345678', 0) + assert g("12345678", [2,-1], '.') == ('123456.78', 1) + assert g("12345678", [2,0,1], '.') == ('12.34.56.78', 3) + assert g("12345678", [2,0,0], '.') == ('12.34.56.78', 3) + assert g("12345678", [2,0,-1], '.') == ('12.34.56.78', 3) + assert g("12345678", [3,3,3,3], '.') == ('12.345.678', 2) + + assert original_group("abc1234567xy", [2], '.') == ('abc1234567.xy', 1) + assert original_group("abc1234567xy8", [2], '.') == ('abc1234567xy8', 0) # difference here... + assert original_group("abc12", [3], '.') == ('abc12', 0) + assert original_group("abc12", [2], '.') == ('abc12', 0) + assert original_group("abc12", [1], '.') == ('abc1.2', 1) + + assert intersperse("abc1234567xy", [2], '.') == ('abc1234567.xy', 1) + assert intersperse("abc1234567xy8", [2], '.') == ('abc1234567x.y8', 1) # ... w.r.t. here. + assert intersperse("abc12", [3], '.') == ('abc12', 0) + assert intersperse("abc12", [2], '.') == ('abc12', 0) + assert intersperse("abc12", [1], '.') == ('abc1.2', 1) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: