Commit 583b319c authored by Łukasz Nowak's avatar Łukasz Nowak

- remove old way of restricting of running tests (run and quiet mode)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29935 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9c47a1ad
...@@ -40,8 +40,6 @@ from Products.ERP5Form.SelectionTool import SelectionTool ...@@ -40,8 +40,6 @@ from Products.ERP5Form.SelectionTool import SelectionTool
class TestSelectionTool(ERP5TypeTestCase): class TestSelectionTool(ERP5TypeTestCase):
quiet = 1
run_all_test = 1
def getTitle(self): def getTitle(self):
return "SelectionTool" return "SelectionTool"
...@@ -58,8 +56,7 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -58,8 +56,7 @@ class TestSelectionTool(ERP5TypeTestCase):
self.portal_selections.setSelectionFor('test_selection', Selection()) self.portal_selections.setSelectionFor('test_selection', Selection())
self.portal_selections.setSelectionParamsFor('test_selection', {'key':'value'}) self.portal_selections.setSelectionParamsFor('test_selection', {'key':'value'})
def testGetSelectionContainer(self, quiet=quiet, run=run_all_test): def testGetSelectionContainer(self):
if not run: return
self.assertEquals(['test_selection'], self.assertEquals(['test_selection'],
self.portal_selections.getSelectionNameList()) self.portal_selections.getSelectionNameList())
self.assertEquals(['test_selection'], self.assertEquals(['test_selection'],
...@@ -69,14 +66,12 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -69,14 +66,12 @@ class TestSelectionTool(ERP5TypeTestCase):
self.assert_(getattr(self.portal_selections, 'selection_data', None) self.assert_(getattr(self.portal_selections, 'selection_data', None)
is not None) is not None)
def testGetSelectionFor(self, quiet=quiet, run=run_all_test): def testGetSelectionFor(self):
if not run: return
selection = self.portal_selections.getSelectionFor('test_selection') selection = self.portal_selections.getSelectionFor('test_selection')
self.assert_(isinstance(selection, Selection)) self.assert_(isinstance(selection, Selection))
self.assertEquals('test_selection', selection.name) self.assertEquals('test_selection', selection.name)
def testGetSelectionParamsFor(self, quiet=quiet, run=run_all_test): def testGetSelectionParamsFor(self):
if not run: return
self.assertEquals({'key':'value'}, self.assertEquals({'key':'value'},
self.portal_selections.getSelectionParamsFor('test_selection')) self.portal_selections.getSelectionParamsFor('test_selection'))
...@@ -92,14 +87,12 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -92,14 +87,12 @@ class TestSelectionTool(ERP5TypeTestCase):
'context/portal_selections/test_selection/not_found | string:default')) 'context/portal_selections/test_selection/not_found | string:default'))
def testCallSelectionFor(self, quiet=quiet, run=run_all_test): def testCallSelectionFor(self):
if not run: return
self.assertEquals(None, self.assertEquals(None,
self.portal_selections.callSelectionFor('not_found_selection')) self.portal_selections.callSelectionFor('not_found_selection'))
# XXX more tests needed # XXX more tests needed
def testCheckedUids(self, quiet=quiet, run=run_all_test): def testCheckedUids(self):
if not run: return
self.assertEquals([], self.assertEquals([],
self.portal_selections.getSelectionCheckedUidsFor('test_selection')) self.portal_selections.getSelectionCheckedUidsFor('test_selection'))
self.portal_selections.setSelectionCheckedUidsFor('test_selection', self.portal_selections.setSelectionCheckedUidsFor('test_selection',
...@@ -119,21 +112,18 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -119,21 +112,18 @@ class TestSelectionTool(ERP5TypeTestCase):
self.assertEquals(['baz'], self.assertEquals(['baz'],
self.portal_selections.getSelectionCheckedUidsFor('test_selection')) self.portal_selections.getSelectionCheckedUidsFor('test_selection'))
def testGetSelectionListUrlFor(self, quiet=quiet, run=run_all_test): def testGetSelectionListUrlFor(self):
if not run: return
self.assertEquals('', self.assertEquals('',
self.portal_selections.getSelectionListUrlFor('test_selection')) self.portal_selections.getSelectionListUrlFor('test_selection'))
def testInvertMode(self, quiet=quiet, run=run_all_test): def testInvertMode(self):
if not run: return
self.portal_selections.setSelectionInvertModeFor('test_selection', 1) self.portal_selections.setSelectionInvertModeFor('test_selection', 1)
self.assertEquals(1, self.assertEquals(1,
self.portal_selections.getSelectionInvertModeFor('test_selection')) self.portal_selections.getSelectionInvertModeFor('test_selection'))
self.assertEquals([], self.assertEquals([],
self.portal_selections.getSelectionInvertModeUidListFor('test_selection')) self.portal_selections.getSelectionInvertModeUidListFor('test_selection'))
def testSetSelectionToAll(self, quiet=quiet, run=run_all_test): def testSetSelectionToAll(self):
if not run: return
self.portal_selections.checkAll('test_selection', self.portal_selections.checkAll('test_selection',
['foo', 'bar']) ['foo', 'bar'])
self.portal_selections.setSelectionToAll('test_selection') self.portal_selections.setSelectionToAll('test_selection')
...@@ -144,8 +134,7 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -144,8 +134,7 @@ class TestSelectionTool(ERP5TypeTestCase):
self.assertEquals([], self.assertEquals([],
self.portal_selections.getSelectionCheckedUidsFor('test_selection')) self.portal_selections.getSelectionCheckedUidsFor('test_selection'))
def testSortOrder(self, quiet=quiet, run=run_all_test): def testSortOrder(self):
if not run: return
self.portal_selections.setSelectionSortOrder('test_selection', self.portal_selections.setSelectionSortOrder('test_selection',
[('title', 'ascending')]) [('title', 'ascending')])
self.assertEquals([('title', 'ascending')], self.assertEquals([('title', 'ascending')],
...@@ -159,8 +148,7 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -159,8 +148,7 @@ class TestSelectionTool(ERP5TypeTestCase):
self.assertEquals([('date', 'ascending')], self.assertEquals([('date', 'ascending')],
self.portal_selections.getSelectionSortOrder('test_selection')) self.portal_selections.getSelectionSortOrder('test_selection'))
def testColumns(self, quiet=quiet, run=run_all_test): def testColumns(self):
if not run: return
self.assertEquals([], self.assertEquals([],
self.portal_selections.getSelectionColumns('test_selection')) self.portal_selections.getSelectionColumns('test_selection'))
self.assertEquals([('default_key', 'default_val')], self.assertEquals([('default_key', 'default_val')],
...@@ -172,8 +160,7 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -172,8 +160,7 @@ class TestSelectionTool(ERP5TypeTestCase):
self.assertEquals([('key', 'val')], self.assertEquals([('key', 'val')],
self.portal_selections.getSelectionColumns('test_selection', [('default_key', 'default_val')])) self.portal_selections.getSelectionColumns('test_selection', [('default_key', 'default_val')]))
def testStats(self, quiet=quiet, run=run_all_test): def testStats(self):
if not run: return
self.assertEquals([' ', ' ', ' ', ' ', ' ', ' '], self.assertEquals([' ', ' ', ' ', ' ', ' ', ' '],
self.portal_selections.getSelectionStats('test_selection')) self.portal_selections.getSelectionStats('test_selection'))
self.portal_selections.setSelectionStats('test_selection', self.portal_selections.setSelectionStats('test_selection',
...@@ -181,16 +168,15 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -181,16 +168,15 @@ class TestSelectionTool(ERP5TypeTestCase):
self.assertEquals([], self.assertEquals([],
self.portal_selections.getSelectionStats('test_selection')) self.portal_selections.getSelectionStats('test_selection'))
def testView(self, quiet=quiet, run=run_all_test): def testView(self):
if not run: return
# XXX tests should be added # XXX tests should be added
pass
def testPage(self, quiet=quiet, run=run_all_test): def testPage(self):
if not run: return
# XXX tests should be added # XXX tests should be added
pass
def testDomainSelection(self, quiet=quiet, run=run_all_test): def testDomainSelection(self):
if not run: return
self.assertEquals('', self.assertEquals('',
self.portal_selections.buildSQLJoinExpressionFromDomainSelection({})) self.portal_selections.buildSQLJoinExpressionFromDomainSelection({}))
self.assertEquals('', self.assertEquals('',
...@@ -215,15 +201,13 @@ class TestSelectionTool(ERP5TypeTestCase): ...@@ -215,15 +201,13 @@ class TestSelectionTool(ERP5TypeTestCase):
self.assertEquals('( catalog.uid = test_base_cat_category.uid AND (test_base_cat_category.category_uid = %d AND test_base_cat_category.base_category_uid = %d AND test_base_cat_category.category_strict_membership = 1) )' % (test_uid, base_uid), self.assertEquals('( catalog.uid = test_base_cat_category.uid AND (test_base_cat_category.category_uid = %d AND test_base_cat_category.base_category_uid = %d AND test_base_cat_category.category_strict_membership = 1) )' % (test_uid, base_uid),
self.portal_selections.buildSQLExpressionFromDomainSelection({'test_base_cat': ('portal_categories', 'test_base_cat/test_cat')}, strict_membership = 1)) self.portal_selections.buildSQLExpressionFromDomainSelection({'test_base_cat': ('portal_categories', 'test_base_cat/test_cat')}, strict_membership = 1))
def testDict(self, quiet=quiet, run=run_all_test): def testDict(self):
if not run: return
self.assertEquals({}, self.assertEquals({},
self.portal_selections.getSelectionDomainDictFor('test_selection')) self.portal_selections.getSelectionDomainDictFor('test_selection'))
self.assertEquals({}, self.assertEquals({},
self.portal_selections.getSelectionReportDictFor('test_selection')) self.portal_selections.getSelectionReportDictFor('test_selection'))
def testIndex(self, quiet=quiet, run=run_all_test): def testIndex(self):
if not run: return
self.assertEquals(None, self.assertEquals(None,
self.portal_selections.getSelectionIndexFor('test_selection')) self.portal_selections.getSelectionIndexFor('test_selection'))
...@@ -369,8 +353,6 @@ class TestSelectionPersistence(unittest.TestCase): ...@@ -369,8 +353,6 @@ class TestSelectionPersistence(unittest.TestCase):
portal_selections.getSelectionParamsFor('test_selection').get('key')) portal_selections.getSelectionParamsFor('test_selection').get('key'))
class TestSelectionToolMemcachedStorage(TestSelectionTool): class TestSelectionToolMemcachedStorage(TestSelectionTool):
quiet = 1
run_all_test = 1
def getTitle(self): def getTitle(self):
return "SelectionTool with Memcached Storage" return "SelectionTool with Memcached Storage"
...@@ -386,8 +368,7 @@ class TestSelectionToolMemcachedStorage(TestSelectionTool): ...@@ -386,8 +368,7 @@ class TestSelectionToolMemcachedStorage(TestSelectionTool):
self.portal.portal_selections.setStorage('portal_memcached/default_memcached_plugin') self.portal.portal_selections.setStorage('portal_memcached/default_memcached_plugin')
TestSelectionTool.afterSetUp(self) TestSelectionTool.afterSetUp(self)
def testGetSelectionContainer(self, quiet=quiet, run=run_all_test): def testGetSelectionContainer(self):
if not run: return
self.assertEquals([], self.assertEquals([],
self.portal_selections.getSelectionNameList()) self.portal_selections.getSelectionNameList())
self.assertEquals([], self.assertEquals([],
......
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