[server test] simplify data-schemaserial test instance's schema
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 21 Jun 2013 16:19:47 +0200
changeset 9453 5c4d9dfbf176
parent 9452 5308b3fe03c9
child 9454 a173f9cf9f26
[server test] simplify data-schemaserial test instance's schema
server/test/data-schemaserial/bootstrap_cubes
server/test/data-schemaserial/schema.py
server/test/unittest_schemaserial.py
--- a/server/test/data-schemaserial/bootstrap_cubes	Wed Jan 22 10:19:30 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-card,comment,folder,tag,basket,email,file,localperms
--- a/server/test/data-schemaserial/schema.py	Wed Jan 22 10:19:30 2014 +0100
+++ b/server/test/data-schemaserial/schema.py	Fri Jun 21 16:19:47 2013 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
@@ -16,227 +16,17 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 
-from yams.buildobjs import (EntityType, RelationType, RelationDefinition,
-                            SubjectRelation, RichString, String, Int, Float,
-                            Boolean, Datetime, TZDatetime, Bytes)
-from yams.constraints import SizeConstraint
-from cubicweb.schema import (WorkflowableEntityType,
-                             RQLConstraint, RQLUniqueConstraint,
-                             ERQLExpression, RRQLExpression)
-
-from yams.buildobjs import make_type
+from yams.buildobjs import EntityType, SubjectRelation, String, make_type
 BabarTestType = make_type('BabarTestType')
 
-
-class Affaire(WorkflowableEntityType):
-    __permissions__ = {
-        'read':   ('managers',
-                   ERQLExpression('X owned_by U'), ERQLExpression('X concerne S?, S owned_by U')),
-        'add':    ('managers', ERQLExpression('X concerne S, S owned_by U')),
-        'update': ('managers', 'owners', ERQLExpression('X in_state S, S name in ("pitetre", "en cours")')),
-        'delete': ('managers', 'owners', ERQLExpression('X concerne S, S owned_by U')),
-        }
-
-    ref = String(fulltextindexed=True, indexed=True,
-                 constraints=[SizeConstraint(16)])
-    sujet = String(fulltextindexed=True,
-                   constraints=[SizeConstraint(256)])
-    descr = RichString(fulltextindexed=True,
-                       description=_('more detailed description'))
-
-    duration = Int()
-    invoiced = Float()
-    opt_attr = Bytes()
-
-    depends_on = SubjectRelation('Affaire')
-    require_permission = SubjectRelation('CWPermission')
-    concerne = SubjectRelation(('Societe', 'Note'))
-    todo_by = SubjectRelation('Personne', cardinality='?*')
-    documented_by = SubjectRelation('Card')
-
-
-class Societe(EntityType):
-    __unique_together__ = [('nom', 'type', 'cp')]
-    __permissions__ = {
-        'read': ('managers', 'users', 'guests'),
-        'update': ('managers', 'owners', ERQLExpression('U login L, X nom L')),
-        'delete': ('managers', 'owners', ERQLExpression('U login L, X nom L')),
-        'add': ('managers', 'users',)
-        }
-
-    nom  = String(maxsize=64, fulltextindexed=True)
-    web  = String(maxsize=128)
-    type  = String(maxsize=128) # attribute in common with Note
-    tel  = Int()
-    fax  = Int()
-    rncs = String(maxsize=128)
-    ad1  = String(maxsize=128)
-    ad2  = String(maxsize=128)
-    ad3  = String(maxsize=128)
-    cp   = String(maxsize=12)
-    ville= String(maxsize=32)
-
-
-class Division(Societe):
-    __specializes_schema__ = True
-
-class SubDivision(Division):
-    __specializes_schema__ = True
-
-class travaille_subdivision(RelationDefinition):
-    subject = 'Personne'
-    object = 'SubDivision'
-
-from cubicweb.schemas.base import CWUser
-CWUser.get_relations('login').next().fulltextindexed = True
-
-class Note(WorkflowableEntityType):
-    date = String(maxsize=10)
-    type = String(maxsize=6)
-    para = String(maxsize=512,
-                  __permissions__ = {
-                      'read':   ('managers', 'users', 'guests'),
-                      'update': ('managers', ERQLExpression('X in_state S, S name "todo"')),
-                      })
-
-    migrated_from = SubjectRelation('Note')
-    attachment = SubjectRelation('File')
-    inline1 = SubjectRelation('Affaire', inlined=True, cardinality='?*',
-                              constraints=[RQLUniqueConstraint('S type T, S inline1 A1, A1 todo_by C, '
-                                                              'Y type T, Y inline1 A2, A2 todo_by C',
-                                                               'S,Y')])
-    todo_by = SubjectRelation('CWUser')
+class Affaire(EntityType):
+    nom = String(unique=True, maxsize=64)
 
 class Personne(EntityType):
     __unique_together__ = [('nom', 'prenom', 'inline2')]
     nom    = String(fulltextindexed=True, required=True, maxsize=64)
     prenom = String(fulltextindexed=True, maxsize=64)
