[Fix] descendant_of use cnx instead of request
authorNoe Gaumont <ngaumont@logilab.fr>
Thu, 11 Apr 2019 17:59:00 +0200
changeset 197 1fcffb09447e
parent 196 42f245688b5d
child 198 474c8a28e45b
[Fix] descendant_of use cnx instead of request
test/unittest_descendant_of.py
--- a/test/unittest_descendant_of.py	Fri Apr 12 10:28:54 2019 +0200
+++ b/test/unittest_descendant_of.py	Thu Apr 11 17:59:00 2019 +0200
@@ -7,171 +7,182 @@
 class KeywordHooksTC(CubicWebTC):
 
     def setup_database(self):
-        cwgroup = self.execute('Any U WHERE U is ET, U name "CWGroup"').get_entity(0,0)
-        self.classif1 = self.request().create_entity('Classification', name=u"classif1", classifies=cwgroup)
+        with self.admin_access.cnx() as cnx:
+            cwgroup = cnx.execute('Any U WHERE U is ET, U name "CWGroup"').one()
+            self.classif1_eid = cnx.create_entity('Classification', name=u"classif1", classifies=cwgroup).eid
+            cnx.commit()
 
     def test_keyword_add1(self):
-        req = self.request()
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', subkeyword_of=kw2, included_in=self.classif1)
-        kw4 = req.create_entity('Keyword', name=u'kw4', subkeyword_of=kw3, included_in=self.classif1)
-        kw5 = req.create_entity('Keyword', name=u'kw5', subkeyword_of=kw4, included_in=self.classif1)
-        self.commit()
-        parent = kw1
-        child = kw5
-        self.assertCountEqual([kw.name for kw in child.cw_adapt_to('ITree').iterparents()], ['kw4', 'kw3', 'kw2', 'kw1'])
-        self.assertCountEqual([kw.name for kw in child.descendant_of], ['kw4', 'kw3', 'kw2', 'kw1'])
-        self.assertCountEqual([kw.name for kw in parent.reverse_descendant_of], ['kw5', 'kw4', 'kw3', 'kw2'])
-        self.assertCountEqual([kw.name for kw in parent.cw_adapt_to('ITree').recurse_children()], ['kw5', 'kw4', 'kw3', 'kw2'])
+        with self.admin_access.cnx() as cnx:
+            kw1_eid = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid).eid
+            kw2_eid = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            kw3_eid = cnx.create_entity('Keyword', name=u'kw3', subkeyword_of=kw2_eid, included_in=self.classif1_eid).eid
+            kw4_eid = cnx.create_entity('Keyword', name=u'kw4', subkeyword_of=kw3_eid, included_in=self.classif1_eid).eid
+            kw5_eid = cnx.create_entity('Keyword', name=u'kw5', subkeyword_of=kw4_eid, included_in=self.classif1_eid).eid
+            cnx.commit()
+            parent = cnx.find('Keyword', eid=kw1_eid).one()
+            child = cnx.find('Keyword', eid=kw5_eid).one()
+            self.assertCountEqual([kw.name for kw in child.cw_adapt_to('ITree').iterparents()], ['kw4', 'kw3', 'kw2', 'kw1'])
+            self.assertCountEqual([kw.name for kw in child.descendant_of], ['kw4', 'kw3', 'kw2', 'kw1'])
+            self.assertCountEqual([kw.name for kw in parent.reverse_descendant_of], ['kw5', 'kw4', 'kw3', 'kw2'])
+            self.assertCountEqual([kw.name for kw in parent.cw_adapt_to('ITree').recurse_children()], ['kw5', 'kw4', 'kw3', 'kw2'])
 
     def test_keyword_add2(self):
