# HG changeset patch # User Sylvain Thénault # Date 1265353898 -3600 # Node ID a35c76ffed9243c8b00458e660eb4937a623c7bd # Parent 5c22869079b93bbda34e8e57094936b64d7e9c06 3.6 api update diff -r 5c22869079b9 -r a35c76ffed92 test/unittest_rset.py --- a/test/unittest_rset.py Fri Feb 05 08:11:32 2010 +0100 +++ b/test/unittest_rset.py Fri Feb 05 08:11:38 2010 +0100 @@ -212,7 +212,7 @@ self.assert_(rqlst1 is rqlst2) def test_get_entity_simple(self): - self.add_entity('CWUser', login=u'adim', upassword='adim', + self.request().create_entity('CWUser', login=u'adim', upassword='adim', surname=u'di mascio', firstname=u'adrien') e = self.entity('Any X,T WHERE X login "adim", X surname T') self.assertEquals(e['surname'], 'di mascio') @@ -224,7 +224,7 @@ self.assertEquals(pprelcachedict(e._related_cache), []) def test_get_entity_advanced(self): - self.add_entity('Bookmark', title=u'zou', path=u'/view') + self.request().create_entity('Bookmark', title=u'zou', path=u'/view') self.execute('SET X bookmarked_by Y WHERE X is Bookmark, Y login "anon"') rset = self.execute('Any X,Y,XT,YN WHERE X bookmarked_by Y, X title XT, Y login YN') @@ -262,7 +262,7 @@ [('in_state_subject', [seid])]) def test_get_entity_advanced_prefilled_cache(self): - e = self.add_entity('Bookmark', title=u'zou', path=u'path') + e = self.request().create_entity('Bookmark', title=u'zou', path=u'path') self.commit() rset = self.execute('Any X,U,S,XT,UL,SN WHERE X created_by U, U in_state S, ' 'X title XT, S name SN, U login UL, X eid %s' % e.eid) @@ -295,7 +295,7 @@ def test_get_entity_union(self): - e = self.add_entity('Bookmark', title=u'manger', path=u'path') + e = self.request().create_entity('Bookmark', title=u'manger', path=u'path') rset = self.execute('Any X,N ORDERBY N WITH X,N BEING ' '((Any X,N WHERE X is Bookmark, X title N)' ' UNION ' @@ -310,14 +310,14 @@ self.assertEquals(entity[attr], n) def test_related_entity_optional(self): - e = self.add_entity('Bookmark', title=u'aaaa', path=u'path') + e = self.request().create_entity('Bookmark', title=u'aaaa', path=u'path') rset = self.execute('Any B,U,L WHERE B bookmarked_by U?, U login L') entity, rtype = rset.related_entity(0, 2) self.assertEquals(entity, None) self.assertEquals(rtype, None) def test_related_entity_union_subquery(self): - e = self.add_entity('Bookmark', title=u'aaaa', path=u'path') + e = self.request().create_entity('Bookmark', title=u'aaaa', path=u'path') rset = self.execute('Any X,N ORDERBY N WITH X,N BEING ' '((Any X,N WHERE X is CWGroup, X name N)' ' UNION '