cubicweb: comparison test/unittest

equal deleted inserted replaced

-:73760bbb66bd
+:78438ad513ca
 req = self.request()
 req.create_entity('Tag', name=u'x')
 p = req.create_entity('Personne', nom=u'toto')
 oe = req.create_entity('Note', type=u'x')
 self.execute('SET T ecrit_par U WHERE T eid %(t)s, U eid %(u)s',
-{'t': oe.eid, 'u': p.eid}, ('t','u'))
+{'t': oe.eid, 'u': p.eid})
-self.execute('SET TAG tags X WHERE X eid %(x)s', {'x': oe.eid}, 'x')
+self.execute('SET TAG tags X WHERE X eid %(x)s', {'x': oe.eid})
 e = req.create_entity('Note', type=u'z')
 e.copy_relations(oe.eid)
 self.assertEquals(len(e.ecrit_par), 1)
 self.assertEquals(e.ecrit_par[0].eid, p.eid)
 self.assertEquals(len(e.reverse_tags), 1)
 req = self.request()
 p = req.create_entity('Personne', nom=u'toto')
 oe = req.create_entity('Note', type=u'x')
 self.schema['ecrit_par'].rdef('Note', 'Personne').composite = 'subject'
 self.execute('SET T ecrit_par U WHERE T eid %(t)s, U eid %(u)s',
-{'t': oe.eid, 'u': p.eid}, ('t','u'))
+{'t': oe.eid, 'u': p.eid})
 e = req.create_entity('Note', type=u'z')
 e.copy_relations(oe.eid)
 self.failIf(e.ecrit_par)
 self.failUnless(oe.ecrit_par)
 def test_copy_with_composite(self):
 user = self.user()
 adeleid = self.execute('INSERT EmailAddress X: X address "toto@logilab.org", U use_email X WHERE U login "admin"')[0][0]
-e = self.entity('Any X WHERE X eid %(x)s', {'x':user.eid}, 'x')
+e = self.execute('Any X WHERE X eid %(x)s', {'x': user.eid}).get_entity(0, 0)
 self.assertEquals(e.use_email[0].address, "toto@logilab.org")
 self.assertEquals(e.use_email[0].eid, adeleid)
 usereid = self.execute('INSERT CWUser X: X login "toto", X upassword "toto", X in_group G '
 'WHERE G name "users"')[0][0]
-e = self.entity('Any X WHERE X eid %(x)s', {'x':usereid}, 'x')
+e = self.execute('Any X WHERE X eid %(x)s', {'x': usereid}).get_entity(0, 0)
 e.copy_relations(user.eid)
 self.failIf(e.use_email)
 self.failIf(e.primary_email)
 def test_copy_with_non_initial_state(self):
 {'pwd': 'toto'}).get_entity(0, 0)
 self.commit()
 user.fire_transition('deactivate')
 self.commit()
 eid2 = self.execute('INSERT CWUser X: X login "tutu", X upassword %(pwd)s', {'pwd': 'toto'})[0][0]
-e = self.entity('Any X WHERE X eid %(x)s', {'x': eid2}, 'x')
+e = self.execute('Any X WHERE X eid %(x)s', {'x': eid2}).get_entity(0, 0)
 e.copy_relations(user.eid)
 self.commit()
 e.clear_related_cache('in_state', 'subject')
 self.assertEquals(e.state, 'activated')
 def test_related_cache_both(self):
-user = self.entity('Any X WHERE X eid %(x)s', {'x':self.user().eid}, 'x')
+user = self.execute('Any X WHERE X eid %(x)s', {'x':self.user().eid}).get_entity(0, 0)
 adeleid = self.execute('INSERT EmailAddress X: X address "toto@logilab.org", U use_email X WHERE U login "admin"')[0][0]
 self.commit()
 self.assertEquals(user._related_cache, {})
 email = user.primary_email[0]
 self.assertEquals(sorted(user._related_cache), ['primary_email_subject'])
 self.assertEquals(rql, 'Any S,AA,AB,AC,AD ORDERBY AA ASC '
 'WHERE NOT S use_email O, O eid %(x)s, S is CWUser, S login AA, S firstname AB, S surname AC, S modification_date AD')
 #rql = email.unrelated_rql('use_email', 'Person', 'object')[0]
 #self.assertEquals(rql, '')
 self.login('anon')
