cubicweb: comparison server/test/unittest

equal deleted inserted replaced

-:bdc3dc94d744
+:470d8e828fda
 namecol = SQL_PREFIX + 'name'
 finalcol = SQL_PREFIX + 'final'
 self.session.set_pool()
 cu = self.session.system_sql('SELECT %s FROM %s WHERE %s is NULL' % (
 namecol, table, finalcol))
-self.assertEquals(cu.fetchall(), [])
+self.assertEqual(cu.fetchall(), [])
 cu = self.session.system_sql('SELECT %s FROM %s WHERE %s=%%(final)s ORDER BY %s'
 % (namecol, table, finalcol, namecol), {'final': 'TRUE'})
-self.assertEquals(cu.fetchall(), [(u'Boolean',), (u'Bytes',),
+self.assertEqual(cu.fetchall(), [(u'Boolean',), (u'Bytes',),
 (u'Date',), (u'Datetime',),
 (u'Decimal',),(u'Float',),
 (u'Int',),
 (u'Interval',), (u'Password',),
 (u'String',), (u'Time',)])
 "  AND cstr.cw_constraint_of = etype.cw_eid "
 "  AND etype.cw_name = 'Personne' "
 ";")
 cu = self.session.system_sql(sql)
 rows = cu.fetchall()
-self.assertEquals(len(rows), 3)
+self.assertEqual(len(rows), 3)
 self.test_unique_together()
 finally:
 self.repo.set_schema(origshema)
 def test_unique_together(self):
 person = self.repo.schema.eschema('Personne')
-self.assertEquals(len(person._unique_together), 1)
+self.assertEqual(len(person._unique_together), 1)
-self.assertUnorderedIterableEquals(person._unique_together[0],
+self.assertItemsEqual(person._unique_together[0],
 ('nom', 'prenom', 'inline2'))
 def test_schema_has_owner(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
 def test_shared_data(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
 repo.set_shared_data(cnxid, 'data', 4)
 cnxid2 = repo.connect(self.admlogin, password=self.admpassword)
-self.assertEquals(repo.get_shared_data(cnxid, 'data'), 4)
+self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4)
-self.assertEquals(repo.get_shared_data(cnxid2, 'data'), None)
+self.assertEqual(repo.get_shared_data(cnxid2, 'data'), None)
 repo.set_shared_data(cnxid2, 'data', 5)
-self.assertEquals(repo.get_shared_data(cnxid, 'data'), 4)
+self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4)
-self.assertEquals(repo.get_shared_data(cnxid2, 'data'), 5)
+self.assertEqual(repo.get_shared_data(cnxid2, 'data'), 5)
 repo.get_shared_data(cnxid2, 'data', pop=True)
-self.assertEquals(repo.get_shared_data(cnxid, 'data'), 4)
+self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4)
-self.assertEquals(repo.get_shared_data(cnxid2, 'data'), None)
+self.assertEqual(repo.get_shared_data(cnxid2, 'data'), None)
 repo.close(cnxid)
 repo.close(cnxid2)
 self.assertRaises(BadConnectionId, repo.get_shared_data, cnxid, 'data')
 self.assertRaises(BadConnectionId, repo.get_shared_data, cnxid2, 'data')
 self.assertRaises(BadConnectionId, repo.set_shared_data, cnxid, 'data', 1)
 self.assertRaises(BadConnectionId, repo.set_shared_data, cnxid2, 'data', 1)
 def test_check_session(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
-self.assertEquals(repo.check_session(cnxid), None)
+self.assertEqual(repo.check_session(cnxid), None)
 repo.close(cnxid)
 self.assertRaises(BadConnectionId, repo.check_session, cnxid)
 def test_transaction_base(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
 # check db state
 result = repo.execute(cnxid, 'Personne X')
-self.assertEquals(result.rowcount, 0)
+self.assertEqual(result.rowcount, 0)
 # rollback entity insertion
 repo.execute(cnxid, "INSERT Personne X: X nom 'bidule'")
 result = repo.execute(cnxid, 'Personne X')
-self.assertEquals(result.rowcount, 1)
+self.assertEqual(result.rowcount, 1)
 repo.rollback(cnxid)
 result = repo.execute(cnxid, 'Personne X')
-self.assertEquals(result.rowcount, 0, result.rows)
+self.assertEqual(result.rowcount, 0, result.rows)
 # commit
 repo.execute(cnxid, "INSERT Personne X: X nom 'bidule'")
 repo.commit(cnxid)
 result = repo.execute(cnxid, 'Personne X')
-self.assertEquals(result.rowcount, 1)
+self.assertEqual(result.rowcount, 1)
 def test_transaction_base2(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
 # rollback relation insertion
 repo.execute(cnxid, "SET U in_group G WHERE U login 'admin', G name 'guests'")
 result = repo.execute(cnxid, "Any U WHERE U in_group G, U login 'admin', G name 'guests'")
-self.assertEquals(result.rowcount, 1)
+self.assertEqual(result.rowcount, 1)
 repo.rollback(cnxid)
 result = repo.execute(cnxid, "Any U WHERE U in_group G, U login 'admin', G name 'guests'")
-self.assertEquals(result.rowcount, 0, result.rows)
+self.assertEqual(result.rowcount, 0, result.rows)
 def test_transaction_base3(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
 # rollback state change which trigger TrInfo insertion
 session = repo._get_session(cnxid)
 session.set_pool()
 user = session.user
 user.cw_adapt_to('IWorkflowable').fire_transition('deactivate')
 rset = repo.execute(cnxid, 'TrInfo T WHERE T wf_info_for X, X eid %(x)s', {'x': user.eid})
-self.assertEquals(len(rset), 1)
+self.assertEqual(len(rset), 1)
 repo.rollback(cnxid)
 rset = repo.execute(cnxid, 'TrInfo T WHERE T wf_info_for X, X eid %(x)s', {'x': user.eid})
-self.assertEquals(len(rset), 0)
+self.assertEqual(len(rset), 0)
 def test_transaction_interleaved(self):
-self.skip('implement me')
+self.skipTest('implement me')
 def test_close_kill_processing_request(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
 repo.execute(cnxid, 'INSERT CWUser X: X login "toto", X upassword "tutu", X in_group G WHERE G name "users"')
 def run_transaction():
 repo.execute(cnxid, 'DELETE CWUser X WHERE X login "toto"')
 repo.commit(cnxid)
 try:
 ex = self.assertRaises(Exception, run_transaction)
-self.assertEquals(str(ex), 'try to access pool on a closed session')
+self.assertEqual(str(ex), 'try to access pool on a closed session')
 finally:
 t.join()
 def test_initial_schema(self):
 schema = self.repo.schema
 # check order of attributes is respected
-self.assertListEquals([r.type for r in schema.eschema('CWAttribute').ordered_relations()
+self.assertListEqual([r.type for r in schema.eschema('CWAttribute').ordered_relations()
 if not r.type in ('eid', 'is', 'is_instance_of', 'identity',
 'creation_date', 'modification_date', 'cwuri',
 'owned_by', 'created_by',
 'update_permission', 'read_permission',
 'in_basket')],
 'constrained_by',
 'cardinality', 'ordernum',
 'indexed', 'fulltextindexed', 'internationalizable',
 'defaultval', 'description', 'description_format'])
-self.assertEquals(schema.eschema('CWEType').main_attribute(), 'name')
+self.assertEqual(schema.eschema('CWEType').main_attribute(), 'name')
-self.assertEquals(schema.eschema('State').main_attribute(), 'name')
+self.assertEqual(schema.eschema('State').main_attribute(), 'name')
 constraints = schema.rschema('name').rdef('CWEType', 'String').constraints
-self.assertEquals(len(constraints), 2)
+self.assertEqual(len(constraints), 2)
 for cstr in constraints[:]:
 if isinstance(cstr, UniqueConstraint):
 constraints.remove(cstr)
 break
 else:
 self.fail('unique constraint not found')
 sizeconstraint = constraints[0]
-self.assertEquals(sizeconstraint.min, None)
+self.assertEqual(sizeconstraint.min, None)
-self.assertEquals(sizeconstraint.max, 64)
+self.assertEqual(sizeconstraint.max, 64)
 constraints = schema.rschema('relation_type').rdef('CWAttribute', 'CWRType').constraints
-self.assertEquals(len(constraints), 1)
+self.assertEqual(len(constraints), 1)
 cstr = constraints[0]
 self.assert_(isinstance(cstr, RQLConstraint))
-self.assertEquals(cstr.restriction, 'O final TRUE')
+self.assertEqual(cstr.restriction, 'O final TRUE')
 ownedby = schema.rschema('owned_by')
-self.assertEquals(ownedby.objects('CWEType'), ('CWUser',))
+self.assertEqual(ownedby.objects('CWEType'), ('CWUser',))
 def test_pyro(self):
 import Pyro
 Pyro.config.PYRO_MULTITHREADED = 0
 done = []
 cnx.load_appobjects(subpath=('entities',))
 # check we can get the schema
 schema = cnx.get_schema()
 self.failUnless(cnx.vreg)
 self.failUnless('etypes'in cnx.vreg)
-self.assertEquals(schema.__hashmode__, None)
+self.assertEqual(schema.__hashmode__, None)
 cu = cnx.cursor()
 rset = cu.execute('Any U,G WHERE U in_group G')
 user = iter(rset.entities()).next()
 self.failUnless(user._cw)
 self.failUnless(user._cw.vreg)
 def test_internal_api(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
 session = repo._get_session(cnxid, setpool=True)
-self.assertEquals(repo.type_and_source_from_eid(1, session),
+self.assertEqual(repo.type_and_source_from_eid(1, session),
 ('CWGroup', 'system', None))
-self.assertEquals(repo.type_from_eid(1, session), 'CWGroup')
+self.assertEqual(repo.type_from_eid(1, session), 'CWGroup')
-self.assertEquals(repo.source_from_eid(1, session).uri, 'system')
+self.assertEqual(repo.source_from_eid(1, session).uri, 'system')
-self.assertEquals(repo.eid2extid(repo.system_source, 1, session), None)
+self.assertEqual(repo.eid2extid(repo.system_source, 1, session), None)
 class dummysource: uri = 'toto'
 self.assertRaises(UnknownEid, repo.eid2extid, dummysource, 1, session)
 def test_public_api(self):
-self.assertEquals(self.repo.get_schema(), self.repo.schema)
+self.assertEqual(self.repo.get_schema(), self.repo.schema)
-self.assertEquals(self.repo.source_defs(), {'system': {'adapter': 'native', 'uri': 'system'}})
+self.assertEqual(self.repo.source_defs(), {'system': {'adapter': 'native', 'uri': 'system'}})
 # .properties() return a result set
-self.assertEquals(self.repo.properties().rql, 'Any K,V WHERE P is CWProperty,P pkey K, P value V, NOT P for_user U')
+self.assertEqual(self.repo.properties().rql, 'Any K,V WHERE P is CWProperty,P pkey K, P value V, NOT P for_user U')
 def test_session_api(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
-self.assertEquals(repo.user_info(cnxid), (5, 'admin', set([u'managers']), {}))
+self.assertEqual(repo.user_info(cnxid), (5, 'admin', set([u'managers']), {}))
-self.assertEquals(repo.describe(cnxid, 1), (u'CWGroup', u'system', None))
+self.assertEqual(repo.describe(cnxid, 1), (u'CWGroup', u'system', None))
 repo.close(cnxid)
 self.assertRaises(BadConnectionId, repo.user_info, cnxid)
 self.assertRaises(BadConnectionId, repo.describe, cnxid, 1)
 def test_shared_data_api(self):
 repo = self.repo
 cnxid = repo.connect(self.admlogin, password=self.admpassword)
-self.assertEquals(repo.get_shared_data(cnxid, 'data'), None)
+self.assertEqual(repo.get_shared_data(cnxid, 'data'), None)
 repo.set_shared_data(cnxid, 'data', 4)
-self.assertEquals(repo.get_shared_data(cnxid, 'data'), 4)
+self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4)
 repo.get_shared_data(cnxid, 'data', pop=True)
 repo.get_shared_data(cnxid, 'whatever', pop=True)
-self.assertEquals(repo.get_shared_data(cnxid, 'data'), None)
+self.assertEqual(repo.get_shared_data(cnxid, 'data'), None)
 repo.close(cnxid)
 self.assertRaises(BadConnectionId, repo.set_shared_data, cnxid, 'data', 0)
 self.assertRaises(BadConnectionId, repo.get_shared_data, cnxid, 'data')
 def test_schema_is_relation(self):
 p1 = self.request().create_entity('Personne', nom=u'toto')
 self.execute('SET A todo_by P WHERE A eid %(x)s, P eid %(p)s',
 {'x': note.eid, 'p': p1.eid})
 rset = self.execute('Any P WHERE A todo_by P, A eid %(x)s',
 {'x': note.eid})
-self.assertEquals(len(rset), 1)
+self.assertEqual(len(rset), 1)
 p2 = self.request().create_entity('Personne', nom=u'tutu')
 self.execute('SET A todo_by P WHERE A eid %(x)s, P eid %(p)s',
 {'x': note.eid, 'p': p2.eid})
 rset = self.execute('Any P WHERE A todo_by P, A eid %(x)s',
 {'x': note.eid})
-self.assertEquals(len(rset), 1)
+self.assertEqual(len(rset), 1)
-self.assertEquals(rset.rows[0][0], p2.eid)
+self.assertEqual(rset.rows[0][0], p2.eid)
 def test_delete_if_object_inlined_singlecard(self):
 req = self.request()
 c = req.create_entity('Card', title=u'Carte')
 req.create_entity('Personne', nom=u'Vincent', fiche=c)
 req.create_entity('Personne', nom=u'Florent', fiche=c)
 self.commit()
-self.assertEquals(len(c.reverse_fiche), 1)
+self.assertEqual(len(c.reverse_fiche), 1)
 def test_set_attributes_in_before_update(self):
 # local hook
 class DummyBeforeHook(Hook):
 __regid__ = 'dummy-before-hook'
 req = self.request()
 addr = req.create_entity('EmailAddress', address=u'a@b.fr')
 addr.set_attributes(address=u'a@b.com')
 rset = self.execute('Any A,AA WHERE X eid %(x)s, X address A, X alias AA',
 {'x': addr.eid})
-self.assertEquals(rset.rows, [[u'a@b.com', u'foo']])
+self.assertEqual(rset.rows, [[u'a@b.com', u'foo']])
 def test_set_attributes_in_before_add(self):
 # local hook
 class DummyBeforeHook(Hook):
 __regid__ = 'dummy-before-hook'
 self.session.set_pool()
 self.assert_(self.repo.system_source.create_eid(self.session))
 def test_source_from_eid(self):
 self.session.set_pool()
-self.assertEquals(self.repo.source_from_eid(1, self.session),
+self.assertEqual(self.repo.source_from_eid(1, self.session),
 self.repo.sources_by_uri['system'])
 def test_source_from_eid_raise(self):
 self.session.set_pool()
 self.assertRaises(UnknownEid, self.repo.source_from_eid, -2, self.session)
 def test_type_from_eid(self):
 self.session.set_pool()
-self.assertEquals(self.repo.type_from_eid(1, self.session), 'CWGroup')
+self.assertEqual(self.repo.type_from_eid(1, self.session), 'CWGroup')
 def test_type_from_eid_raise(self):
 self.session.set_pool()
 self.assertRaises(UnknownEid, self.repo.type_from_eid, -2, self.session)
 cu = self.session.system_sql('SELECT * FROM entities WHERE eid = -1')
 data = cu.fetchall()
 self.assertIsInstance(data[0][3], datetime)
 data[0] = list(data[0])
 data[0][3] = None
-self.assertEquals(tuplify(data), [(-1, 'Personne', 'system', None, None)])
+self.assertEqual(tuplify(data), [(-1, 'Personne', 'system', None, None)])
 self.repo.delete_info(self.session, entity, 'system', None)
 #self.repo.commit()
 cu = self.session.system_sql('SELECT * FROM entities WHERE eid = -1')
 data = cu.fetchall()
-self.assertEquals(data, [])
+self.assertEqual(data, [])
 class FTITC(CubicWebTC):
 def test_reindex_and_modified_since(self):
 self.repo.system_source.multisources_etypes.add('Personne')
 eidp = self.execute('INSERT Personne X: X nom "toto", X prenom "tutu"')[0][0]
 self.commit()
 ts = datetime.now()
-self.assertEquals(len(self.execute('Personne X WHERE X has_text "tutu"')), 1)
+self.assertEqual(len(self.execute('Personne X WHERE X has_text "tutu"')), 1)
 self.session.set_pool()
 cu = self.session.system_sql('SELECT mtime, eid FROM entities WHERE eid = %s' % eidp)
 omtime = cu.fetchone()[0]
 # our sqlite datetime adapter is ignore seconds fraction, so we have to
 # ensure update is done the next seconds
 time.sleep(1 - (ts.second - int(ts.second)))
 self.execute('SET X nom "tata" WHERE X eid %(x)s', {'x': eidp})
 self.commit()
-self.assertEquals(len(self.execute('Personne X WHERE X has_text "tutu"')), 1)
+self.assertEqual(len(self.execute('Personne X WHERE X has_text "tutu"')), 1)
 self.session.set_pool()
 cu = self.session.system_sql('SELECT mtime FROM entities WHERE eid = %s' % eidp)
 mtime = cu.fetchone()[0]
 self.failUnless(omtime < mtime)
 self.commit()
 date, modified, deleted = self.repo.entities_modified_since(('Personne',), omtime)
-self.assertEquals(modified, [('Personne', eidp)])
+self.assertEqual(modified, [('Personne', eidp)])
-self.assertEquals(deleted, [])
+self.assertEqual(deleted, [])
 date, modified, deleted = self.repo.entities_modified_since(('Personne',), mtime)
-self.assertEquals(modified, [])
+self.assertEqual(modified, [])
-self.assertEquals(deleted, [])
+self.assertEqual(deleted, [])
 self.execute('DELETE Personne X WHERE X eid %(x)s', {'x': eidp})
 self.commit()
 date, modified, deleted = self.repo.entities_modified_since(('Personne',), omtime)
-self.assertEquals(modified, [])
+self.assertEqual(modified, [])
-self.assertEquals(deleted, [('Personne', eidp)])
+self.assertEqual(deleted, [('Personne', eidp)])
 def test_fulltext_container_entity(self):
 assert self.schema.rschema('use_email').fulltext_container == 'subject'
 req = self.request()
 toto = req.create_entity('EmailAddress', address=u'toto@logilab.fr')
 self.commit()
 rset = req.execute('Any X WHERE X has_text %(t)s', {'t': 'toto'})
-self.assertEquals(rset.rows, [])
+self.assertEqual(rset.rows, [])
 req.user.set_relations(use_email=toto)
 self.commit()
 rset = req.execute('Any X WHERE X has_text %(t)s', {'t': 'toto'})
-self.assertEquals(rset.rows, [[req.user.eid]])
+self.assertEqual(rset.rows, [[req.user.eid]])
 req.execute('DELETE X use_email Y WHERE X login "admin", Y eid %(y)s',
 {'y': toto.eid})
 self.commit()
 rset = req.execute('Any X WHERE X has_text %(t)s', {'t': 'toto'})
-self.assertEquals(rset.rows, [])
+self.assertEqual(rset.rows, [])
 tutu = req.create_entity('EmailAddress', address=u'tutu@logilab.fr')
 req.user.set_relations(use_email=tutu)
 self.commit()
 rset = req.execute('Any X WHERE X has_text %(t)s', {'t': 'tutu'})
-self.assertEquals(rset.rows, [[req.user.eid]])
+self.assertEqual(rset.rows, [[req.user.eid]])
 tutu.set_attributes(address=u'hip@logilab.fr')
 self.commit()
 rset = req.execute('Any X WHERE X has_text %(t)s', {'t': 'tutu'})
-self.assertEquals(rset.rows, [])
+self.assertEqual(rset.rows, [])
 rset = req.execute('Any X WHERE X has_text %(t)s', {'t': 'hip'})
-self.assertEquals(rset.rows, [[req.user.eid]])
+self.assertEqual(rset.rows, [[req.user.eid]])
 def test_no_uncessary_ftiindex_op(self):
 req = self.request()
 req.create_entity('Workflow', name=u'dummy workflow', description=u'huuuuu')
 self.failIf(any(x for x in self.session.pending_operations
 class DBInitTC(CubicWebTC):
 def test_versions_inserted(self):
 inserted = [r[0] for r in self.execute('Any K ORDERBY K WHERE P pkey K, P pkey ~= "system.version.%"')]
-self.assertEquals(inserted,
+self.assertEqual(inserted,
 [u'system.version.basket', u'system.version.card', u'system.version.comment',
 u'system.version.cubicweb', u'system.version.email',
 u'system.version.file', u'system.version.folder',
 u'system.version.tag'])
 with self.temporary_appobjects(EcritParHook):
 eidp = self.execute('INSERT Personne X: X nom "toto"')[0][0]
 eidn = self.execute('INSERT Note X: X type "T"')[0][0]
 self.execute('SET N ecrit_par Y WHERE N type "T", Y nom "toto"')
-self.assertEquals(CALLED, [('before_add_relation', eidn, 'ecrit_par', eidp),
+self.assertEqual(CALLED, [('before_add_relation', eidn, 'ecrit_par', eidp),
 ('after_add_relation', eidn, 'ecrit_par', eidp)])
 CALLED[:] = ()
 self.execute('DELETE N ecrit_par Y WHERE N type "T", Y nom "toto"')
-self.assertEquals(CALLED, [('before_delete_relation', eidn, 'ecrit_par', eidp),
+self.assertEqual(CALLED, [('before_delete_relation', eidn, 'ecrit_par', eidp),
 ('after_delete_relation', eidn, 'ecrit_par', eidp)])
 CALLED[:] = ()
 eidn = self.execute('INSERT Note N: N ecrit_par P WHERE P nom "toto"')[0][0]
-self.assertEquals(CALLED, [('before_add_relation', eidn, 'ecrit_par', eidp),
+self.assertEqual(CALLED, [('before_add_relation', eidn, 'ecrit_par', eidp),
 ('after_add_relation', eidn, 'ecrit_par', eidp)])
 def test_unique_contraint(self):
 req = self.request()
 toto = req.create_entity('Personne', nom=u'toto')
 req.create_entity('Note', type=u'todo', inline1=a01)
 req.cnx.commit()
 req = self.request()
 req.create_entity('Note', type=u'todo', inline1=a01)
 ex = self.assertRaises(ValidationError, req.cnx.commit)
-self.assertEquals(ex.errors, {'inline1-subject': u'RQLUniqueConstraint S type T, S inline1 A1, A1 todo_by C, Y type T, Y inline1 A2, A2 todo_by C failed'})
+self.assertEqual(ex.errors, {'inline1-subject': u'RQLUniqueConstraint S type T, S inline1 A1, A1 todo_by C, Y type T, Y inline1 A2, A2 todo_by C failed'})
 if __name__ == '__main__':
 unittest_main()

branch	stable
changeset 6340	470d8e828fda
parent 6236	9138f23ee263
child 6361	843684a50e48