-        req = self.request()
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', included_in=self.classif1)
-        kw4 = req.create_entity('Keyword', name=u'kw4', subkeyword_of=kw3, included_in=self.classif1)
-        kw5 = req.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4, included_in=self.classif1)
-        self.commit()
-        self.execute('SET K3 subkeyword_of K2 WHERE K3 eid %(kw3)s, K2 eid %(kw2)s',
-                     {'kw3':kw3.eid, 'kw2':kw2.eid})
-        self.commit()
-        parent = kw1
-        child = kw5
-        self.assertCountEqual([kw.name for kw in child.cw_adapt_to('ITree').iterparents()], ['kw4', 'kw3', 'kw2', 'kw1'])
-        self.assertCountEqual([kw.name for kw in child.descendant_of], ['kw4', 'kw3', 'kw2', 'kw1'])
-        self.assertCountEqual([kw.name for kw in parent.reverse_descendant_of], ['kw5', 'kw4', 'kw3', 'kw2'])
-        self.assertCountEqual([kw.name for kw in parent.cw_adapt_to('ITree').recurse_children()], ['kw5', 'kw4', 'kw3', 'kw2'])
+        with self.admin_access.cnx() as cnx:
+            kw1_eid = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid).eid
+            kw2_eid = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            kw3_eid = cnx.create_entity('Keyword', name=u'kw3', included_in=self.classif1_eid).eid
+            kw4_eid = cnx.create_entity('Keyword', name=u'kw4', subkeyword_of=kw3_eid, included_in=self.classif1_eid).eid
+            kw5_eid = cnx.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4_eid, included_in=self.classif1_eid).eid
+            cnx.commit()
+            cnx.execute('SET K3 subkeyword_of K2 WHERE K3 eid %(kw3)s, K2 eid %(kw2)s',
+                         {'kw3':kw3_eid, 'kw2':kw2_eid})
+            cnx.commit()
+            parent = cnx.find('Keyword', eid=kw1_eid).one()
+            child = cnx.find('Keyword', eid=kw5_eid).one()
+            self.assertCountEqual([kw.name for kw in child.cw_adapt_to('ITree').iterparents()], ['kw4', 'kw3', 'kw2', 'kw1'])
+            self.assertCountEqual([kw.name for kw in child.descendant_of], ['kw4', 'kw3', 'kw2', 'kw1'])
+            self.assertCountEqual([kw.name for kw in parent.reverse_descendant_of], ['kw5', 'kw4', 'kw3', 'kw2'])
+            self.assertCountEqual([kw.name for kw in parent.cw_adapt_to('ITree').recurse_children()], ['kw5', 'kw4', 'kw3', 'kw2'])
 
     def test_keyword_add3(self):
