diff -r 58c519e5a31f -r b2530e3e0afb web/test/unittest_viewselector.py --- a/web/test/unittest_viewselector.py Tue Aug 11 17:04:59 2009 +0200 +++ b/web/test/unittest_viewselector.py Tue Aug 11 17:13:32 2009 +0200 @@ -4,7 +4,7 @@ """ from logilab.common.testlib import unittest_main -from cubicweb.devtools.apptest import EnvBasedTC +from cubicweb.devtools.testlib import CubicWebTC from cubicweb import CW_SOFTWARE_ROOT as BASE, Binary from cubicweb.selectors import (match_user_groups, implements, specified_etype_implements, rql_condition, @@ -26,7 +26,7 @@ ('siteinfo', actions.SiteInfoAction), ] -class ViewSelectorTC(EnvBasedTC): +class ViewSelectorTC(CubicWebTC): def setup_database(self): self.add_entity('BlogEntry', title=u"une news !", content=u"cubicweb c'est beau") @@ -78,12 +78,12 @@ ('systempropertiesform', cwproperties.SystemCWPropertiesForm)]) def test_possible_views_noresult(self): - rset, req = self.env.get_rset_and_req('Any X WHERE X eid 999999') + rset, req = self.rset_and_req('Any X WHERE X eid 999999') self.assertListEqual(self.pviews(req, rset), []) def test_possible_views_one_egroup(self): - rset, req = self.env.get_rset_and_req('CWGroup X WHERE X name "managers"') + rset, req = self.rset_and_req('CWGroup X WHERE X name "managers"') self.assertListEqual(self.pviews(req, rset), [('adaptedlist', baseviews.AdaptedListView), ('csvexport', csvexport.CSVRsetView), @@ -106,7 +106,7 @@ ]) def test_possible_views_multiple_egroups(self): - rset, req = self.env.get_rset_and_req('CWGroup X') + rset, req = self.rset_and_req('CWGroup X') self.assertListEqual(self.pviews(req, rset), [('adaptedlist', baseviews.AdaptedListView), ('csvexport', csvexport.CSVRsetView), @@ -130,16 +130,16 @@ def test_propertiesform_admin(self): assert self.vreg['views']['propertiesform'] - rset1, req1 = self.env.get_rset_and_req('CWUser X WHERE X login "admin"') - rset2, req2 = self.env.get_rset_and_req('CWUser X WHERE X login "anon"') + rset1, req1 = self.rset_and_req('CWUser X WHERE X login "admin"') + rset2, req2 = self.rset_and_req('CWUser X WHERE X login "anon"') self.failUnless(self.vreg['views'].select('propertiesform', req1, rset=None)) self.failUnless(self.vreg['views'].select('propertiesform', req1, rset=rset1)) self.failUnless(self.vreg['views'].select('propertiesform', req2, rset=rset2)) def test_propertiesform_anon(self): self.login('anon') - rset1, req1 = self.env.get_rset_and_req('CWUser X WHERE X login "admin"') - rset2, req2 = self.env.get_rset_and_req('CWUser X WHERE X login "anon"') + rset1, req1 = self.rset_and_req('CWUser X WHERE X login "admin"') + rset2, req2 = self.rset_and_req('CWUser X WHERE X login "anon"') self.assertRaises(NoSelectableObject, self.vreg['views'].select, 'propertiesform', req1, rset=None) self.assertRaises(NoSelectableObject, self.vreg['views'].select, 'propertiesform', req1, rset=rset1) self.assertRaises(NoSelectableObject, self.vreg['views'].select, 'propertiesform', req1, rset=rset2) @@ -147,14 +147,14 @@ def test_propertiesform_jdoe(self): self.create_user('jdoe') self.login('jdoe') - rset1, req1 = self.env.get_rset_and_req('CWUser X WHERE X login "admin"') - rset2, req2 = self.env.get_rset_and_req('CWUser X WHERE X login "jdoe"') + rset1, req1 = self.rset_and_req('CWUser X WHERE X login "admin"') + rset2, req2 = self.rset_and_req('CWUser X WHERE X login "jdoe"') self.failUnless(self.vreg['views'].select('propertiesform', req1, rset=None)) self.assertRaises(NoSelectableObject, self.vreg['views'].select, 'propertiesform', req1, rset=rset1) self.failUnless(self.vreg['views'].select('propertiesform', req2, rset=rset2)) def test_possible_views_multiple_different_types(self): - rset, req = self.env.get_rset_and_req('Any X') + rset, req = self.rset_and_req('Any X') self.assertListEqual(self.pviews(req, rset), [('csvexport', csvexport.CSVRsetView), ('ecsvexport', csvexport.CSVEntityView), @@ -176,7 +176,7 @@ ]) def test_possible_views_any_rset(self): - rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N') + rset, req = self.rset_and_req('Any N, X WHERE X in_group Y, Y name N') self.assertListEqual(self.pviews(req, rset), [('csvexport', csvexport.CSVRsetView), ('editable-table', tableview.EditableTableView), @@ -185,7 +185,7 @@ ]) def test_possible_views_multiple_eusers(self): - rset, req = self.env.get_rset_and_req('CWUser X') + rset, req = self.rset_and_req('CWUser X') self.assertListEqual(self.pviews(req, rset), [('adaptedlist', baseviews.AdaptedListView), ('csvexport', csvexport.CSVRsetView), @@ -218,14 +218,14 @@ }) def test_possible_actions_no_entity(self): - rset, req = self.env.get_rset_and_req('Any X WHERE X eid 999999') + rset, req = self.rset_and_req('Any X WHERE X eid 999999') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, }) def test_possible_actions_same_type_entities(self): - rset, req = self.env.get_rset_and_req('CWGroup X') + rset, req = self.rset_and_req('CWGroup X') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, @@ -235,7 +235,7 @@ }) def test_possible_actions_different_types_entities(self): - rset, req = self.env.get_rset_and_req('Any X') + rset, req = self.rset_and_req('Any X') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, @@ -243,13 +243,13 @@ }) def test_possible_actions_final_entities(self): - rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N') + rset, req = self.rset_and_req('Any N, X WHERE X in_group Y, Y name N') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS}) def test_possible_actions_eetype_cwuser_entity(self): - rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWUser"') + rset, req = self.rset_and_req('CWEType X WHERE X name "CWUser"') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, @@ -291,7 +291,7 @@ self.vreg['views'].select, 'table', req, rset=rset) # no entity - rset, req = self.env.get_rset_and_req('Any X WHERE X eid 999999') + rset, req = self.rset_and_req('Any X WHERE X eid 999999') self.failUnlessRaises(NoSelectableObject, self.vreg['views'].select, 'index', req, rset=rset) self.failUnlessRaises(NoSelectableObject, @@ -301,7 +301,7 @@ self.failUnlessRaises(NoSelectableObject, self.vreg['views'].select, 'table', req, rset=rset) # one entity - rset, req = self.env.get_rset_and_req('CWGroup X WHERE X name "managers"') + rset, req = self.rset_and_req('CWGroup X WHERE X name "managers"') self.assertIsInstance(self.vreg['views'].select('primary', req, rset=rset), primary.PrimaryView) self.assertIsInstance(self.vreg['views'].select('list', req, rset=rset), @@ -315,7 +315,7 @@ self.failUnlessRaises(NoSelectableObject, self.vreg['views'].select, 'index', req, rset=rset) # list of entities of the same type - rset, req = self.env.get_rset_and_req('CWGroup X') + rset, req = self.rset_and_req('CWGroup X') self.assertIsInstance(self.vreg['views'].select('primary', req, rset=rset), primary.PrimaryView) self.assertIsInstance(self.vreg['views'].select('list', req, rset=rset), @@ -325,7 +325,7 @@ self.failUnlessRaises(NoSelectableObject, self.vreg['views'].select, 'creation', req, rset=rset) # list of entities of different types - rset, req = self.env.get_rset_and_req('Any X') + rset, req = self.rset_and_req('Any X') self.assertIsInstance(self.vreg['views'].select('primary', req, rset=rset), primary.PrimaryView) self.assertIsInstance(self.vreg['views'].select('list', req, rset=rset), @@ -337,7 +337,7 @@ self.failUnlessRaises(NoSelectableObject, self.vreg['views'].select, 'index', req, rset=rset) # whatever - rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N') + rset, req = self.rset_and_req('Any N, X WHERE X in_group Y, Y name N') self.assertIsInstance(self.vreg['views'].select('table', req, rset=rset), tableview.TableView) self.failUnlessRaises(NoSelectableObject, @@ -351,7 +351,7 @@ self.failUnlessRaises(NoSelectableObject, self.vreg['views'].select, 'edition', req, rset=rset) # mixed query - rset, req = self.env.get_rset_and_req('Any U,G WHERE U is CWUser, G is CWGroup') + rset, req = self.rset_and_req('Any U,G WHERE U is CWUser, G is CWGroup') self.failUnlessRaises(NoSelectableObject, self.vreg['views'].select, 'edition', req, rset=rset) self.failUnlessRaises(NoSelectableObject, @@ -362,7 +362,7 @@ def test_interface_selector(self): image = self.add_entity('Image', name=u'bim.png', data=Binary('bim')) # image primary view priority - rset, req = self.env.get_rset_and_req('Image X WHERE X name "bim.png"') + rset, req = self.rset_and_req('Image X WHERE X name "bim.png"') self.assertIsInstance(self.vreg['views'].select('primary', req, rset=rset), idownloadable.IDownloadablePrimaryView) @@ -370,12 +370,12 @@ def test_score_entity_selector(self): image = self.add_entity('Image', name=u'bim.png', data=Binary('bim')) # image primary view priority - rset, req = self.env.get_rset_and_req('Image X WHERE X name "bim.png"') + rset, req = self.rset_and_req('Image X WHERE X name "bim.png"') self.assertIsInstance(self.vreg['views'].select('image', req, rset=rset), idownloadable.ImageView) fileobj = self.add_entity('File', name=u'bim.txt', data=Binary('bim')) # image primary view priority - rset, req = self.env.get_rset_and_req('File X WHERE X name "bim.txt"') + rset, req = self.rset_and_req('File X WHERE X name "bim.txt"') self.assertRaises(NoSelectableObject, self.vreg['views'].select, 'image', req, rset=rset) @@ -385,7 +385,7 @@ rset = None req = self.request() else: - rset, req = self.env.get_rset_and_req(rql) + rset, req = self.rset_and_req(rql) try: self.vreg['views'].render(vid, req, rset=rset, **args) except: @@ -438,7 +438,7 @@ del self.vreg['actions']['testaction'] def test(self): - rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWEType"') + rset, req = self.rset_and_req('CWEType X WHERE X name "CWEType"') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, @@ -449,7 +449,7 @@ ('testaction', CWETypeRQLAction), ], }) - rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWRType"') + rset, req = self.rset_and_req('CWEType X WHERE X name "CWRType"') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS,