diff -r 49075f57cf2c -r aa09e20dd8c0 server/test/unittest_rqlrewrite.py --- a/server/test/unittest_rqlrewrite.py Tue May 05 17:18:49 2009 +0200 +++ b/server/test/unittest_rqlrewrite.py Thu May 14 12:48:11 2009 +0200 @@ -11,7 +11,7 @@ config.bootstrap_cubes() schema = config.load_schema() schema.add_relation_def(mock_object(subject='Card', name='in_state', object='State', cardinality='1*')) - + rqlhelper = RQLHelper(schema, special_relations={'eid': 'uid', 'has_text': 'fti'}) @@ -20,9 +20,9 @@ def teardown_module(*args): repotest.undo_monkey_patch() - + def eid_func_map(eid): - return {1: 'EUser', + return {1: 'CWUser', 2: 'Card'}[eid] def rewrite(rqlst, snippets_map, kwargs): @@ -41,7 +41,7 @@ rewriter = RQLRewriter(FakeQuerier, mock_object(user=(mock_object(eid=1)))) for v, snippets in snippets_map.items(): snippets_map[v] = [mock_object(snippet_rqlst=parse('Any X WHERE '+snippet).children[0], - expression='Any X WHERE '+snippet) + expression='Any X WHERE '+snippet) for snippet in snippets] rqlhelper.compute_solutions(rqlst.children[0], {'eid': eid_func_map}, kwargs=kwargs) solutions = rqlst.children[0].solutions @@ -62,10 +62,10 @@ * optimisation: detecter les relations utilisees dans les rqlexpressions qui sont presentes dans la requete de depart pour les reutiliser si possible - + * "has__permission" ? """ - + def test_base_var(self): card_constraint = ('X in_state S, U in_group G, P require_state S,' 'P name "read", P require_group G') @@ -74,8 +74,8 @@ self.failUnlessEqual(rqlst.as_string(), u"Any C WHERE C is Card, B eid %(D)s, " "EXISTS(C in_state A, B in_group E, F require_state A, " - "F name 'read', F require_group E, A is State, E is EGroup, F is EPermission)") - + "F name 'read', F require_group E, A is State, E is CWGroup, F is CWPermission)") + def test_multiple_var(self): card_constraint = ('X in_state S, U in_group G, P require_state S,' 'P name "read", P require_group G') @@ -87,11 +87,11 @@ self.assertTextEquals(rqlst.as_string(), "Any S WHERE S documented_by C, C eid %(u)s, B eid %(D)s, " "EXISTS(C in_state A, B in_group E, F require_state A, " - "F name 'read', F require_group E, A is State, E is EGroup, F is EPermission), " - "(EXISTS(S ref LIKE 'PUBLIC%')) OR (EXISTS(B in_group G, G name 'public', G is EGroup)), " + "F name 'read', F require_group E, A is State, E is CWGroup, F is CWPermission), " + "(EXISTS(S ref LIKE 'PUBLIC%')) OR (EXISTS(B in_group G, G name 'public', G is CWGroup)), " "S is Affaire") self.failUnless('D' in kwargs) - + def test_or(self): constraint = '(X identity U) OR (X in_state ST, CL identity U, CL in_state ST, ST name "subscribed")' rqlst = parse('Any S WHERE S owned_by C, C eid %(u)s') @@ -99,8 +99,8 @@ self.failUnlessEqual(rqlst.as_string(), "Any S WHERE S owned_by C, C eid %(u)s, A eid %(B)s, " "EXISTS((C identity A) OR (C in_state D, E identity A, " - "E in_state D, D name 'subscribed'), D is State, E is EUser), " - "S is IN(Affaire, Basket, Bookmark, Card, Comment, Division, ECache, EConstraint, EConstraintType, EEType, EFRDef, EGroup, ENFRDef, EPermission, EProperty, ERType, EUser, Email, EmailAddress, EmailPart, EmailThread, File, Folder, Image, Note, Personne, RQLExpression, Societe, State, SubDivision, Tag, TrInfo, Transition)") + "E in_state D, D name 'subscribed'), D is State, E is CWUser), " + "S is IN(Affaire, Basket, Bookmark, CWAttribute, CWCache, CWConstraint, CWConstraintType, CWEType, CWGroup, CWPermission, CWProperty, CWRType, CWRelation, CWUser, Card, Comment, Division, Email, EmailAddress, EmailPart, EmailThread, File, Folder, Image, Note, Personne, RQLExpression, Societe, State, SubDivision, Tag, TrInfo, Transition)") def test_simplified_rqlst(self): card_constraint = ('X in_state S, U in_group G, P require_state S,' @@ -110,7 +110,7 @@ self.failUnlessEqual(rqlst.as_string(), u"Any 2 WHERE B eid %(C)s, " "EXISTS(2 in_state A, B in_group D, E require_state A, " - "E name 'read', E require_group D, A is State, D is EGroup, E is EPermission)") + "E name 'read', E require_group D, A is State, D is CWGroup, E is CWPermission)") def test_optional_var(self): card_constraint = ('X in_state S, U in_group G, P require_state S,' @@ -129,7 +129,7 @@ "WITH C,T BEING " "(Any C,T WHERE C in_state B, D in_group F, G require_state B, G name 'read', " "G require_group F, C title T, D eid %(A)s, C is Card)") - + def test_relation_optimization(self): # since Card in_state State as monovalued cardinality, the in_state # relation used in the rql expression can be ignored and S replaced by @@ -141,22 +141,22 @@ self.failUnlessEqual(rqlst.as_string(), u"Any C WHERE C in_state STATE, C is Card, A eid %(B)s, " "EXISTS(A in_group D, E require_state STATE, " - "E name 'read', E require_group D, D is EGroup, E is EPermission), " + "E name 'read', E require_group D, D is CWGroup, E is CWPermission), " "STATE is State") def test_unsupported_constraint_1(self): - # EUser doesn't have require_permission + # CWUser doesn't have require_permission trinfo_constraint = ('X wf_info_for Y, Y require_permission P, P name "read"') - rqlst = parse('Any U,T WHERE U is EUser, T wf_info_for U') + rqlst = parse('Any U,T WHERE U is CWUser, T wf_info_for U') self.assertRaises(Unauthorized, rewrite, rqlst, {'T': (trinfo_constraint,)}, {}) - + def test_unsupported_constraint_2(self): trinfo_constraint = ('X wf_info_for Y, Y require_permission P, P name "read"') - rqlst = parse('Any U,T WHERE U is EUser, T wf_info_for U') + rqlst = parse('Any U,T WHERE U is CWUser, T wf_info_for U') rewrite(rqlst, {'T': (trinfo_constraint, 'X wf_info_for Y, Y in_group G, G name "managers"')}, {}) self.failUnlessEqual(rqlst.as_string(), - u"Any U,T WHERE U is EUser, T wf_info_for U, " - "EXISTS(U in_group B, B name 'managers', B is EGroup), T is TrInfo") + u"Any U,T WHERE U is CWUser, T wf_info_for U, " + "EXISTS(U in_group B, B name 'managers', B is CWGroup), T is TrInfo") def test_unsupported_constraint_3(self): self.skip('raise unauthorized for now') @@ -165,23 +165,23 @@ rewrite(rqlst, {'T': (trinfo_constraint, 'X in_group G, G name "managers"')}, {}) self.failUnlessEqual(rqlst.as_string(), u'XXX dunno what should be generated') - + def test_add_ambiguity_exists(self): constraint = ('X concerne Y') rqlst = parse('Affaire X') rewrite(rqlst, {'X': (constraint,)}, {}) self.failUnlessEqual(rqlst.as_string(), u"Any X WHERE X is Affaire, (((EXISTS(X concerne A, A is Division)) OR (EXISTS(X concerne D, D is SubDivision))) OR (EXISTS(X concerne C, C is Societe))) OR (EXISTS(X concerne B, B is Note))") - + def test_add_ambiguity_outerjoin(self): constraint = ('X concerne Y') rqlst = parse('Any X,C WHERE X? documented_by C') rewrite(rqlst, {'X': (constraint,)}, {}) # ambiguity are kept in the sub-query, no need to be resolved using OR self.failUnlessEqual(rqlst.as_string(), - u"Any X,C WHERE X? documented_by C, C is Card WITH X BEING (Any X WHERE X concerne A, X is Affaire)") - - - + u"Any X,C WHERE X? documented_by C, C is Card WITH X BEING (Any X WHERE X concerne A, X is Affaire)") + + + if __name__ == '__main__': unittest_main()