-        req = self.request()
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', included_in=self.classif1)
-        kw4 = req.create_entity('Keyword', name=u'kw4', included_in=self.classif1)
-        kw5 = req.create_entity('Keyword', name=u'kw5', subkeyword_of=kw4, included_in=self.classif1)
-        self.commit()
-        self.execute('SET K2 subkeyword_of K3 WHERE K2 eid %(k2)s, K3 eid %(k3)s',
-                     {'k2': kw4.eid, 'k3': kw3.eid})
-        self.execute('SET K3 subkeyword_of K4 WHERE K3 eid %(k3)s, K4 eid %(k4)s',
-                     {'k3': kw3.eid, 'k4': kw2.eid})
-        self.commit()
-        child  = kw5
-        parent = kw1
-        self.assertCountEqual([kw.name for kw in child.descendant_of], ['kw4', 'kw3', 'kw2', 'kw1'])
-        # XXX check the order of iterparents
-        self.assertCountEqual([kw.name for kw in child.cw_adapt_to('ITree').iterparents()], ['kw4', 'kw3', 'kw2', 'kw1'])
-        self.assertCountEqual([kw.name for kw in parent.cw_adapt_to('ITree').recurse_children()], ['kw2', 'kw3', 'kw4', 'kw5'])
-        self.assertCountEqual([kw.name for kw in parent.reverse_descendant_of], ['kw2', 'kw3', 'kw4', 'kw5'])
+        with self.admin_access.cnx() as cnx:
+            kw1_eid = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid).eid
+            kw2_eid = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            kw3_eid = cnx.create_entity('Keyword', name=u'kw3', included_in=self.classif1_eid).eid
+            kw4_eid = cnx.create_entity('Keyword', name=u'kw4', included_in=self.classif1_eid).eid
+            kw5_eid = cnx.create_entity('Keyword', name=u'kw5', subkeyword_of=kw4_eid, included_in=self.classif1_eid).eid
+            cnx.commit()
+            cnx.execute('SET K2 subkeyword_of K3 WHERE K2 eid %(k2)s, K3 eid %(k3)s',
+                         {'k2': kw4_eid, 'k3': kw3_eid})
+            cnx.execute('SET K3 subkeyword_of K4 WHERE K3 eid %(k3)s, K4 eid %(k4)s',
+                         {'k3': kw3_eid, 'k4': kw2_eid})
+            cnx.commit()
+            child = cnx.find('Keyword', eid=kw5_eid).one()
+            parent = cnx.find('Keyword', eid=kw1_eid).one()
+            self.assertCountEqual([kw.name for kw in child.descendant_of], ['kw4', 'kw3', 'kw2', 'kw1'])
+            # XXX check the order of iterparents
+            self.assertCountEqual([kw.name for kw in child.cw_adapt_to('ITree').iterparents()], ['kw4', 'kw3', 'kw2', 'kw1'])
+            self.assertCountEqual([kw.name for kw in parent.cw_adapt_to('ITree').recurse_children()], ['kw2', 'kw3', 'kw4', 'kw5'])
+            self.assertCountEqual([kw.name for kw in parent.reverse_descendant_of], ['kw2', 'kw3', 'kw4', 'kw5'])
 
     def test_keyword_add4(self):
-        req = self.request()
-        kw0 = req.create_entity('Keyword', name=u'kw0', included_in=self.classif1)
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', included_in=self.classif1)
-        kw4 = req.create_entity('Keyword', name=u'kw4', included_in=self.classif1)
-        kw5 = req.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4, included_in=self.classif1)
-        self.execute('SET K3 subkeyword_of K2 WHERE K3 eid %(kw3)s, K2 eid %(kw2)s',
-                     {'kw2': kw2.eid, 'kw3': kw3.eid})
-        self.commit();
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', 'kw2'])
-        self.execute('SET K3 descendant_of K0 WHERE K3 eid %(kw3)s, K0 eid %(kw0)s',
-                      {'kw3': kw3.eid, 'kw0': kw0.eid})
-        self.commit()
-        kw3.cw_clear_all_caches()
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw0', 'kw1', 'kw2'])
-        self.execute('SET K3 descendant_of K4 WHERE K3 eid %(kw3)s, K4 eid %(kw4)s',
-                      {'kw3': kw3.eid, 'kw4': kw4.eid})
-        self.commit()
-        kw3.cw_clear_all_caches()
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw0', 'kw1', 'kw2', 'kw4'])
-        self.execute('SET K3 descendant_of K5 WHERE K3 eid %(kw3)s, K5 eid %(kw5)s',
-                       {'kw3': kw3.eid, 'kw5': kw5.eid})
-        self.commit()
-        kw3.cw_clear_all_caches()
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw0', 'kw1', 'kw2', 'kw4', 'kw5'])
+        with self.admin_access.cnx() as cnx:
+            kw0_eid = cnx.create_entity('Keyword', name=u'kw0', included_in=self.classif1_eid).eid
+            kw1_eid = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid).eid
+            kw2_eid = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            kw3_eid = cnx.create_entity('Keyword', name=u'kw3', included_in=self.classif1_eid).eid
+            kw4_eid = cnx.create_entity('Keyword', name=u'kw4', included_in=self.classif1_eid).eid
+            kw5_eid = cnx.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4_eid, included_in=self.classif1_eid).eid
+            cnx.execute('SET K3 subkeyword_of K2 WHERE K3 eid %(kw3)s, K2 eid %(kw2)s',
+                         {'kw2': kw2_eid, 'kw3': kw3_eid})
+            cnx.commit();
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', 'kw2'])
+            cnx.execute('SET K3 descendant_of K0 WHERE K3 eid %(kw3)s, K0 eid %(kw0)s',
+                          {'kw3': kw3_eid, 'kw0': kw0_eid})
+            cnx.commit()
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw0', 'kw1', 'kw2'])
+            cnx.execute('SET K3 descendant_of K4 WHERE K3 eid %(kw3)s, K4 eid %(kw4)s',
+                          {'kw3': kw3_eid, 'kw4': kw4_eid})
+            cnx.commit()
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw0', 'kw1', 'kw2', 'kw4'])
+            cnx.execute('SET K3 descendant_of K5 WHERE K3 eid %(kw3)s, K5 eid %(kw5)s',
+                           {'kw3': kw3_eid, 'kw5': kw5_eid})
+            cnx.commit()
+            kw3.cw_clear_all_caches()
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw0', 'kw1', 'kw2', 'kw4', 'kw5'])
 
     def test_keyword_update1(self):
