cubicweb: comparison server/test/unittest

equal deleted inserted replaced

-:6cbc7bc8ea6d
+:5fe84a5f7035
 def test_add_entity_type(self):
 self.failIf('Folder2' in self.schema)
 self.failIf('filed_under2' in self.schema)
 self.mh.cmd_add_entity_type('Folder2')
 self.failUnless('Folder2' in self.schema)
-self.failUnless(self.execute('EEType X WHERE X name "Folder2"'))
+self.failUnless(self.execute('CWEType X WHERE X name "Folder2"'))
 self.failUnless('filed_under2' in self.schema)
-self.failUnless(self.execute('ERType X WHERE X name "filed_under2"'))
+self.failUnless(self.execute('CWRType X WHERE X name "filed_under2"'))
 self.assertEquals(sorted(str(rs) for rs in self.schema['Folder2'].subject_relations()),
 ['created_by', 'creation_date', 'description', 'description_format', 'eid',
 'filed_under2', 'has_text', 'identity', 'is', 'is_instance_of',
 'modification_date', 'name', 'owned_by'])
 self.assertEquals([str(rs) for rs in self.schema['Folder2'].object_relations()],
 self.mh.cmd_add_transition(u'markasdone', 'Folder2', (todoeid,), doneeid)
 self.commit()
 eschema = self.schema.eschema('Folder2')
 self.mh.cmd_drop_entity_type('Folder2')
 self.failIf('Folder2' in self.schema)
-self.failIf(self.execute('EEType X WHERE X name "Folder2"'))
+self.failIf(self.execute('CWEType X WHERE X name "Folder2"'))
 # test automatic workflow deletion
 self.failIf(self.execute('State X WHERE NOT X state_of ET'))
 self.failIf(self.execute('Transition X WHERE NOT X transition_of ET'))
 def test_add_relation_type(self):
 self.failIf('filed_under2' in self.schema)
 def test_add_relation_definition(self):
 self.mh.cmd_add_relation_definition('Societe', 'in_state', 'State')
 self.assertEquals(sorted(self.schema['in_state'].subjects()),
-['Affaire', 'Division', 'EUser', 'Note', 'Societe', 'SubDivision'])
+['Affaire', 'Division', 'CWUser', 'Note', 'Societe', 'SubDivision'])
 self.assertEquals(self.schema['in_state'].objects(), ('State',))
 def test_add_relation_definition_nortype(self):
 self.mh.cmd_add_relation_definition('Personne', 'concerne2', 'Affaire')
 self.assertEquals(self.schema['concerne2'].subjects(),
 def test_drop_relation_definition2(self):
 self.failUnless('evaluee' in self.schema)
 self.mh.cmd_drop_relation_definition('Personne', 'evaluee', 'Note')
 self.failUnless('evaluee' in self.schema)
 self.assertEquals(sorted(self.schema['evaluee'].subjects()),
-['Division', 'EUser', 'Societe', 'SubDivision'])
+['Division', 'CWUser', 'Societe', 'SubDivision'])
 self.assertEquals(sorted(self.schema['evaluee'].objects()),
 ['Note'])
 def test_rename_relation(self):
 self.skip('implement me')
 #         self.assertEquals([rs.type for rs in migrschema['Personne'].ordered_relations() if rs.is_final()],
 #                           expected)
 migrschema['Personne'].description = 'blabla bla'
 migrschema['titre'].description = 'usually a title'
 migrschema['titre']._rproperties[('Personne', 'String')]['description'] = 'title for this person'
-#         rinorderbefore = cursor.execute('Any O,N WHERE X is EFRDef, X relation_type RT, RT name N,'
+#         rinorderbefore = cursor.execute('Any O,N WHERE X is CWAttribute, X relation_type RT, RT name N,'
 #                                         'X from_entity FE, FE name "Personne",'
 #                                         'X ordernum O ORDERBY O')
 #         expected = [u'creation_date', u'modification_date', u'nom', u'prenom',
 #                     u'sexe', u'promo', u'titre', u'adel', u'ass', u'web', u'tel',
 #                     u'fax', u'datenaiss', u'test', u'description']
 'title for this person')
 # skip "sexe" and "description" since they aren't in the migration
 # schema and so behaviour is undefined
 # "civility" is also skipped since it may have been added by
 # test_rename_attribut :o/
-rinorder = [n for n, in cursor.execute('Any N ORDERBY O WHERE X is EFRDef, X relation_type RT, RT name N,'
+rinorder = [n for n, in cursor.execute('Any N ORDERBY O WHERE X is CWAttribute, X relation_type RT, RT name N,'
 'X from_entity FE, FE name "Personne",'
 'X ordernum O') if n not in ('sexe', 'description', 'civility')]
 expected = [u'nom', u'prenom', u'promo', u'ass', u'adel', u'titre',
 u'web', u'tel', u'fax', u'datenaiss', u'test', u'firstname',
 u'creation_date', u'modification_date']
 self.assertEquals(len(cursor.execute('RQLExpression X')), nbrqlexpr_start + 1 + 2)
 self.mh.rollback()
 def _erqlexpr_rset(self, action, ertype):
-rql = 'RQLExpression X WHERE ET is EEType, ET %s_permission X, ET name %%(name)s' % action
+rql = 'RQLExpression X WHERE ET is CWEType, ET %s_permission X, ET name %%(name)s' % action
 return self.mh.rqlcursor.execute(rql, {'name': ertype})
 def _erqlexpr_entity(self, action, ertype):
 rset = self._erqlexpr_rset(action, ertype)
 self.assertEquals(len(rset), 1)
 return rset.get_entity(0, 0)
 def _rrqlexpr_rset(self, action, ertype):
-rql = 'RQLExpression X WHERE ET is ERType, ET %s_permission X, ET name %%(name)s' % action
+rql = 'RQLExpression X WHERE ET is CWRType, ET %s_permission X, ET name %%(name)s' % action
 return self.mh.rqlcursor.execute(rql, {'name': ertype})
 def _rrqlexpr_entity(self, action, ertype):
 rset = self._rrqlexpr_rset(action, ertype)
 self.assertEquals(len(rset), 1)
 return rset.get_entity(0, 0)
 def test_set_size_constraint(self):
 # existing previous value
 try:
-self.mh.cmd_set_size_constraint('EEType', 'name', 128)
+self.mh.cmd_set_size_constraint('CWEType', 'name', 128)
 finally:
-self.mh.cmd_set_size_constraint('EEType', 'name', 64)
+self.mh.cmd_set_size_constraint('CWEType', 'name', 64)
 # non existing previous value
 try:
-self.mh.cmd_set_size_constraint('EEType', 'description', 256)
+self.mh.cmd_set_size_constraint('CWEType', 'description', 256)
 finally:
-self.mh.cmd_set_size_constraint('EEType', 'description', None)
+self.mh.cmd_set_size_constraint('CWEType', 'description', None)
 def test_add_remove_cube(self):
 cubes = set(self.config.cubes())
 schema = self.repo.schema
 self.assertEquals(sorted(schema['see_also']._rproperties.keys()),

branch	tls-sprint
changeset 1398	5fe84a5f7035
parent 1263	01152fffd593
child 1787	71c143c0ada3