-    sexe   = String(maxsize=1, default='M', fulltextindexed=True)
-    promo  = String(vocabulary=('bon','pasbon'))
-    titre  = String(fulltextindexed=True, maxsize=128)
-    adel   = String(maxsize=128)
-    ass    = String(maxsize=128)
-    web    = String(maxsize=128)
-    tel    = Int()
-    fax    = Int()
-    datenaiss = Datetime()
-    tzdatenaiss = TZDatetime()
-    test   = Boolean(__permissions__={
-        'read': ('managers', 'users', 'guests'),
-        'update': ('managers',),
-        })
-    description = String()
-    firstname = String(fulltextindexed=True, maxsize=64)
-
-    concerne = SubjectRelation('Affaire')
-    connait = SubjectRelation('Personne')
     inline2 = SubjectRelation('Affaire', inlined=True, cardinality='?*')
 
     custom_field_of_jungle = BabarTestType(jungle_speed=42)
 
-
-class Old(EntityType):
-    name = String()
-
-
-class connait(RelationType):
-    symmetric = True
-
-class concerne(RelationType):
-    __permissions__ = {
-        'read':   ('managers', 'users', 'guests'),
-        'add':    ('managers', RRQLExpression('U has_update_permission S')),
-        'delete': ('managers', RRQLExpression('O owned_by U')),
-        }
-
-class travaille(RelationDefinition):
-    __permissions__ = {
-        'read':   ('managers', 'users', 'guests'),
-        'add':    ('managers', RRQLExpression('U has_update_permission S')),
-        'delete': ('managers', RRQLExpression('O owned_by U')),
-        }
-    subject = 'Personne'
-    object = 'Societe'
-
-class comments(RelationDefinition):
-    subject = 'Comment'
-    object = 'Personne'
-
-class fiche(RelationDefinition):
-    inlined = True
-    subject = 'Personne'
-    object = 'Card'
-    cardinality = '??'
-
-
-class see_also_1(RelationDefinition):
-    name = 'see_also'
-    subject = object = 'Folder'
-
-class see_also_2(RelationDefinition):
-    name = 'see_also'
-    subject = ('Bookmark', 'Note')
-    object = ('Bookmark', 'Note')
-
-class evaluee(RelationDefinition):
-    subject = ('Personne', 'CWUser', 'Societe')
-    object = ('Note')
-
-class ecrit_par(RelationType):
-    inlined = True
-
-class ecrit_par_1(RelationDefinition):
-    name = 'ecrit_par'
-    subject = 'Note'
-    object ='Personne'
-    constraints = [RQLConstraint('E concerns P, S version_of P')]
-    cardinality = '?*'
-
-class ecrit_par_2(RelationDefinition):
-    name = 'ecrit_par'
-    subject = 'Note'
-    object ='CWUser'
-    cardinality='?*'
-
-
-class copain(RelationDefinition):
-    subject = object = 'CWUser'
-
-class tags(RelationDefinition):
-    subject = 'Tag'
-    object = ('CWUser', 'CWGroup', 'State', 'Note', 'Card', 'Affaire')
-
-class filed_under(RelationDefinition):
-    subject = ('Note', 'Affaire')
-    object = 'Folder'
-
-class require_permission(RelationDefinition):
-    subject = ('Card', 'Note', 'Personne')
-    object = 'CWPermission'
-
-class require_state(RelationDefinition):
-    subject = 'CWPermission'
-    object = 'State'
-
-class personne_composite(RelationDefinition):
-    subject='Personne'
-    object='Personne'
-    composite='subject'
-
-class personne_inlined(RelationDefinition):
-    subject='Personne'
-    object='Personne'
-    cardinality='?*'
-    inlined=True
-
-
-class login_user(RelationDefinition):
-    subject = 'Personne'
-    object = 'CWUser'
-    cardinality = '??'
-
-class ambiguous_inlined(RelationDefinition):
-    subject = ('Affaire', 'Note')
-    object = 'CWUser'
-    inlined = True
-    cardinality = '?*'
--- a/server/test/unittest_schemaserial.py	Wed Jan 22 10:19:30 2014 +0100
+++ b/server/test/unittest_schemaserial.py	Fri Jun 21 16:19:47 2013 +0200
@@ -82,10 +82,6 @@
         self.assertListEqual([('SET X specializes ET WHERE X eid %(x)s, ET eid %(et)s',
                                {'et': None, 'x': None}),
                               ('SET X specializes ET WHERE X eid %(x)s, ET eid %(et)s',
-                               {'et': None, 'x': None}),
-                              ('SET X specializes ET WHERE X eid %(x)s, ET eid %(et)s',
-                               {'et': None, 'x': None}),
-                              ('SET X specializes ET WHERE X eid %(x)s, ET eid %(et)s',
                                {'et': None, 'x': None})],
                              sorted(specialize2rql(schema)))
 
@@ -184,7 +180,7 @@
                        'extra_props': '{"jungle_speed": 42}',
                        'indexed': False,
                        'oe': None,
-                       'ordernum': 19,
+                       'ordernum': 4,
                        'rt': None,
                        'se': None})]