cubicweb: comparison test/unittest

equal deleted inserted replaced

-:f4d1d5d9ccbb
+:90f2f20367bc
 'Any C,P where C is Company, P employed_by P' : [],
 'Any C where C is Company, C employs P' : [],
 }
 for rql, relations in queries.items():
 result = list(attr_desc_iterator(parse(rql).children[0]))
-self.assertEquals((rql, result), (rql, relations))
+self.assertEqual((rql, result), (rql, relations))
 def test_relations_description_indexed(self):
 """tests relations_description() function"""
 queries = {
 'Any C,U,P,L,M where C is Company, C employs P, U is CWUser, U login L, U mail M' :
 {0: [(2,'employs', 'subject')], 1: [(3,'login', 'subject'), (4,'mail', 'subject')]},
 }
 for rql, results in queries.items():
 for var_index, relations in results.items():
 result = list(attr_desc_iterator(parse(rql).children[0], var_index))
-self.assertEquals(result, relations)
+self.assertEqual(result, relations)
 class ResultSetTC(CubicWebTC):
 self.rset.req = mock_object(vreg=self.vreg)
 def compare_urls(self, url1, url2):
 info1 = urlsplit(url1)
 info2 = urlsplit(url2)
-self.assertEquals(info1[:3], info2[:3])
+self.assertEqual(info1[:3], info2[:3])
 if info1[3] != info2[3]:
 params1 = dict(pair.split('=') for pair in info1[3].split('&'))
 params2 = dict(pair.split('=') for pair in info1[3].split('&'))
-self.assertDictEquals(params1, params2)
+self.assertDictEqual(params1, params2)
 def test_pickle(self):
 del self.rset.req
