test/unittest_selectors.py
changeset 5877 0c7b7b76a84f
parent 5561 58b05c314443
child 6046 3fd4a34c4a09
--- a/test/unittest_selectors.py	Fri Jul 02 19:14:48 2010 +0200
+++ b/test/unittest_selectors.py	Mon Jul 05 12:04:32 2010 +0200
@@ -22,7 +22,7 @@
 from cubicweb import Binary
 from cubicweb.devtools.testlib import CubicWebTC
 from cubicweb.appobject import Selector, AndSelector, OrSelector
-from cubicweb.selectors import implements, adaptable, match_user_groups
+from cubicweb.selectors import is_instance, adaptable, match_user_groups
 from cubicweb.interfaces import IDownloadable
 from cubicweb.web import action
 
@@ -92,12 +92,12 @@
         self.assertEquals(selector(None), 2)
 
     def test_search_selectors(self):
-        sel = implements('something')
-        self.assertIs(sel.search_selector(implements), sel)
+        sel = is_instance('something')
+        self.assertIs(sel.search_selector(is_instance), sel)
         csel = AndSelector(sel, Selector())
-        self.assertIs(csel.search_selector(implements), sel)
+        self.assertIs(csel.search_selector(is_instance), sel)
         csel = AndSelector(Selector(), sel)
-        self.assertIs(csel.search_selector(implements), sel)
+        self.assertIs(csel.search_selector(is_instance), sel)
 
     def test_inplace_and(self):
         selector = _1_()
@@ -141,15 +141,15 @@
         req = self.request()
         f = req.create_entity('File', data_name=u'hop.txt', data=Binary('hop'))
         rset = f.as_rset()
-        anyscore = implements('Any')(f.__class__, req, rset=rset)
+        anyscore = is_instance('Any')(f.__class__, req, rset=rset)
         idownscore = adaptable('IDownloadable')(f.__class__, req, rset=rset)
         self.failUnless(idownscore > anyscore, (idownscore, anyscore))
-        filescore = implements('File')(f.__class__, req, rset=rset)
+        filescore = is_instance('File')(f.__class__, req, rset=rset)
         self.failUnless(filescore > idownscore, (filescore, idownscore))
 
     def test_etype_inheritance_no_yams_inheritance(self):
         cls = self.vreg['etypes'].etype_class('Personne')
-        self.failIf(implements('Societe').score_class(cls, self.request()))
+        self.failIf(is_instance('Societe').score_class(cls, self.request()))
 
 
 class MatchUserGroupsTC(CubicWebTC):