[test/querier] use the new connection api (part 2/3)
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Tue, 10 Jun 2014 14:25:20 +0200
changeset 9832 17abdb7af3e6
parent 9831 db4aeba5d336
child 9833 1485aab7ece6
[test/querier] use the new connection api (part 2/3) A couple of tests need a schema constraint to be dropped to pass with `.qexecute`.
server/test/data/schema.py
server/test/unittest_querier.py
--- a/server/test/data/schema.py	Tue Jun 10 13:56:24 2014 +0200
+++ b/server/test/data/schema.py	Tue Jun 10 14:25:20 2014 +0200
@@ -202,7 +202,6 @@
     name = 'ecrit_par'
     subject = 'Note'
     object ='Personne'
-    constraints = [RQLConstraint('E concerns P, S version_of P')]
     cardinality = '?*'
 
 class ecrit_par_2(RelationDefinition):
--- a/server/test/unittest_querier.py	Tue Jun 10 13:56:24 2014 +0200
+++ b/server/test/unittest_querier.py	Tue Jun 10 14:25:20 2014 +0200
@@ -416,12 +416,12 @@
         self.assertEqual(len(rset.rows), 1, rset.rows)
 
     def test_select_nonregr_inlined(self):
-        self.execute("INSERT Note X: X para 'bidule'")
-        self.execute("INSERT Personne X: X nom 'chouette'")
-        self.execute("INSERT Personne X: X nom 'autre'")
-        self.execute("SET X ecrit_par P WHERE X para 'bidule', P nom 'chouette'")
-        rset = self.execute('Any U,T ORDERBY T DESC WHERE U is CWUser, '
-                            'N ecrit_par U, N type T')#, {'x': self.ueid})
+        self.qexecute("INSERT Note X: X para 'bidule'")
+        self.qexecute("INSERT Personne X: X nom 'chouette'")
+        self.qexecute("INSERT Personne X: X nom 'autre'")
+        self.qexecute("SET X ecrit_par P WHERE X para 'bidule', P nom 'chouette'")
+        rset = self.qexecute('Any U,T ORDERBY T DESC WHERE U is CWUser, '
+                             'N ecrit_par U, N type T')#, {'x': self.ueid})
         self.assertEqual(len(rset.rows), 0)
 
     def test_select_nonregr_edition_not(self):
@@ -476,11 +476,11 @@
         self.assertEqual(rset.rows, [[None, 'tagbis'], ['users', 'tag']])
 
     def test_select_not_inline_rel(self):
-        self.execute("INSERT Personne X: X nom 'bidule'")
-        self.execute("INSERT Note X: X type 'a'")
-        self.execute("INSERT Note X: X type 'b'")
-        self.execute("SET X ecrit_par Y WHERE X type 'a', Y nom 'bidule'")
-        rset = self.execute('Note X WHERE NOT X ecrit_par P')
+        self.qexecute("INSERT Personne X: X nom 'bidule'")
+        self.qexecute("INSERT Note X: X type 'a'")
+        self.qexecute("INSERT Note X: X type 'b'")
+        self.qexecute("SET X ecrit_par Y WHERE X type 'a', Y nom 'bidule'")
+        rset = self.qexecute('Note X WHERE NOT X ecrit_par P')
         self.assertEqual(len(rset.rows), 1, rset.rows)
 
     def test_select_not_unlinked_multiple_solutions(self):