cubicweb: comparison test/unittest

equal deleted inserted replaced

-:1bb43e31032d
+:a14b6562082b
 from cubicweb import Binary, Unauthorized
 from cubicweb.devtools.testlib import CubicWebTC
 from cubicweb.mttransforms import HAS_TAL
 from cubicweb.entities import fetch_config
 from cubicweb.uilib import soup2xhtml
+from cubicweb.schema import RQLVocabularyConstraint
 class EntityTC(CubicWebTC):
 def setUp(self):
 super(EntityTC, self).setUp()
 self.backup_dict = {}
 for cls in self.vreg['etypes'].iter_classes():
-self.backup_dict[cls] = (cls.fetch_attrs, cls.fetch_order)
+self.backup_dict[cls] = (cls.fetch_attrs, cls.cw_fetch_order)
 def tearDown(self):
 super(EntityTC, self).tearDown()
 for cls in self.vreg['etypes'].iter_classes():
-cls.fetch_attrs, cls.fetch_order = self.backup_dict[cls]
+cls.fetch_attrs, cls.cw_fetch_order = self.backup_dict[cls]
 def test_boolean_value(self):
 e = self.vreg['etypes'].etype_class('CWUser')(self.request())
-self.failUnless(e)
+self.assertTrue(e)
 def test_yams_inheritance(self):
 from entities import Note
 e = self.vreg['etypes'].etype_class('SubNote')(self.request())
 self.assertIsInstance(e, Note)
 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})
 e = req.create_entity('Note', type=u'z')
 e.copy_relations(oe.eid)
