Commit 6eba4d41 authored by Jérome Perrin's avatar Jérome Perrin

explain the purpose of test_27_SortOnAmbigousKeys, and update it to matches

changes in the log message.
add a 'TODO' marker for a disabled test



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12559 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent db223694
...@@ -62,9 +62,9 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -62,9 +62,9 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
# Different variables used for this test # Different variables used for this test
run_all_test = 1 run_all_test = 1
quiet = 0 quiet = 1
def afterSetUp(self, quiet=1, run=1): def afterSetUp(self):
self.login() self.login()
# make sure there is no message any more # make sure there is no message any more
self.tic() self.tic()
...@@ -78,7 +78,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -78,7 +78,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
self.getPortal().portal_activities.manageClearActivities() self.getPortal().portal_activities.manageClearActivities()
get_transaction().commit() get_transaction().commit()
def login(self, quiet=0, run=run_all_test): def login(self):
uf = self.getPortal().acl_users uf = self.getPortal().acl_users
uf._doAddUser('seb', '', ['Manager'], []) uf._doAddUser('seb', '', ['Manager'], [])
user = uf.getUserById('seb').__of__(uf) user = uf.getUserById('seb').__of__(uf)
...@@ -553,7 +553,9 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -553,7 +553,9 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
self.assertTrue(organisation.getModificationDate()>now) self.assertTrue(organisation.getModificationDate()>now)
self.assertTrue(result[0]['creation_date']<result[0]['modification_date']) self.assertTrue(result[0]['creation_date']<result[0]['modification_date'])
def test_18_buildSQLQuery(self, quiet=quiet, run=0) :#run_all_test): # TODO: this test is disabled (and maybe not complete), because this feature
# is not implemented
def test_18_buildSQLQueryAnotherTable(self, quiet=quiet, run=0):
"""Tests that buildSQLQuery works with another query_table than 'catalog'""" """Tests that buildSQLQuery works with another query_table than 'catalog'"""
if not run: return if not run: return
if not quiet: if not quiet:
...@@ -864,6 +866,9 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -864,6 +866,9 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
sort_on=(('ignored', 'ascending'),))['order_by_expression']) sort_on=(('ignored', 'ascending'),))['order_by_expression'])
def test_27_SortOnAmbigousKeys(self, quiet=quiet, run=run_all_test): def test_27_SortOnAmbigousKeys(self, quiet=quiet, run=run_all_test):
# XXX This *describes* the current behaviour, which might be
# non optimal, but at least we have a test to make sure that bugs are not
# introduced here.
if not run: return if not run: return
if not quiet: if not quiet:
message = 'Test Sort On Ambigous Keys' message = 'Test Sort On Ambigous Keys'
...@@ -883,11 +888,10 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -883,11 +888,10 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
sort_on=(('start_date', 'ascending'),))['order_by_expression']) sort_on=(('start_date', 'ascending'),))['order_by_expression'])
self._ignore_log_errors() self._ignore_log_errors()
# buildSQLQuery will simply put a warning in the error log and ignore # buildSQLQuery will simply put a warning in the error log and ignore
# this key # this key.
logged_errors = [ logrecord for logrecord in self.logged logged_errors = [ logrecord for logrecord in self.logged
if logrecord[0] == 'SQLCatalog' ] if logrecord[0] == 'SQLCatalog' ]
self.failUnless( self.failUnless( 'could not build the sort index' in logged_errors[0][2])
'could not build the new sort index' in logged_errors[0][2])
# of course, in that case, it's possible to prefix with table name # of course, in that case, it's possible to prefix with table name
self.assertEquals('delivery.start_date', self.assertEquals('delivery.start_date',
...@@ -1310,3 +1314,4 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -1310,3 +1314,4 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
[x.path for x in self.getCatalogTool()( [x.path for x in self.getCatalogTool()(
portal_type='Organisation',**catalog_kw)]) portal_type='Organisation',**catalog_kw)])
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