-self.assertEquals(len(pickle.dumps(self.rset)), 392)
+self.assertEqual(len(pickle.dumps(self.rset)), 392)
 def test_build_url(self):
 req = self.request()
 baseurl = req.base_url()
 self.compare_urls(req.build_url('view', vid='foo', rql='yo'),
 def test_resultset_build(self):
 """test basic build of a ResultSet"""
 rs = ResultSet([1,2,3], 'CWGroup X', description=['CWGroup', 'CWGroup', 'CWGroup'])
-self.assertEquals(rs.rowcount, 3)
+self.assertEqual(rs.rowcount, 3)
-self.assertEquals(rs.rows, [1,2,3])
+self.assertEqual(rs.rows, [1,2,3])
-self.assertEquals(rs.description, ['CWGroup', 'CWGroup', 'CWGroup'])
+self.assertEqual(rs.description, ['CWGroup', 'CWGroup', 'CWGroup'])
 def test_resultset_limit(self):
 rs = ResultSet([[12000, 'adim'], [13000, 'syt'], [14000, 'nico']],
 'Any U,L where U is CWUser, U login L',
 description=[['CWUser', 'String']] * 3)
 rs.req = self.request()
 rs.vreg = self.vreg
-self.assertEquals(rs.limit(2).rows, [[12000, 'adim'], [13000, 'syt']])
+self.assertEqual(rs.limit(2).rows, [[12000, 'adim'], [13000, 'syt']])
 rs2 = rs.limit(2, offset=1)
-self.assertEquals(rs2.rows, [[13000, 'syt'], [14000, 'nico']])
+self.assertEqual(rs2.rows, [[13000, 'syt'], [14000, 'nico']])
-self.assertEquals(rs2.get_entity(0, 0).cw_row, 0)
+self.assertEqual(rs2.get_entity(0, 0).cw_row, 0)
-self.assertEquals(rs.limit(2, offset=2).rows, [[14000, 'nico']])
+self.assertEqual(rs.limit(2, offset=2).rows, [[14000, 'nico']])
-self.assertEquals(rs.limit(2, offset=3).rows, [])
+self.assertEqual(rs.limit(2, offset=3).rows, [])
 def test_resultset_filter(self):
 rs = ResultSet([[12000, 'adim'], [13000, 'syt'], [14000, 'nico']],
 'Any U,L where U is CWUser, U login L',
 rs.vreg = self.vreg
 def test_filter(entity):
 return entity.login != 'nico'
 rs2 = rs.filtered_rset(test_filter)
-self.assertEquals(len(rs2), 2)
+self.assertEqual(len(rs2), 2)
-self.assertEquals([login for _, login in rs2], ['adim', 'syt'])
+self.assertEqual([login for _, login in rs2], ['adim', 'syt'])
 def test_resultset_transform(self):
 rs = ResultSet([[12, 'adim'], [13, 'syt'], [14, 'nico']],
 'Any U,L where U is CWUser, U login L',
 description=[['CWUser', 'String']] * 3)
 rs.req = self.request()
 def test_transform(row, desc):
 return row[1:], desc[1:]
 rs2 = rs.transformed_rset(test_transform)
-self.assertEquals(len(rs2), 3)
+self.assertEqual(len(rs2), 3)
-self.assertEquals(list(rs2), [['adim'],['syt'],['nico']])
+self.assertEqual(list(rs2), [['adim'],['syt'],['nico']])
 def test_resultset_sort(self):
 rs = ResultSet([[12000, 'adim'], [13000, 'syt'], [14000, 'nico']],
 'Any U,L where U is CWUser, U login L',
 description=[['CWUser', 'String']] * 3)
 rs.req = self.request()
 rs.vreg = self.vreg
 rs2 = rs.sorted_rset(lambda e:e['login'])
-self.assertEquals(len(rs2), 3)
+self.assertEqual(len(rs2), 3)
-self.assertEquals([login for _, login in rs2], ['adim', 'nico', 'syt'])
+self.assertEqual([login for _, login in rs2], ['adim', 'nico', 'syt'])
 # make sure rs is unchanged
-self.assertEquals([login for _, login in rs], ['adim', 'syt', 'nico'])
+self.assertEqual([login for _, login in rs], ['adim', 'syt', 'nico'])
 rs2 = rs.sorted_rset(lambda e:e['login'], reverse=True)
-self.assertEquals(len(rs2), 3)
+self.assertEqual(len(rs2), 3)
-self.assertEquals([login for _, login in rs2], ['syt', 'nico', 'adim'])
+self.assertEqual([login for _, login in rs2], ['syt', 'nico', 'adim'])
 # make sure rs is unchanged
-self.assertEquals([login for _, login in rs], ['adim', 'syt', 'nico'])
+self.assertEqual([login for _, login in rs], ['adim', 'syt', 'nico'])
 rs3 = rs.sorted_rset(lambda row: row[1], col=-1)
-self.assertEquals(len(rs3), 3)
+self.assertEqual(len(rs3), 3)
-self.assertEquals([login for _, login in rs3], ['adim', 'nico', 'syt'])
+self.assertEqual([login for _, login in rs3], ['adim', 'nico', 'syt'])
 # make sure rs is unchanged
-self.assertEquals([login for _, login in rs], ['adim', 'syt', 'nico'])
+self.assertEqual([login for _, login in rs], ['adim', 'syt', 'nico'])
 def test_resultset_split(self):
 rs = ResultSet([[12000, 'adim', u'Adim chez les pinguins'],
 [12000, 'adim', u'Jardiner facile'],
 [13000, 'syt',  u'Le carrelage en 42 leçons'],
 description=[['CWUser', 'String', 'String']] * 5)
 rs.req = self.request()
 rs.vreg = self.vreg
 rsets = rs.split_rset(lambda e:e['login'])
-self.assertEquals(len(rsets), 3)
+self.assertEqual(len(rsets), 3)
-self.assertEquals([login for _, login,_ in rsets[0]], ['adim', 'adim'])
+self.assertEqual([login for _, login,_ in rsets[0]], ['adim', 'adim'])
-self.assertEquals([login for _, login,_ in rsets[1]], ['syt'])
+self.assertEqual([login for _, login,_ in rsets[1]], ['syt'])
-self.assertEquals([login for _, login,_ in rsets[2]], ['nico', 'nico'])
+self.assertEqual([login for _, login,_ in rsets[2]], ['nico', 'nico'])
 # make sure rs is unchanged
-self.assertEquals([login for _, login,_ in rs], ['adim', 'adim', 'syt', 'nico', 'nico'])
+self.assertEqual([login for _, login,_ in rs], ['adim', 'adim', 'syt', 'nico', 'nico'])
 rsets = rs.split_rset(lambda e:e['login'], return_dict=True)
-self.assertEquals(len(rsets), 3)
+self.assertEqual(len(rsets), 3)
-self.assertEquals([login for _, login,_ in rsets['nico']], ['nico', 'nico'])
+self.assertEqual([login for _, login,_ in rsets['nico']], ['nico', 'nico'])
-self.assertEquals([login for _, login,_ in rsets['adim']], ['adim', 'adim'])
+self.assertEqual([login for _, login,_ in rsets['adim']], ['adim', 'adim'])
-self.assertEquals([login for _, login,_ in rsets['syt']], ['syt'])
+self.assertEqual([login for _, login,_ in rsets['syt']], ['syt'])
 # make sure rs is unchanged
-self.assertEquals([login for _, login,_ in rs], ['adim', 'adim', 'syt', 'nico', 'nico'])
+self.assertEqual([login for _, login,_ in rs], ['adim', 'adim', 'syt', 'nico', 'nico'])
 rsets = rs.split_rset(lambda s: s.count('d'), col=2)
-self.assertEquals(len(rsets), 2)
+self.assertEqual(len(rsets), 2)
-self.assertEquals([title for _, _, title in rsets[0]],
+self.assertEqual([title for _, _, title in rsets[0]],
 [u"Adim chez les pinguins",
 u"Jardiner facile",
 u"L'épluchage du castor commun",])
-self.assertEquals([title for _, _, title in rsets[1]],
+self.assertEqual([title for _, _, title in rsets[1]],
 [u"Le carrelage en 42 leçons",
 u"La tarte tatin en 15 minutes",])
 # make sure rs is unchanged
-self.assertEquals([title for _, _, title in rs],
+self.assertEqual([title for _, _, title in rs],
 [u'Adim chez les pinguins',
 u'Jardiner facile',
 u'Le carrelage en 42 leçons',
 u'La tarte tatin en 15 minutes',
 u"L'épluchage du castor commun"])
 rqlst2 = self.rset.syntax_tree()
 self.assert_(rqlst1 is rqlst2)
 def test_get_entity_simple(self):
 self.request().create_entity('CWUser', login=u'adim', upassword='adim',
 surname=u'di mascio', firstname=u'adrien')
 e = self.execute('Any X,T WHERE X login "adim", X surname T').get_entity(0, 0)
-self.assertEquals(e['surname'], 'di mascio')
+self.assertEqual(e['surname'], 'di mascio')
 self.assertRaises(KeyError, e.__getitem__, 'firstname')
 self.assertRaises(KeyError, e.__getitem__, 'creation_date')
-self.assertEquals(pprelcachedict(e._related_cache), [])
+self.assertEqual(pprelcachedict(e._cw_related_cache), [])
 e.complete()
-self.assertEquals(e['firstname'], 'adrien')
+self.assertEqual(e['firstname'], 'adrien')
-self.assertEquals(pprelcachedict(e._related_cache), [])
+self.assertEqual(pprelcachedict(e._cw_related_cache), [])
 def test_get_entity_advanced(self):
 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')
 e = rset.get_entity(0, 0)
-self.assertEquals(e.cw_row, 0)
+self.assertEqual(e.cw_row, 0)
-self.assertEquals(e.cw_col, 0)
+self.assertEqual(e.cw_col, 0)
-self.assertEquals(e['title'], 'zou')
+self.assertEqual(e['title'], 'zou')
 self.assertRaises(KeyError, e.__getitem__, 'path')
-self.assertEquals(e.view('text'), 'zou')
+self.assertEqual(e.view('text'), 'zou')
-self.assertEquals(pprelcachedict(e._related_cache), [])
+self.assertEqual(pprelcachedict(e._cw_related_cache), [])
 e = rset.get_entity(0, 1)
-self.assertEquals(e.cw_row, 0)
+self.assertEqual(e.cw_row, 0)
-self.assertEquals(e.cw_col, 1)
+self.assertEqual(e.cw_col, 1)
-self.assertEquals(e['login'], 'anon')
+self.assertEqual(e['login'], 'anon')
 self.assertRaises(KeyError, e.__getitem__, 'firstname')
-self.assertEquals(pprelcachedict(e._related_cache),
+self.assertEqual(pprelcachedict(e._cw_related_cache),
 [])
 e.complete()
-self.assertEquals(e['firstname'], None)
+self.assertEqual(e['firstname'], None)
-self.assertEquals(e.view('text'), 'anon')
+self.assertEqual(e.view('text'), 'anon')
-self.assertEquals(pprelcachedict(e._related_cache),
+self.assertEqual(pprelcachedict(e._cw_related_cache),
 [])
 self.assertRaises(NotAnEntity, rset.get_entity, 0, 2)
 self.assertRaises(NotAnEntity, rset.get_entity, 0, 3)
 rset = self.execute('Any X,S WHERE X in_state S, X login "anon"')
 e = rset.get_entity(0, 0)
 seid = self.execute('State X WHERE X name "activated"')[0][0]
 # for_user / in_group are prefetched in CWUser __init__, in_state should
 # be filed from our query rset
-self.assertEquals(pprelcachedict(e._related_cache),
+self.assertEqual(pprelcachedict(e._cw_related_cache),
 [('in_state_subject', [seid])])
 def test_get_entity_advanced_prefilled_cache(self):
 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)
 e = rset.get_entity(0, 0)
-self.assertEquals(e['title'], 'zou')
+self.assertEqual(e['title'], 'zou')
-self.assertEquals(pprelcachedict(e._related_cache),
+self.assertEqual(pprelcachedict(e._cw_related_cache),
 [('created_by_subject', [5])])
 # first level of recursion
 u = e.created_by[0]
-self.assertEquals(u['login'], 'admin')
+self.assertEqual(u['login'], 'admin')
 self.assertRaises(KeyError, u.__getitem__, 'firstname')
 # second level of recursion
 s = u.in_state[0]
-self.assertEquals(s['name'], 'activated')
+self.assertEqual(s['name'], 'activated')
 self.assertRaises(KeyError, s.__getitem__, 'description')
 def test_get_entity_cache_with_left_outer_join(self):
 eid = self.execute('INSERT CWUser E: E login "joe", E upassword "joe", E in_group G '
 'WHERE G name "users"')[0][0]
 rset = self.execute('Any X,E WHERE X eid %(x)s, X primary_email E?', {'x': eid})
 e = rset.get_entity(0, 0)
 # if any of the assertion below fails with a KeyError, the relation is not cached
 # related entities should be an empty list
-self.assertEquals(e.related_cache('primary_email', 'subject', True), ())
+self.assertEqual(e._cw_relation_cache('primary_email', 'subject', True), ())
 # related rset should be an empty rset
-cached = e.related_cache('primary_email', 'subject', False)
+cached = e._cw_relation_cache('primary_email', 'subject', False)
 self.assertIsInstance(cached, ResultSet)
-self.assertEquals(cached.rowcount, 0)
+self.assertEqual(cached.rowcount, 0)
 def test_get_entity_union(self):
 e = self.request().create_entity('Bookmark', title=u'manger', path=u'path')
 rset = self.execute('Any X,N ORDERBY N WITH X,N BEING '
 expected = (('CWGroup', 'guests'), ('CWGroup', 'managers'),
 ('Bookmark', 'manger'), ('CWGroup', 'owners'),
 ('CWGroup', 'users'))
 for entity in rset.entities(): # test get_entity for each row actually
 etype, n = expected[entity.cw_row]
-self.assertEquals(entity.__regid__, etype)
+self.assertEqual(entity.__regid__, etype)
 attr = etype == 'Bookmark' and 'title' or 'name'
-self.assertEquals(entity[attr], n)
+self.assertEqual(entity[attr], n)
 def test_related_entity_optional(self):
 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.assertEqual(entity, None)
-self.assertEquals(rtype, None)
+self.assertEqual(rtype, None)
 def test_related_entity_union_subquery(self):
 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 '
 ' (Any X,N WHERE X is Bookmark, X title N))')
 entity, rtype = rset.related_entity(0, 1)
-self.assertEquals(entity.eid, e.eid)
+self.assertEqual(entity.eid, e.eid)
-self.assertEquals(rtype, 'title')
+self.assertEqual(rtype, 'title')
 entity, rtype = rset.related_entity(1, 1)
-self.assertEquals(entity.__regid__, 'CWGroup')
+self.assertEqual(entity.__regid__, 'CWGroup')
-self.assertEquals(rtype, 'name')
+self.assertEqual(rtype, 'name')
 #
 rset = self.execute('Any X,N ORDERBY N WHERE X is Bookmark WITH X,N BEING '
 '((Any X,N WHERE X is CWGroup, X name N)'
 ' UNION '
 ' (Any X,N WHERE X is Bookmark, X title N))')
 entity, rtype = rset.related_entity(0, 1)
-self.assertEquals(entity.eid, e.eid)
+self.assertEqual(entity.eid, e.eid)
-self.assertEquals(rtype, 'title')
+self.assertEqual(rtype, 'title')
 #
 rset = self.execute('Any X,N ORDERBY N WITH N,X BEING '
 '((Any N,X WHERE X is CWGroup, X name N)'
 ' UNION '
 ' (Any N,X WHERE X is Bookmark, X title N))')
 entity, rtype = rset.related_entity(0, 1)
-self.assertEquals(entity.eid, e.eid)
+self.assertEqual(entity.eid, e.eid)
-self.assertEquals(rtype, 'title')
+self.assertEqual(rtype, 'title')
 def test_related_entity_trap_subquery(self):
 req = self.request()
 req.create_entity('Bookmark', title=u'test bookmark', path=u'')
 self.execute('SET B bookmarked_by U WHERE U login "admin"')
 rset = self.execute('Any B,T,L WHERE B bookmarked_by U, U login L '
 'WITH B,T BEING (Any B,T WHERE B is Bookmark, B title T)')
 rset.related_entity(0, 2)
+def test_related_entity_subquery_outerjoin(self):
+rset = self.execute('Any X,S,L WHERE X in_state S '
+'WITH X, L BEING (Any X,MAX(L) GROUPBY X '
+'WHERE X is CWUser, T? wf_info_for X, T creation_date L)')
+self.assertEqual(len(rset), 2)
+rset.related_entity(0, 1)
+rset.related_entity(0, 2)
 def test_entities(self):
 rset = self.execute('Any U,G WHERE U in_group G')
 # make sure we have at least one element
 self.failUnless(rset)
-self.assertEquals(set(e.e_schema.type for e in rset.entities(0)),
+self.assertEqual(set(e.e_schema.type for e in rset.entities(0)),
 set(['CWUser',]))
-self.assertEquals(set(e.e_schema.type for e in rset.entities(1)),
+self.assertEqual(set(e.e_schema.type for e in rset.entities(1)),
 set(['CWGroup',]))
 def test_printable_rql(self):
 rset = self.execute(u'CWEType X WHERE X final FALSE')
-self.assertEquals(rset.printable_rql(),
+self.assertEqual(rset.printable_rql(),
 'Any X WHERE X final FALSE, X is CWEType')
 def test_searched_text(self):
 rset = self.execute(u'Any X WHERE X has_text "foobar"')
-self.assertEquals(rset.searched_text(), 'foobar')
+self.assertEqual(rset.searched_text(), 'foobar')
 rset = self.execute(u'Any X WHERE X has_text %(text)s', {'text' : 'foo'})
-self.assertEquals(rset.searched_text(), 'foo')
+self.assertEqual(rset.searched_text(), 'foo')
 def test_union_limited_rql(self):
 rset = self.execute('(Any X,N WHERE X is Bookmark, X title N)'
 ' UNION '
 '(Any X,N WHERE X is CWGroup, X name N)')
 rset.limit(2, 10, inplace=True)
-self.assertEquals(rset.limited_rql(),
+self.assertEqual(rset.limited_rql(),
 'Any A,B LIMIT 2 OFFSET 10 '
 'WITH A,B BEING ('
 '(Any X,N WHERE X is Bookmark, X title N) '
 'UNION '
 '(Any X,N WHERE X is CWGroup, X name N)'
 ')')
 def test_count_users_by_date(self):
 rset = self.execute('Any D, COUNT(U) GROUPBY D WHERE U is CWUser, U creation_date D')
-self.assertEquals(rset.related_entity(0,0), (None, None))
+self.assertEqual(rset.related_entity(0,0), (None, None))
+def test_str(self):
+rset = self.execute('(Any X,N WHERE X is CWGroup, X name N)')
+self.assertIsInstance(str(rset), basestring)
+self.assertEqual(len(str(rset).splitlines()), 1)
+def test_repr(self):
+rset = self.execute('(Any X,N WHERE X is CWGroup, X name N)')
+self.assertIsInstance(repr(rset), basestring)
+self.assertTrue(len(repr(rset).splitlines()) > 1)
+rset = self.execute('(Any X WHERE X is CWGroup, X name "managers")')
+self.assertIsInstance(str(rset), basestring)
+self.assertEqual(len(str(rset).splitlines()), 1)
 if __name__ == '__main__':
 unittest_main()

branch	oldstable
changeset 6665	90f2f20367bc
parent 6340	470d8e828fda
child 6366	1806148d6ce8