--- a/server/test/unittest_migractions.py Wed Apr 09 11:25:45 2014 +0200
+++ b/server/test/unittest_migractions.py Tue Apr 08 17:39:39 2014 +0200
@@ -76,7 +76,7 @@
self.session.create_entity('Note')
self.commit()
self.mh.cmd_add_attribute('Note', 'yesno')
- self.assertTrue('yesno' in self.schema)
+ self.assertIn('yesno', self.schema)
self.assertEqual(self.schema['yesno'].subjects(), ('Note',))
self.assertEqual(self.schema['yesno'].objects(), ('Boolean',))
self.assertEqual(self.schema['Note'].default('yesno'), False)
@@ -94,7 +94,7 @@
orderdict = dict(self.mh.rqlexec('Any RTN, O WHERE X name "Note", RDEF from_entity X, '
'RDEF relation_type RT, RDEF ordernum O, RT name RTN'))
self.mh.cmd_add_attribute('Note', 'whatever')
- self.assertTrue('whatever' in self.schema)
+ self.assertIn('whatever', self.schema)
self.assertEqual(self.schema['whatever'].subjects(), ('Note',))
self.assertEqual(self.schema['whatever'].objects(), ('Int',))
self.assertEqual(self.schema['Note'].default('whatever'), 0)
@@ -128,7 +128,7 @@
self.session.commit(free_cnxset=False)
self.assertFalse('shortpara' in self.schema)
self.mh.cmd_add_attribute('Note', 'shortpara')
- self.assertTrue('shortpara' in self.schema)
+ self.assertIn('shortpara', self.schema)
self.assertEqual(self.schema['shortpara'].subjects(), ('Note', ))
self.assertEqual(self.schema['shortpara'].objects(), ('String', ))
# test created column is actually a varchar(64)
@@ -148,9 +148,9 @@
self.mh.cmd_add_attribute('Note', 'mydate')
self.mh.cmd_add_attribute('Note', 'oldstyledefaultdate')
self.mh.cmd_add_attribute('Note', 'newstyledefaultdate')
- self.assertTrue('mydate' in self.schema)
- self.assertTrue('oldstyledefaultdate' in self.schema)
- self.assertTrue('newstyledefaultdate' in self.schema)
+ self.assertIn('mydate', self.schema)
+ self.assertIn('oldstyledefaultdate', self.schema)
+ self.assertIn('newstyledefaultdate', self.schema)
self.assertEqual(self.schema['mydate'].subjects(), ('Note', ))
self.assertEqual(self.schema['mydate'].objects(), ('Date', ))
testdate = date(2005, 12, 13)
@@ -196,7 +196,7 @@
eid2 = self.mh.rqlexec('INSERT Personne X: X nom "l\'autre", X sexe NULL')[0][0]
self.mh.cmd_rename_attribute('Personne', 'sexe', 'civility')
self.assertFalse('sexe' in self.schema)
- self.assertTrue('civility' in self.schema)
+ self.assertIn('civility', self.schema)
# test data has been backported
c1 = self.mh.rqlexec('Any C WHERE X eid %s, X civility C' % eid1)[0][0]
self.assertEqual(c1, 'M')
@@ -219,10 +219,10 @@
self.assertFalse('Folder2' in self.schema)
self.assertFalse('filed_under2' in self.schema)
self.mh.cmd_add_entity_type('Folder2')
- self.assertTrue('Folder2' in self.schema)
- self.assertTrue('Old' in self.schema)
+ self.assertIn('Folder2', self.schema)
+ self.assertIn('Old', self.schema)
self.assertTrue(self.session.execute('CWEType X WHERE X name "Folder2"'))
- self.assertTrue('filed_under2' in self.schema)
+ self.assertIn('filed_under2', self.schema)
self.assertTrue(self.session.execute('CWRType X WHERE X name "filed_under2"'))
self.assertEqual(sorted(str(rs) for rs in self.schema['Folder2'].subject_relations()),
['created_by', 'creation_date', 'cw_source', 'cwuri',
@@ -269,7 +269,7 @@
def test_add_drop_relation_type(self):
self.mh.cmd_add_entity_type('Folder2', auto=False)
self.mh.cmd_add_relation_type('filed_under2')
- self.assertTrue('filed_under2' in self.schema)
+ self.assertIn('filed_under2', self.schema)
# Old will be missing as it has been renamed into 'New' in the migrated
# schema while New hasn't been added here.
self.assertEqual(sorted(str(e) for e in self.schema['filed_under2'].subjects()),
@@ -294,7 +294,7 @@
self.mh.rqlexec('SET X concerne2 Y WHERE X is Personne, Y is Affaire')
self.session.commit(free_cnxset=False)
self.mh.cmd_drop_relation_definition('Personne', 'concerne2', 'Affaire')
- self.assertTrue('concerne2' in self.schema)
+ self.assertIn('concerne2', self.schema)
self.mh.cmd_drop_relation_definition('Personne', 'concerne2', 'Note')
self.assertFalse('concerne2' in self.schema)
@@ -546,10 +546,10 @@
raise
finally:
self.mh.cmd_add_cube('email')
- self.assertTrue('email' in self.config.cubes())
- self.assertTrue(self.config.cube_dir('email') in self.config.cubes_path())
- self.assertTrue('file' in self.config.cubes())
- self.assertTrue(self.config.cube_dir('file') in self.config.cubes_path())
+ self.assertIn('email', self.config.cubes())
+ self.assertIn(self.config.cube_dir('email'), self.config.cubes_path())
+ self.assertIn('file', self.config.cubes())
+ self.assertIn(self.config.cube_dir('file'), self.config.cubes_path())
for ertype in ('Email', 'EmailThread', 'EmailPart', 'File',
'sender', 'in_thread', 'reply_to', 'data_format'):
self.assertTrue(ertype in schema, ertype)
@@ -584,7 +584,7 @@
self.mh.cmd_remove_cube('email')
cubes.remove('email')
self.assertFalse('email' in self.config.cubes())
- self.assertTrue('file' in self.config.cubes())
+ self.assertIn('file', self.config.cubes())
for ertype in ('Email', 'EmailThread', 'EmailPart',
'sender', 'in_thread', 'reply_to'):
self.assertFalse(ertype in schema, ertype)
@@ -594,7 +594,7 @@
raise
finally:
self.mh.cmd_add_cube('email')
- self.assertTrue('email' in self.config.cubes())
+ self.assertIn('email', self.config.cubes())
# trick: overwrite self.maxeid to avoid deletion of just reintroduced
# types (and their associated tables!)
self.maxeid = self.session.execute('Any MAX(X)')[0][0]