-self.failIf(e.ecrit_par)
+self.assertFalse(e.ecrit_par)
-self.failUnless(oe.ecrit_par)
+self.assertTrue(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.execute('Any X WHERE X eid %(x)s', {'x': user.eid}).get_entity(0, 0)
 self.assertEqual(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.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.assertFalse(e.use_email)
-self.failIf(e.primary_email)
+self.assertFalse(e.primary_email)
 def test_copy_with_non_initial_state(self):
 user = self.user()
 user = self.execute('INSERT CWUser X: X login "toto", X upassword %(pwd)s, X in_group G WHERE G name "users"',
 {'pwd': 'toto'}).get_entity(0, 0)
 self.assertEqual(sorted(user._cw_related_cache), ['primary_email_subject'])
 self.assertEqual(email._cw_related_cache.keys(), ['primary_email_object'])
 groups = user.in_group
 self.assertEqual(sorted(user._cw_related_cache), ['in_group_subject', 'primary_email_subject'])
 for group in groups:
-self.failIf('in_group_subject' in group._cw_related_cache, group._cw_related_cache.keys())
+self.assertFalse('in_group_subject' in group._cw_related_cache, group._cw_related_cache.keys())
 def test_related_limit(self):
 req = self.request()
 p = req.create_entity('Personne', nom=u'di mascio', prenom=u'adrien')
 for tag in u'abcd':
 def test_cw_instantiate_relation(self):
 req = self.request()
 p1 = req.create_entity('Personne', nom=u'di')
 p2 = req.create_entity('Personne', nom=u'mascio')
+t = req.create_entity('Tag', name=u't0', tags=[])
+self.assertItemsEqual(t.tags, [])
 t = req.create_entity('Tag', name=u't1', tags=p1)
 self.assertItemsEqual(t.tags, [p1])
 t = req.create_entity('Tag', name=u't2', tags=p1.eid)
 self.assertItemsEqual(t.tags, [p1])
 t = req.create_entity('Tag', name=u't3', tags=[p1, p2.eid])
 cm.__enter__()
 torestore.append(cm)
 try:
 # testing basic fetch_attrs attribute
 self.assertEqual(Personne.fetch_rql(user),
-'Any X,AA,AB,AC ORDERBY AA ASC '
+'Any X,AA,AB,AC ORDERBY AA '
 'WHERE X is 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')
 # 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 ASC '
+'Any X,AA,AB,AC,AD ORDERBY AA '
 'WHERE X is 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 ASC '
+'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, '
 '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 ASC,AF DESC '
+'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, '
 '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 ASC '
+self.assertEqual(Personne.fetch_rql(user), 'Any X,AA,AB ORDERBY AA '
 'WHERE X is 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 ASC 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 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 ASC WHERE X is Personne, X nom AA, X prenom AB')
+'Any X,AA,AB ORDERBY AA WHERE X is 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_related_rql_base(self):
 Personne = self.vreg['etypes'].etype_class('Personne')
 Note = self.vreg['etypes'].etype_class('Note')
 SubNote = self.vreg['etypes'].etype_class('SubNote')
-self.failUnless(issubclass(self.vreg['etypes'].etype_class('SubNote'), Note))
+self.assertTrue(issubclass(self.vreg['etypes'].etype_class('SubNote'), Note))
-Personne.fetch_attrs, Personne.fetch_order = fetch_config(('nom', 'type'))
+Personne.fetch_attrs, Personne.cw_fetch_order = fetch_config(('nom', 'type'))
-Note.fetch_attrs, Note.fetch_order = fetch_config(('type',))
+Note.fetch_attrs, Note.cw_fetch_order = fetch_config(('type',))
-SubNote.fetch_attrs, SubNote.fetch_order = fetch_config(('type',))
+SubNote.fetch_attrs, SubNote.cw_fetch_order = fetch_config(('type',))
 p = self.request().create_entity('Personne', nom=u'pouet')
 self.assertEqual(p.cw_related_rql('evaluee'),
-'Any X,AA,AB ORDERBY AA ASC WHERE E eid %(x)s, E evaluee X, '
+'Any X,AA,AB ORDERBY AA WHERE E eid %(x)s, E evaluee X, '
 'X type AA, X modification_date AB')
-Personne.fetch_attrs, Personne.fetch_order = fetch_config(('nom', ))
+n = self.request().create_entity('Note')
+self.assertEqual(n.cw_related_rql('evaluee', role='object',
+targettypes=('Societe', 'Personne')),
+"Any X,AA ORDERBY AB DESC WHERE E eid %(x)s, X evaluee E, "
+"X is IN(Personne, Societe), X nom AA, "
+"X modification_date AB")
+Personne.fetch_attrs, Personne.cw_fetch_order = fetch_config(('nom', ))
 # XXX
 self.assertEqual(p.cw_related_rql('evaluee'),
 'Any X,AA ORDERBY AA DESC '
 'WHERE E eid %(x)s, E evaluee X, X modification_date AA')
 tag = self.vreg['etypes'].etype_class('Tag')(self.request())
 self.assertEqual(tag.cw_related_rql('tags', 'subject'),
 'Any X,AA ORDERBY AA DESC '
 'WHERE E eid %(x)s, E tags X, X modification_date AA')
 self.assertEqual(tag.cw_related_rql('tags', 'subject', ('Personne',)),
-'Any X,AA,AB ORDERBY AA ASC '
+'Any X,AA,AB ORDERBY AA '
-'WHERE E eid %(x)s, E tags X, X is IN (Personne), X nom AA, '
+'WHERE E eid %(x)s, E tags X, X is Personne, X nom AA, '
 'X modification_date AB')
 def test_related_rql_ambiguous_cant_use_fetch_order(self):
 tag = self.vreg['etypes'].etype_class('Tag')(self.request())
 for ttype in self.schema['tags'].objects():
 self.vreg['etypes'].etype_class(ttype).fetch_attrs = ('modification_date',)
 self.assertEqual(tag.cw_related_rql('tags', 'subject'),
 'Any X,AA ORDERBY AA DESC '
 'WHERE E eid %(x)s, E tags X, X modification_date AA')
-def test_related_rql_cant_fetch_ambiguous_rtype(self):
+def test_related_rql_fetch_ambiguous_rtype(self):
 soc_etype = self.vreg['etypes'].etype_class('Societe')
 soc = soc_etype(self.request())
 soc_etype.fetch_attrs = ('fournit',)
 self.vreg['etypes'].etype_class('Service').fetch_attrs = ('fabrique_par',)
 self.vreg['etypes'].etype_class('Produit').fetch_attrs = ('fabrique_par',)
 self.vreg['etypes'].etype_class('Usine').fetch_attrs = ('lieu',)
 self.vreg['etypes'].etype_class('Personne').fetch_attrs = ('nom',)
-# XXX should be improved: we could fetch fabrique_par object too
 self.assertEqual(soc.cw_related_rql('fournit', 'subject'),
-'Any X WHERE E eid %(x)s, E fournit X')
+'Any X,A WHERE E eid %(x)s, E fournit X, X fabrique_par A')
 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 EXISTS(ZZ use_email O), S eid %(x)s, '
+'WHERE NOT A use_email O, S eid %(x)s, '
 'O is 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 EXISTS(ZZ use_email O), S eid %(x)s, '
+'WHERE NOT A use_email O, S eid %(x)s, '
 'O is 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 EXISTS(ZZ use_email O, ZZ is CWUser), S eid %(x)s, '
+'WHERE NOT A use_email O, S eid %(x)s, '
-'O is EmailAddress, O address AA, O alias AB, O modification_date AC, A eid %(B)s, '
+'O is EmailAddress, O address AA, O alias AB, O modification_date AC, AD eid %(AE)s, '
-'EXISTS(S identity A, NOT A in_group C, C name "guests", C is CWGroup)')
+'EXISTS(S identity AD, NOT AD in_group AF, AF name "guests", AF is CWGroup), A is CWUser')
 def test_unrelated_rql_security_1_anon(self):
 self.login('anon')
 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 EXISTS(ZZ use_email O, ZZ is CWUser), S eid %(x)s, '
