--- a/server/test/unittest_schemaserial.py Mon Nov 23 14:55:36 2009 +0100
+++ b/server/test/unittest_schemaserial.py Mon Nov 23 14:56:24 2009 +0100
@@ -143,35 +143,35 @@
def test_eperms2rql1(self):
self.assertListEquals([rql for rql, kwargs in erperms2rql(schema.eschema('CWEType'), self.GROUP_MAPPING)],
- ['SET X read_permission Y WHERE X is CWEType, X name "CWEType", Y eid 2',
- 'SET X read_permission Y WHERE X is CWEType, X name "CWEType", Y eid 0',
- 'SET X read_permission Y WHERE X is CWEType, X name "CWEType", Y eid 1',
- 'SET X add_permission Y WHERE X is CWEType, X name "CWEType", Y eid 0',
- 'SET X update_permission Y WHERE X is CWEType, X name "CWEType", Y eid 0',
- 'SET X update_permission Y WHERE X is CWEType, X name "CWEType", Y eid 3',
- 'SET X delete_permission Y WHERE X is CWEType, X name "CWEType", Y eid 0',
+ ['SET X read_permission Y WHERE X is CWEType, X name %(name)s, Y eid %(g)s',
+ 'SET X read_permission Y WHERE X is CWEType, X name %(name)s, Y eid %(g)s',
+ 'SET X read_permission Y WHERE X is CWEType, X name %(name)s, Y eid %(g)s',
+ 'SET X add_permission Y WHERE X is CWEType, X name %(name)s, Y eid %(g)s',
+ 'SET X update_permission Y WHERE X is CWEType, X name %(name)s, Y eid %(g)s',
+ 'SET X update_permission Y WHERE X is CWEType, X name %(name)s, Y eid %(g)s',
+ 'SET X delete_permission Y WHERE X is CWEType, X name %(name)s, Y eid %(g)s',
])
def test_rperms2rql2(self):
self.assertListEquals([rql for rql, kwargs in erperms2rql(schema.rschema('read_permission'), self.GROUP_MAPPING)],
- ['SET X read_permission Y WHERE X is CWRType, X name "read_permission", Y eid 2',
- 'SET X read_permission Y WHERE X is CWRType, X name "read_permission", Y eid 0',
- 'SET X read_permission Y WHERE X is CWRType, X name "read_permission", Y eid 1',
- 'SET X add_permission Y WHERE X is CWRType, X name "read_permission", Y eid 0',
- 'SET X delete_permission Y WHERE X is CWRType, X name "read_permission", Y eid 0',
+ ['SET X read_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X read_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X read_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X add_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X delete_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
])
def test_rperms2rql3(self):
self.assertListEquals([rql for rql, kwargs in erperms2rql(schema.rschema('name'), self.GROUP_MAPPING)],
- ['SET X read_permission Y WHERE X is CWRType, X name "name", Y eid 2',
- 'SET X read_permission Y WHERE X is CWRType, X name "name", Y eid 0',
- 'SET X read_permission Y WHERE X is CWRType, X name "name", Y eid 1',
- 'SET X add_permission Y WHERE X is CWRType, X name "name", Y eid 2',
- 'SET X add_permission Y WHERE X is CWRType, X name "name", Y eid 0',
- 'SET X add_permission Y WHERE X is CWRType, X name "name", Y eid 1',
- 'SET X delete_permission Y WHERE X is CWRType, X name "name", Y eid 2',
- 'SET X delete_permission Y WHERE X is CWRType, X name "name", Y eid 0',
- 'SET X delete_permission Y WHERE X is CWRType, X name "name", Y eid 1',
+ ['SET X read_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X read_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X read_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X add_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X add_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X add_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X delete_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X delete_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
+ 'SET X delete_permission Y WHERE X is CWRType, X name %(name)s, Y eid %(g)s',
])
#def test_perms2rql(self):