-        req = self.request()
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', included_in=self.classif1)
-        kw4 = req.create_entity('Keyword', name=u'kw4', included_in=self.classif1)
-        kw5 = req.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4, included_in=self.classif1)
-        self.execute('SET K3 subkeyword_of K2 WHERE K3 eid %(kw3)s, K2 eid %(kw2)s',
-                      {'kw3': kw3.eid, 'kw2': kw2.eid})
-        self.commit();
-        kw3 =  req.entity_from_eid(kw3.eid)
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', 'kw2'])
-        self.execute('SET K3 subkeyword_of K4 WHERE K3 eid %(kw3)s, K4 eid %(kw4)s',
-                      {'kw3': kw3.eid, 'kw4': kw4.eid})
-        self.commit()
-        kw3.cw_clear_all_caches()
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw4'])
-        self.execute('SET K3 subkeyword_of K5 WHERE K3 eid %(kw3)s, K5 eid %(kw5)s',
-                     {'kw3': kw3.eid, 'kw5': kw5.eid})
-        self.commit()
-        kw3.cw_clear_all_caches()
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw4', 'kw5'])
+        with self.admin_access.cnx() as cnx:
+            kw1_eid = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid).eid
+            kw2_eid = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            kw3_eid = cnx.create_entity('Keyword', name=u'kw3', included_in=self.classif1_eid).eid
+            kw4_eid = cnx.create_entity('Keyword', name=u'kw4', included_in=self.classif1_eid).eid
+            kw5_eid = cnx.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4_eid, included_in=self.classif1_eid).eid
+            cnx.execute('SET K3 subkeyword_of K2 WHERE K3 eid %(kw3)s, K2 eid %(kw2)s',
+                          {'kw3': kw3_eid, 'kw2': kw2_eid})
+            cnx.commit();
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', 'kw2'])
+            cnx.execute('SET K3 subkeyword_of K4 WHERE K3 eid %(kw3)s, K4 eid %(kw4)s',
+                          {'kw3': kw3_eid, 'kw4': kw4_eid})
+            cnx.commit()
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw4'])
+            cnx.execute('SET K3 subkeyword_of K5 WHERE K3 eid %(kw3)s, K5 eid %(kw5)s',
+                         {'kw3': kw3_eid, 'kw5': kw5_eid})
+            cnx.commit()
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw4', 'kw5'])
 
     def test_keyword_descendant_of(self):