+'WHERE NOT A use_email O, S eid %(x)s, '
-'O is EmailAddress, O address AA, O alias AB, O modification_date AC, A eid %(B)s, '
+'O is EmailAddress, O address AA, O alias AB, O modification_date AC, AD eid %(AE)s, '
-'EXISTS(S identity A, NOT A in_group C, C name "guests", C is CWGroup)')
+'EXISTS(S identity AD, NOT AD in_group AF, AF name "guests", AF is CWGroup), A is CWUser')
 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 EXISTS(S use_email O), O eid %(x)s, S is CWUser, '
+'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')
 self.login('anon')
 email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}).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 EXISTS(S use_email O), O eid %(x)s, S is CWUser, '
+'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)')
+'AE eid %(AF)s, EXISTS(S identity AE, NOT AE in_group AG, AG name "guests", AG is CWGroup)')
 def test_unrelated_rql_security_nonexistant(self):
 self.login('anon')
 email = self.vreg['etypes'].etype_class('EmailAddress')(self.request())
 rql = email.cw_unrelated_rql('use_email', 'CWUser', 'object')[0]
 self.assertEqual(rql, 'Any S,AA,AB,AC,AD ORDERBY AA '
 'WHERE 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)')
+'AE eid %(AF)s, EXISTS(S identity AE, NOT AE in_group AG, AG name "guests", AG is CWGroup)')
 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(
 person = self.vreg['etypes'].etype_class('Personne')(self.request())
 rql = person.cw_unrelated_rql('connait', 'Personne', 'object')[0]
 self.assertEqual(
 rql, 'Any S,AA,AB,AC ORDERBY AC DESC WHERE '
 'S is Personne, S nom AA, S prenom AB, S modification_date AC, '
-'NOT (S connait A, A nom "toto"), A is Personne, EXISTS(S travaille B, B nom "tutu")')
+'NOT (S connait AD, AD nom "toto"), AD is Personne, '
+'EXISTS(S travaille AE, AE nom "tutu")')
 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]
 self.assertEqual(
 rql, 'Any O,AA,AB,AC ORDERBY AC DESC WHERE '
-'NOT EXISTS(S connait O), S eid %(x)s, O is Personne, '
+'NOT S connait O, S eid %(x)s, O is Personne, '
 'O nom AA, O prenom AB, O modification_date AC, '
 'NOT S identity O')
 def test_unrelated_rql_constraints_edition_object(self):
 person = self.request().create_entity('Personne', nom=u'sylvain')
 rql = person.cw_unrelated_rql('connait', 'Personne', 'object')[0]
 self.assertEqual(
 rql, 'Any S,AA,AB,AC ORDERBY AC DESC WHERE '
-'NOT EXISTS(S connait O), O eid %(x)s, S is Personne, '
+'NOT S connait O, O eid %(x)s, S is Personne, '
 'S nom AA, S prenom AB, S modification_date AC, '
-'NOT S identity O, NOT (S connait A, A nom "toto"), '
+'NOT S identity O, NOT (S connait AD, AD nom "toto"), '
-'EXISTS(S travaille B, B nom "tutu")')
+'EXISTS(S travaille AE, AE nom "tutu")')
+def test_unrelated_rql_s_linkto_s(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')
+lt_infos = {('actionnaire', 'subject'): [soc.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, '
+u'EXISTS(AA eid %(SOC)s, O actionnaire AA)', rql)
+self.assertEqual({'SOC': soc.eid}, args)
+def test_unrelated_rql_s_linkto_o(self):
+req = self.request()
+person = self.vreg['etypes'].etype_class('Personne')(req)
+self.vreg['etypes'].etype_class('Societe').fetch_attrs = ()
+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'A is Personne', rql)
+self.assertEqual({'O': soc.eid}, args)
+def test_unrelated_rql_o_linkto_s(self):
+req = self.request()
+soc = self.vreg['etypes'].etype_class('Societe')(req)
+self.vreg['etypes'].etype_class('Personne').fetch_attrs = ()
+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'A is Societe', rql)
+self.assertEqual({'S': person.eid}, args)
+def test_unrelated_rql_o_linkto_o(self):
+req = self.request()
+soc = self.vreg['etypes'].etype_class('Societe')(req)
+self.vreg['etypes'].etype_class('Personne').fetch_attrs = ()
+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'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({}, 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)
 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')
 related = [r.eid for r in e.tags]
-self.failUnlessEqual(related, [])
+self.assertEqual(related, [])
 unrelated = [r[0] for r in e.unrelated('tags', 'Personne', 'subject')]
