diff -r f4d1d5d9ccbb -r 90f2f20367bc web/test/unittest_viewselector.py --- a/web/test/unittest_viewselector.py Tue Jul 27 12:36:03 2010 +0200 +++ b/web/test/unittest_viewselector.py Wed Nov 03 16:38:28 2010 +0100 @@ -22,7 +22,7 @@ from cubicweb.devtools.testlib import CubicWebTC from cubicweb import CW_SOFTWARE_ROOT as BASE, Binary, UnknownProperty -from cubicweb.selectors import (match_user_groups, implements, +from cubicweb.selectors import (match_user_groups, is_instance, specified_etype_implements, rql_condition, traced_selection) from cubicweb.web import NoSelectableObject @@ -41,7 +41,7 @@ SITEACTIONS = [actions.SiteConfigurationAction, actions.ManageAction, schema.ViewSchemaAction, - actions.SiteInfoAction] + debug.SiteInfoAction] FOOTERACTIONS = [wdoc.HelpAction, wdoc.ChangeLogAction, wdoc.AboutAction, @@ -65,7 +65,7 @@ except AttributeError: return if registry == 'hooks': - self.assertEquals(len(content), expected, content) + self.assertEqual(len(content), expected, content) return try: self.assertSetEqual(content.keys(), expected) @@ -408,27 +408,37 @@ tableview.TableView) def test_interface_selector(self): - image = self.request().create_entity('Image', data_name=u'bim.png', data=Binary('bim')) + image = self.request().create_entity('File', data_name=u'bim.png', data=Binary('bim')) # image primary view priority req = self.request() - rset = req.execute('Image X WHERE X data_name "bim.png"') + rset = req.execute('File X WHERE X data_name "bim.png"') self.assertIsInstance(self.vreg['views'].select('primary', req, rset=rset), idownloadable.IDownloadablePrimaryView) def test_score_entity_selector(self): - image = self.request().create_entity('Image', data_name=u'bim.png', data=Binary('bim')) - # image primary view priority + image = self.request().create_entity('File', data_name=u'bim.png', data=Binary('bim')) + # image/ehtml primary view priority req = self.request() - rset = req.execute('Image X WHERE X data_name "bim.png"') + rset = req.execute('File X WHERE X data_name "bim.png"') self.assertIsInstance(self.vreg['views'].select('image', req, rset=rset), idownloadable.ImageView) - fileobj = self.request().create_entity('File', data_name=u'bim.txt', data=Binary('bim')) - # image primary view priority + self.assertRaises(NoSelectableObject, self.vreg['views'].select, 'ehtml', req, rset=rset) + + fileobj = self.request().create_entity('File', data_name=u'bim.html', data=Binary('bam