-        req = self.request()
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', subkeyword_of=kw1, included_in=self.classif1)
-        self.commit()
-        self.assertCountEqual([kw.name for kw in kw2.descendant_of], ['kw1', ])
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', ])
-        self.assertCountEqual([kw.name for kw in kw1.reverse_descendant_of], ['kw3', 'kw2'])
-        self.assertCountEqual([kw.name for kw in kw1.cw_adapt_to('ITree').recurse_children()], ['kw2', 'kw3'])
-        kw0 = req.create_entity('Keyword', name=u'kw0', included_in=self.classif1)
-        self.execute('SET K1 subkeyword_of K0 WHERE K1 eid %(kw1)s, K0 eid %(kw0)s',
-                      {'kw1': kw1.eid, 'kw0': kw0.eid})
-        self.commit();
-        kw1.cw_clear_all_caches()
-        kw2.cw_clear_all_caches()
-        kw3.cw_clear_all_caches()
-        self.assertCountEqual([kw.name for kw in kw0.cw_adapt_to('ITree').recurse_children()], ['kw1', 'kw2', 'kw3'])
-        self.assertCountEqual([kw.name for kw in kw0.reverse_descendant_of], ['kw3', 'kw2', 'kw1'])
-        self.assertCountEqual([kw.name for kw in kw1.descendant_of], ['kw0',])
-        self.assertCountEqual([kw.name for kw in kw2.descendant_of], ['kw1', 'kw0'])
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', 'kw0'])
+        with self.admin_access.cnx() as cnx:
+            kw1_eid = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid).eid
+            kw2_eid = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            kw3_eid = cnx.create_entity('Keyword', name=u'kw3', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            cnx.commit()
+
+            kw1 = cnx.find('Keyword', eid=kw1_eid).one()
+            kw2 = cnx.find('Keyword', eid=kw2_eid).one()
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw2.descendant_of], ['kw1', ])
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', ])
+            self.assertCountEqual([kw.name for kw in kw1.reverse_descendant_of], ['kw3', 'kw2'])
+            self.assertCountEqual([kw.name for kw in kw1.cw_adapt_to('ITree').recurse_children()], ['kw2', 'kw3'])
+            kw0_eid = cnx.create_entity('Keyword', name=u'kw0', included_in=self.classif1_eid).eid
+
+            cnx.execute('SET K1 subkeyword_of K0 WHERE K1 eid %(kw1)s, K0 eid %(kw0)s',
+                          {'kw1': kw1_eid, 'kw0': kw0_eid})
+            cnx.commit();
+
+            kw0 = cnx.find('Keyword', eid=kw0_eid).one()
+            kw1 = cnx.find('Keyword', eid=kw1_eid).one()
+            kw2 = cnx.find('Keyword', eid=kw2_eid).one()
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw0.cw_adapt_to('ITree').recurse_children()], ['kw1', 'kw2', 'kw3'])
+            self.assertCountEqual([kw.name for kw in kw0.reverse_descendant_of], ['kw3', 'kw2', 'kw1'])
+            self.assertCountEqual([kw.name for kw in kw1.descendant_of], ['kw0',])
+            self.assertCountEqual([kw.name for kw in kw2.descendant_of], ['kw1', 'kw0'])
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], ['kw1', 'kw0'])
 
 
     def test_keyword_delete(self):
         """*after_delete_relation* of ``subkeyword_of``
         """