-email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}, 'x').get_entity(0, 0)
+email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}).get_entity(0, 0)
 rql = email.unrelated_rql('use_email', 'CWUser', 'object')[0]
 self.assertEquals(rql, 'Any S,AA,AB,AC,AD ORDERBY AA '
 'WHERE NOT S use_email O, O eid %(x)s, S is CWUser, S login AA, S firstname AB, S surname AC, S modification_date AD, '
 'A eid %(B)s, EXISTS(S identity A, NOT A in_group C, C name "guests", C is CWGroup)')
 #rql = email.unrelated_rql('use_email', 'Person', 'object')[0]
 related = [r.eid for r in e.tags]
 self.failUnlessEqual(related, [])
 unrelated = [r[0] for r in e.unrelated('tags', 'Personne', 'subject')]
 self.failUnless(p.eid in unrelated)
 self.execute('SET X tags Y WHERE X is Tag, Y is Personne')
-e = self.entity('Any X WHERE X is Tag')
+e = self.execute('Any X WHERE X is Tag').get_entity(0, 0)
 unrelated = [r[0] for r in e.unrelated('tags', 'Personne', 'subject')]
 self.failIf(p.eid in unrelated)
 def test_unrelated_limit(self):
 req = self.request()
 user = self.request().user
 rset = user.unrelated('use_email', 'EmailAddress', 'subject')
 self.assertEquals([x.address for x in rset.entities()], [u'hop'])
 self.create_user('toto')
 self.login('toto')
-email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}, 'x').get_entity(0, 0)
+email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}).get_entity(0, 0)
 rset = email.unrelated('use_email', 'CWUser', 'object')
 self.assertEquals([x.login for x in rset.entities()], ['toto'])
 user = self.request().user
 rset = user.unrelated('use_email', 'EmailAddress', 'subject')
 self.assertEquals([x.address for x in rset.entities()], ['hop'])
 user = self.execute('Any X WHERE X login "admin"').get_entity(0, 0)
 rset = user.unrelated('use_email', 'EmailAddress', 'subject')
 self.assertEquals([x.address for x in rset.entities()], [])
 self.login('anon')
-email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}, 'x').get_entity(0, 0)
+email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}).get_entity(0, 0)
 rset = email.unrelated('use_email', 'CWUser', 'object')
 self.assertEquals([x.login for x in rset.entities()], [])
 user = self.request().user
 rset = user.unrelated('use_email', 'EmailAddress', 'subject')
 self.assertEquals([x.address for x in rset.entities()], [])
 def test_complete_relation(self):
 session = self.session
 eid = session.execute(
 'INSERT TrInfo X: X comment "zou", X wf_info_for U, X from_state S1, X to_state S2 '
 'WHERE U login "admin", S1 name "activated", S2 name "deactivated"')[0][0]
-trinfo = self.entity('Any X WHERE X eid %(x)s', {'x': eid}, 'x')
+trinfo = self.execute('Any X WHERE X eid %(x)s', {'x': eid}).get_entity(0, 0)
 trinfo.complete()
 self.failUnless(isinstance(trinfo['creation_date'], datetime))
 self.failUnless(trinfo.relation_cached('from_state', 'subject'))
 self.failUnless(trinfo.relation_cached('to_state', 'subject'))
 self.failUnless(trinfo.relation_cached('wf_info_for', 'subject'))
 self.assertEquals(trinfo.by_transition, ())
 def test_request_cache(self):
 req = self.request()
-user = self.entity('CWUser X WHERE X login "admin"', req=req)
+user = self.execute('CWUser X WHERE X login "admin"', req=req).get_entity(0, 0)
 state = user.in_state[0]
-samestate = self.entity('State X WHERE X name "activated"', req=req)
+samestate = self.execute('State X WHERE X name "activated"', req=req).get_entity(0, 0)
 self.failUnless(state is samestate)
 def test_rest_path(self):
 req = self.request()
 note = req.create_entity('Note', type=u'z')
 req = self.request()
 person = req.create_entity('Personne', nom=u'di mascio', prenom=u'adrien')
 self.assertEquals(person.prenom, u'adrien')
 self.assertEquals(person.nom, u'di mascio')
 person.set_attributes(prenom=u'sylvain', nom=u'thénault')
-person = self.entity('Personne P') # XXX retreival needed ?
+person = self.execute('Personne P').get_entity(0, 0) # XXX retreival needed ?
 self.assertEquals(person.prenom, u'sylvain')
 self.assertEquals(person.nom, u'thénault')
 def test_metainformation_and_external_absolute_url(self):
 req = self.request()

changeset 5174	78438ad513ca
parent 4835	13b0b96d7982
child 5423	e15abfdcce38