From d0b4d040e1874a2ba5230dbe5bc4c6c1911c3ba5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 21 Nov 2012 13:21:06 +0100 Subject: [PATCH] [FIX] base: fixed syntax errors and test import of test_search python test bzr revid: qdp-launchpad@openerp.com-20121121122106-4mrnlw4z01np21dq --- openerp/addons/base/tests/__init__.py | 3 ++- openerp/addons/base/tests/test_search.py | 28 ++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py index 409f9928c6f..e8ad035131b 100644 --- a/openerp/addons/base/tests/__init__.py +++ b/openerp/addons/base/tests/__init__.py @@ -1,7 +1,8 @@ -import test_base, test_expression, test_ir_values +import test_base, test_expression, test_search, test_ir_values checks = [ test_base, test_expression, + test_search, test_ir_values, ] diff --git a/openerp/addons/base/tests/test_search.py b/openerp/addons/base/tests/test_search.py index bc8a26b94fa..9ee883dfca2 100644 --- a/openerp/addons/base/tests/test_search.py +++ b/openerp/addons/base/tests/test_search.py @@ -21,35 +21,35 @@ class test_expression(common.TransactionCase): # The tests. # The basic searchs should exclude records that have active = False. The order of ids returned - # should be given by the `order´ parameter of search() + # should be given by the 'order' parameter of search() name_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name asc") - self.assertEqual([a, ab, b, c]), name_asc), "Search with 'NAME ASC' order failed.") + self.assertEqual([a, ab, b, c], name_asc, "Search with 'NAME ASC' order failed.") name_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="name desc") - self.assertEqual([c, b, ab, a]), name_desc), "Search with 'NAME DESC' order failed.") + self.assertEqual([c, b, ab, a], name_desc, "Search with 'NAME DESC' order failed.") id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id asc") - self.assertEqual([c, a, b, ab]), id_asc), "Search with 'ID ASC' order failed.") + self.assertEqual([c, a, b, ab], id_asc, "Search with 'ID ASC' order failed.") id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%')], order="id desc") - self.assertEqual([ab, b, a, c]), id_desc), "Search with 'ID DESC' order failed.") + self.assertEqual([ab, b, a, c], id_desc, "Search with 'ID DESC' order failed.") # The inactive records shouldn't be ecxluded as soon as a condition on this field is present in the domain - # criteria. The `order´ parameter of search() should support any valable coma-separated value + # criteria. The 'order' parameter of search() should support any valable coma-separated value active_asc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id asc") - self.assertEqual([d, e, c, a, b, ab]), active_asc_id_asc), "Search with 'ACTIVE ASC, ID ASC' order failed.") + self.assertEqual([d, e, c, a, b, ab], active_asc_id_asc, "Search with 'ACTIVE ASC, ID ASC' order failed.") active_desc_id_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id asc") - self.assertEqual([c, a, b, ab, d, e]), active_desc_id_asc), "Search with 'ACTIVE DESC, ID ASC' order failed.") + self.assertEqual([c, a, b, ab, d, e], active_desc_id_asc, "Search with 'ACTIVE DESC, ID ASC' order failed.") active_asc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active asc, id desc") - self.assertEqual([e, d, ab, b, a, c]), active_asc_id_desc), "Search with 'ACTIVE ASC, ID DESC' order failed.") + self.assertEqual([e, d, ab, b, a, c], active_asc_id_desc, "Search with 'ACTIVE ASC, ID DESC' order failed.") active_desc_id_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="active desc, id desc") - self.assertEqual([ab, b, a, c, e, d]), active_desc_id_desc), "Search with 'ACTIVE DESC, ID DESC' order failed.") + self.assertEqual([ab, b, a, c, e, d], active_desc_id_desc, "Search with 'ACTIVE DESC, ID DESC' order failed.") id_asc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active asc") - self.assertEqual(id_asc, id_asc_active_asc), "Search with 'ID ASC, ACTIVE ASC' order failed.") + self.assertEqual(id_asc, id_asc_active_asc, "Search with 'ID ASC, ACTIVE ASC' order failed.") id_asc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id asc, active desc") - self.assertEqual(id_asc, id_asc_active_desc), "Search with 'ID ASC, ACTIVE DESC' order failed.") + self.assertEqual(id_asc, id_asc_active_desc, "Search with 'ID ASC, ACTIVE DESC' order failed.") id_desc_active_asc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active asc") - self.assertEqual(id_desc, id_desc_active_asc), "Search with 'ID DESC, ACTIVE ASC' order failed.") + self.assertEqual(id_desc, id_desc_active_asc, "Search with 'ID DESC, ACTIVE ASC' order failed.") id_desc_active_desc = partners.search(cr, uid, [('name', 'like', 'test_search_order%'), ('active', 'in', (True, False))], order="id desc, active desc") - self.assertEqual(id_desc, id_desc_active_desc), "Search with 'ID DESC, ACTIVE DESC' order failed.") + self.assertEqual(id_desc, id_desc_active_desc, "Search with 'ID DESC, ACTIVE DESC' order failed.")