-self.failUnless(p.eid in unrelated)
+self.assertTrue(p.eid in unrelated)
 self.execute('SET X tags Y WHERE X is Tag, Y is Personne')
 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)
+self.assertFalse(p.eid in unrelated)
 def test_unrelated_limit(self):
 req = self.request()
 e = req.create_entity('Tag', name=u'x')
 req.create_entity('Personne', nom=u'di mascio', prenom=u'adrien')
 req = self.request()
 p1 = req.create_entity('Personne', nom=u'di mascio', prenom=u'adrien')
 p2 = req.create_entity('Personne', nom=u'toto')
 self.execute('SET X evaluee Y WHERE X nom "di mascio", Y nom "toto"')
 self.assertEqual(p1.evaluee[0].nom, "toto")
-self.failUnless(not p1.reverse_evaluee)
+self.assertTrue(not p1.reverse_evaluee)
 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.execute('Any X WHERE X eid %(x)s', {'x': eid}).get_entity(0, 0)
 trinfo.complete()
-self.failUnless(isinstance(trinfo.cw_attr_cache['creation_date'], datetime))
+self.assertTrue(isinstance(trinfo.cw_attr_cache['creation_date'], datetime))
-self.failUnless(trinfo.cw_relation_cached('from_state', 'subject'))
+self.assertTrue(trinfo.cw_relation_cached('from_state', 'subject'))
-self.failUnless(trinfo.cw_relation_cached('to_state', 'subject'))
+self.assertTrue(trinfo.cw_relation_cached('to_state', 'subject'))
-self.failUnless(trinfo.cw_relation_cached('wf_info_for', 'subject'))
+self.assertTrue(trinfo.cw_relation_cached('wf_info_for', 'subject'))
 self.assertEqual(trinfo.by_transition, ())
 def test_request_cache(self):
 req = self.request()
 user = self.execute('CWUser X WHERE X login "admin"', req=req).get_entity(0, 0)
 state = user.in_state[0]
 samestate = self.execute('State X WHERE X name "activated"', req=req).get_entity(0, 0)
-self.failUnless(state is samestate)
+self.assertTrue(state is samestate)
 def test_rest_path(self):
 req = self.request()
 note = req.create_entity('Note', type=u'z')
 self.assertEqual(note.rest_path(), 'note/%s' % note.eid)
 person = req.create_entity('Personne', prenom=u'john', nom=u'doe')
 self.assertEqual(person.rest_path(), 'personne/doe')
 # ambiguity test
 person2 = req.create_entity('Personne', prenom=u'remi', nom=u'doe')
 person.cw_clear_all_caches()
-self.assertEqual(person.rest_path(), 'personne/eid/%s' % person.eid)
+self.assertEqual(person.rest_path(), unicode(person.eid))
-self.assertEqual(person2.rest_path(), 'personne/eid/%s' % person2.eid)
+self.assertEqual(person2.rest_path(), unicode(person2.eid))
 # unique attr with None value (wikiid in this case)
 card1 = req.create_entity('Card', title=u'hop')
-self.assertEqual(card1.rest_path(), 'card/eid/%s' % card1.eid)
+self.assertEqual(card1.rest_path(), unicode(card1.eid))
 # don't use rest if we have /, ? or & in the path (breaks mod_proxy)
 card2 = req.create_entity('Card', title=u'pod', wikiid=u'zo/bi')
-self.assertEqual(card2.rest_path(), 'card/eid/%d' % card2.eid)
+self.assertEqual(card2.rest_path(), unicode(card2.eid))
 card3 = req.create_entity('Card', title=u'pod', wikiid=u'zo&bi')
-self.assertEqual(card3.rest_path(), 'card/eid/%d' % card3.eid)
+self.assertEqual(card3.rest_path(), unicode(card3.eid))
 card4 = req.create_entity('Card', title=u'pod', wikiid=u'zo?bi')
-self.assertEqual(card4.rest_path(), 'card/eid/%d' % card4.eid)
+self.assertEqual(card4.rest_path(), unicode(card4.eid))
 def test_set_attributes(self):
 req = self.request()
 person = req.create_entity('Personne', nom=u'di mascio', prenom=u'adrien')
 def test_absolute_url_empty_field(self):
 req = self.request()
 card = req.create_entity('Card', wikiid=u'', title=u'test')
 self.assertEqual(card.absolute_url(),
-'http://testing.fr/cubicweb/card/eid/%s' % card.eid)
+'http://testing.fr/cubicweb/%s' % card.eid)
 def test_create_entity(self):
 req = self.request()
 p1 = req.create_entity('Personne', nom=u'fayolle', prenom=u'alexandre')
 p2 = req.create_entity('Personne', nom=u'campeas', prenom=u'aurelien')

branch	oldstable
changeset 8462	a14b6562082b
parent 8286	8b0146e31baa
child 8307	8be58694f416