cubicweb: comparison test/unittest

equal deleted inserted replaced

-:1e0235478403
+:31a1813d53f3
 torestore.append(cm)
 try:
 # testing basic fetch_attrs attribute
 self.assertEqual(Personne.fetch_rql(user),
 'Any X,AA,AB,AC ORDERBY AA '
-'WHERE X is Personne, X nom AA, X prenom AB, X modification_date AC')
+'WHERE X is_instance_of Personne, X nom AA, X prenom AB, X modification_date AC')
 # testing unknown attributes
 Personne.fetch_attrs = ('bloug', 'beep')
-self.assertEqual(Personne.fetch_rql(user), 'Any X WHERE X is Personne')
+self.assertEqual(Personne.fetch_rql(user), 'Any X WHERE X is_instance_of Personne')
 # testing one non final relation
 Personne.fetch_attrs = ('nom', 'prenom', 'travaille')
 self.assertEqual(Personne.fetch_rql(user),
 'Any X,AA,AB,AC,AD ORDERBY AA '
-'WHERE X is Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD')
+'WHERE X is_instance_of Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD')
 # testing two non final relations
 Personne.fetch_attrs = ('nom', 'prenom', 'travaille', 'evaluee')
 self.assertEqual(Personne.fetch_rql(user),
 'Any X,AA,AB,AC,AD,AE ORDERBY AA '
-'WHERE X is Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD, '
+'WHERE X is_instance_of Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD, '
 'X evaluee AE?')
 # testing one non final relation with recursion
 Personne.fetch_attrs = ('nom', 'prenom', 'travaille')
 Societe.fetch_attrs = ('nom', 'evaluee')
 self.assertEqual(Personne.fetch_rql(user),
 'Any X,AA,AB,AC,AD,AE,AF ORDERBY AA,AF DESC '
-'WHERE X is Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD, '
+'WHERE X is_instance_of Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD, '
 'AC evaluee AE?, AE modification_date AF'
 )
 # testing symmetric relation
 Personne.fetch_attrs = ('nom', 'connait')
 self.assertEqual(Personne.fetch_rql(user), 'Any X,AA,AB ORDERBY AA '
-'WHERE X is Personne, X nom AA, X connait AB?')
+'WHERE X is_instance_of Personne, X nom AA, X connait AB?')
 # testing optional relation
 peschema.subjrels['travaille'].rdef(peschema, seschema).cardinality = '?*'
 Personne.fetch_attrs = ('nom', 'prenom', 'travaille')
 Societe.fetch_attrs = ('nom',)
 self.assertEqual(Personne.fetch_rql(user),
-'Any X,AA,AB,AC,AD ORDERBY AA WHERE X is Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD')
+'Any X,AA,AB,AC,AD ORDERBY AA WHERE X is_instance_of Personne, X nom AA, X prenom AB, X travaille AC?, AC nom AD')
 # testing relation with cardinality > 1
 peschema.subjrels['travaille'].rdef(peschema, seschema).cardinality = '**'
 self.assertEqual(Personne.fetch_rql(user),
-'Any X,AA,AB ORDERBY AA WHERE X is Personne, X nom AA, X prenom AB')
+'Any X,AA,AB ORDERBY AA WHERE X is_instance_of Personne, X nom AA, X prenom AB')
 # XXX test unauthorized attribute
 finally:
 # fetch_attrs restored by generic tearDown
 for cm in torestore:
 cm.__exit__(None, None, None)
 def test_unrelated_rql_security_1_manager(self):
 user = self.request().user
 rql = user.cw_unrelated_rql('use_email', 'EmailAddress', 'subject')[0]
 self.assertEqual(rql, 'Any O,AA,AB,AC ORDERBY AC DESC '
 'WHERE NOT A use_email O, S eid %(x)s, '
-'O is EmailAddress, O address AA, O alias AB, O modification_date AC')
+'O is_instance_of EmailAddress, O address AA, O alias AB, O modification_date AC')
 def test_unrelated_rql_security_1_user(self):
 req = self.request()
 self.create_user(req, 'toto')
 self.login('toto')
 user = req.user
 rql = user.cw_unrelated_rql('use_email', 'EmailAddress', 'subject')[0]
 self.assertEqual(rql, 'Any O,AA,AB,AC ORDERBY AC DESC '
 'WHERE NOT A use_email O, S eid %(x)s, '
-'O is EmailAddress, O address AA, O alias AB, O modification_date AC')
+'O is_instance_of EmailAddress, O address AA, O alias AB, O modification_date AC')
 user = self.execute('Any X WHERE X login "admin"').get_entity(0, 0)
 rql = user.cw_unrelated_rql('use_email', 'EmailAddress', 'subject')[0]
 self.assertEqual(rql, 'Any O,AA,AB,AC ORDERBY AC DESC '
 'WHERE NOT A use_email O, S eid %(x)s, '
 'O is EmailAddress, O address AA, O alias AB, O modification_date AC, AD eid %(AE)s, '
 def test_unrelated_rql_security_2(self):
 email = self.execute('INSERT EmailAddress X: X address "hop"').get_entity(0, 0)
 rql = email.cw_unrelated_rql('use_email', 'CWUser', 'object')[0]
 self.assertEqual(rql, 'Any S,AA,AB,AC,AD ORDERBY AA '
-'WHERE NOT S use_email O, O eid %(x)s, S is CWUser, '
+'WHERE NOT S use_email O, O eid %(x)s, S is_instance_of CWUser, '
 'S login AA, S firstname AB, S surname AC, S modification_date AD')
 self.login('anon')
 rperms = self.schema['EmailAddress'].permissions['read']
 clear_cache(self.schema['EmailAddress'], 'get_groups')
 clear_cache(self.schema['EmailAddress'], 'get_rqlexprs')
 def test_unrelated_rql_constraints_creation_subject(self):
 person = self.vreg['etypes'].etype_class('Personne')(self.request())
 rql = person.cw_unrelated_rql('connait', 'Personne', 'subject')[0]
 self.assertEqual(
 rql, 'Any O,AA,AB,AC ORDERBY AC DESC WHERE '
-'O is Personne, O nom AA, O prenom AB, O modification_date AC')
+'O is_instance_of Personne, O nom AA, O prenom AB, O modification_date AC')
 def test_unrelated_rql_constraints_creation_object(self):
 person = self.vreg['etypes'].etype_class('Personne')(self.request())
 rql = person.cw_unrelated_rql('connait', 'Personne', 'object')[0]
 self.assertEqual(
 perm_rrqle = RRQLExpression('U has_update_permission S')
 with self.temporary_permissions((rdef, {'add': (perm_rrqle,)})):
 person = self.vreg['etypes'].etype_class('Personne')(self.request())
 rql = person.cw_unrelated_rql('connait', 'Personne', 'subject')[0]
 self.assertEqual(rql, 'Any O,AA,AB,AC ORDERBY AC DESC WHERE '
-'O is Personne, O nom AA, O prenom AB, '
+'O is_instance_of Personne, O nom AA, O prenom AB, '
 'O modification_date AC')
 def test_unrelated_rql_constraints_edition_subject(self):
 person = self.request().create_entity('Personne', nom=u'sylvain')
 rql = person.cw_unrelated_rql('connait', 'Personne', 'subject')[0]
 soc = req.create_entity('Societe', nom=u'logilab')
 lt_infos = {('contrat_exclusif', 'object'): [soc.eid]}
 rql, args = person.cw_unrelated_rql('actionnaire', 'Societe', 'subject',
 lt_infos=lt_infos)
 self.assertEqual(u'Any O ORDERBY O WHERE NOT A actionnaire O, '
-u'O is Societe, NOT EXISTS(O eid %(O)s), '
+u'O is_instance_of Societe, NOT EXISTS(O eid %(O)s), '
 u'A is Personne', rql)
 self.assertEqual({'O': soc.eid}, args)
 def test_unrelated_rql_o_linkto_s(self):
 req = self.request()
 person = req.create_entity('Personne', nom=u'florent')
 lt_infos = {('contrat_exclusif', 'subject'): [person.eid]}
 rql, args = soc.cw_unrelated_rql('actionnaire', 'Personne', 'object',
 lt_infos=lt_infos)
 self.assertEqual(u'Any S ORDERBY S WHERE NOT S actionnaire A, '
-u'S is Personne, NOT EXISTS(S eid %(S)s), '
+u'S is_instance_of Personne, NOT EXISTS(S eid %(S)s), '
 u'A is Societe', rql)
 self.assertEqual({'S': person.eid}, args)
 def test_unrelated_rql_o_linkto_o(self):
 req = self.request()
 person = req.create_entity('Personne', nom=u'florent')
 lt_infos = {('actionnaire', 'object'): [person.eid]}
 rql, args = soc.cw_unrelated_rql('dirige', 'Personne', 'object',
 lt_infos=lt_infos)
 self.assertEqual(u'Any S ORDERBY S WHERE NOT S dirige A, '
-u'S is Personne, EXISTS(S eid %(S)s), '
+u'S is_instance_of Personne, EXISTS(S eid %(S)s), '
 u'A is Societe', rql)
 self.assertEqual({'S': person.eid}, args)
 def test_unrelated_rql_s_linkto_s_no_info(self):
 req = self.request()
 person = self.vreg['etypes'].etype_class('Personne')(req)
 self.vreg['etypes'].etype_class('Personne').fetch_attrs = ()
 soc = req.create_entity('Societe', nom=u'logilab')
 rql, args = person.cw_unrelated_rql('associe', 'Personne', 'subject')
-self.assertEqual(u'Any O ORDERBY O WHERE O is Personne', rql)
+self.assertEqual(u'Any O ORDERBY O WHERE O is_instance_of Personne', rql)
 self.assertEqual({}, args)
 def test_unrelated_rql_s_linkto_s_unused_info(self):
 req = self.request()
 person = self.vreg['etypes'].etype_class('Personne')(req)
 self.vreg['etypes'].etype_class('Personne').fetch_attrs = ()
 other_p = req.create_entity('Personne', nom=u'titi')
 lt_infos = {('dirige', 'subject'): [other_p.eid]}
 rql, args = person.cw_unrelated_rql('associe', 'Personne', 'subject',
 lt_infos=lt_infos)
-self.assertEqual(u'Any O ORDERBY O WHERE O is Personne', rql)
+self.assertEqual(u'Any O ORDERBY O WHERE O is_instance_of Personne', rql)
 def test_unrelated_base(self):
 req = self.request()
 p = req.create_entity('Personne', nom=u'di mascio', prenom=u'adrien')
 e = req.create_entity('Tag', name=u'x')

changeset 9359	31a1813d53f3
parent 9340	b1e933b0e850
child 9440	6880674c1a26