-        req = self.request()
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', subkeyword_of=kw2, included_in=self.classif1)
-        kw4 = req.create_entity('Keyword', name=u'kw4', subkeyword_of=kw3, included_in=self.classif1)
-        kw5 = req.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4, included_in=self.classif1)
-        self.commit()
-        self.execute('DELETE K subkeyword_of K3 WHERE K is Keyword, K eid %(kw3)s',
-                     {'kw3':kw3.eid})
-        self.commit()
-        self.assertCountEqual([kw.name for kw in kw3.cw_adapt_to('ITree').iterparents()], [])
-        self.assertCountEqual([kw.name for kw in kw3.descendant_of], [])
-        self.assertCountEqual([kw.name for kw in kw3.reverse_descendant_of], ['kw5', 'kw4'])
-        self.assertCountEqual([kw.name for kw in kw3.cw_adapt_to('ITree').recurse_children()], ['kw5', 'kw4'])
+        with self.admin_access.cnx() as cnx:
+            kw1_eid = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid).eid
+            kw2_eid = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1_eid, included_in=self.classif1_eid).eid
+            kw3_eid = cnx.create_entity('Keyword', name=u'kw3', subkeyword_of=kw2_eid, included_in=self.classif1_eid).eid
+            kw4_eid = cnx.create_entity('Keyword', name=u'kw4', subkeyword_of=kw3_eid, included_in=self.classif1_eid).eid
+            kw5_eid = cnx.create_entity('Keyword', name=u'kw5',  subkeyword_of=kw4_eid, included_in=self.classif1_eid).eid
+            cnx.commit()
+            cnx.execute('DELETE K subkeyword_of K3 WHERE K is Keyword, K eid %(kw3)s',
+                         {'kw3':kw3_eid})
+            cnx.commit()
+            kw3 = cnx.find('Keyword', eid=kw3_eid).one()
+            self.assertCountEqual([kw.name for kw in kw3.cw_adapt_to('ITree').iterparents()], [])
+            self.assertCountEqual([kw.name for kw in kw3.descendant_of], [])
+            self.assertCountEqual([kw.name for kw in kw3.reverse_descendant_of], ['kw5', 'kw4'])
+            self.assertCountEqual([kw.name for kw in kw3.cw_adapt_to('ITree').recurse_children()], ['kw5', 'kw4'])
 
     def test_no_add_descendant_cycle(self):
         """no ``descendant_of`` cycle"""
-        req = self.request()
-        kw1 = req.create_entity('Keyword', name=u'kw1', included_in=self.classif1)
-        kw2 = req.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1)
-        kw3 = req.create_entity('Keyword', name=u'kw3', subkeyword_of=kw2, included_in=self.classif1)
-        self.commit()
-        rql = 'SET K1 descendant_of K3 WHERE K1 eid %(kw1)s, K3 eid %(kw3)s' % {'kw1':kw1.eid,  'kw3':kw3.eid}
-        self.assertRaises(ValidationError, self.execute, rql)
-        self.rollback()
-        kw4 = req.create_entity('Keyword', name=u'kw4', included_in=self.classif1)
-        kw5 = req.create_entity('Keyword', name=u'kw4', subkeyword_of=kw4, included_in=self.classif1)
-        self.commit()
-        with self.assertRaises(ValidationError) as cm:
-            self.execute('SET K4 descendant_of K5 WHERE K4 eid %(kw4)s, K5 eid %(kw5)s' % {'kw4':kw4.eid,  'kw5':kw5.eid})
+        with self.admin_access.cnx() as cnx:
+            kw1 = cnx.create_entity('Keyword', name=u'kw1', included_in=self.classif1_eid)
+            kw2 = cnx.create_entity('Keyword', name=u'kw2', subkeyword_of=kw1, included_in=self.classif1_eid)
+            kw3 = cnx.create_entity('Keyword', name=u'kw3', subkeyword_of=kw2, included_in=self.classif1_eid)
+            cnx.commit()
+            rql = 'SET K1 descendant_of K3 WHERE K1 eid %(kw1)s, K3 eid %(kw3)s' % {'kw1':kw1.eid,  'kw3':kw3.eid}
+            self.assertRaises(ValidationError, cnx.execute, rql)
+            cnx.rollback()
+            kw4 = cnx.create_entity('Keyword', name=u'kw4', included_in=self.classif1_eid)
+            kw5 = cnx.create_entity('Keyword', name=u'kw4', subkeyword_of=kw4, included_in=self.classif1_eid)
+            cnx.commit()
+            with self.assertRaises(ValidationError) as cm:
+                cnx.execute('SET K4 descendant_of K5 WHERE K4 eid %(kw4)s, K5 eid %(kw5)s' % {'kw4':kw4.eid,  'kw5':kw5.eid})
 
 if __name__ == '__main__':
     from logilab.common.testlib import unittest_main