diff --git a/test/data/schema.py b/test/data/schema.py
index c5ccf314a53b9bcdd207e6f9d207a64f2173cf2f_dGVzdC9kYXRhL3NjaGVtYS5weQ==..02a1745b571bce7151fae2cffa44a00c0424340e_dGVzdC9kYXRhL3NjaGVtYS5weQ== 100644
--- a/test/data/schema.py
+++ b/test/data/schema.py
@@ -1,3 +1,5 @@
+from yams.buildobjs import RelationDefinition
+
class comments(RelationDefinition):
subject = 'Comment'
object = ('CWUser', 'BlogEntry')
@@ -1,5 +3,5 @@
class comments(RelationDefinition):
subject = 'Comment'
object = ('CWUser', 'BlogEntry')
- cardinality='1*'
- composite='object'
+ cardinality = '1*'
+ composite = 'object'
diff --git a/test/unittest_comment.py b/test/unittest_comment.py
index c5ccf314a53b9bcdd207e6f9d207a64f2173cf2f_dGVzdC91bml0dGVzdF9jb21tZW50LnB5..02a1745b571bce7151fae2cffa44a00c0424340e_dGVzdC91bml0dGVzdF9jb21tZW50LnB5 100644
--- a/test/unittest_comment.py
+++ b/test/unittest_comment.py
@@ -23,5 +23,5 @@
def test_possible_views(self):
# comment primary view priority
rset, req = self.rset_and_req('Comment X')
- self.assertIsInstance(self.vreg.select_view('primary', req, rset),
+ self.assertIsInstance(self.vreg['views'].select('primary', req, rset=rset),
views.CommentPrimaryView)
@@ -27,5 +27,5 @@
views.CommentPrimaryView)
- self.assertIsInstance(self.vreg.select_view('tree', req, rset),
+ self.assertIsInstance(self.vreg['views'].select('tree', req, rset=rset),
views.CommentThreadView)
def test_possible_actions(self):
@@ -33,6 +33,7 @@
self.failUnlessEqual(self.pactions(req, rset),
[('edit', actions.ModifyAction),
('managepermission', actions.ManagePermissionsAction),
+ ('addrelated', actions.AddRelatedActions),
('delete', actions.DeleteAction),
('copy', actions.CopyAction),
('reply_comment', views.AddCommentAction)])
@@ -40,5 +41,6 @@
self.failUnlessEqual(self.pactions(req, rset),
[('edit', actions.ModifyAction),
('managepermission', actions.ManagePermissionsAction),
+ ('addrelated', actions.AddRelatedActions),
('delete', actions.DeleteAction),
('copy', actions.CopyAction),
@@ -43,7 +45,8 @@
('delete', actions.DeleteAction),
('copy', actions.CopyAction),
+ ('delete_comment', views.DeleteCommentAction),
('edit_comment', views.EditCommentAction),
('reply_comment', views.ReplyCommentAction)])
cnx = self.login('user')
rset, req = self.rset_and_req('Any X WHERE X is Comment')
self.failUnlessEqual(self.pactions(req, rset),
@@ -45,11 +48,12 @@
('edit_comment', views.EditCommentAction),
('reply_comment', views.ReplyCommentAction)])
cnx = self.login('user')
rset, req = self.rset_and_req('Any X WHERE X is Comment')
self.failUnlessEqual(self.pactions(req, rset),
- [('copy', actions.CopyAction),
+ [('addrelated', actions.AddRelatedActions),
+ ('copy', actions.CopyAction),
('reply_comment', views.ReplyCommentAction)])
rset = self.execute('INSERT Comment X: X content "ho bah non!", X comments B WHERE B is Comment')
cnx.commit()
self.failUnlessEqual(self.pactions(rset.req, rset),
[('edit', actions.ModifyAction),
@@ -51,7 +55,8 @@
('reply_comment', views.ReplyCommentAction)])
rset = self.execute('INSERT Comment X: X content "ho bah non!", X comments B WHERE B is Comment')
cnx.commit()
self.failUnlessEqual(self.pactions(rset.req, rset),
[('edit', actions.ModifyAction),
+ ('addrelated', actions.AddRelatedActions),
('delete', actions.DeleteAction),
('copy', actions.CopyAction),
@@ -56,5 +61,6 @@
('delete', actions.DeleteAction),
('copy', actions.CopyAction),
+ ('delete_comment', views.DeleteCommentAction),
('edit_comment', views.EditCommentAction),
('reply_comment', views.ReplyCommentAction)])
cnx.rollback()
@@ -70,8 +76,8 @@
# now two comments are commenting this blog
rset, req = self.rset_and_req('Any C WHERE C comments X, X eid %s' % beid)
self.assertEquals(len(rset), 2)
- self.failUnless(self.vreg.select_action('reply_comment', req, rset, row=0))
- self.failUnless(self.vreg.select_action('reply_comment', req, rset, row=1))
+ self.failUnless(self.vreg['actions'].select('reply_comment', req, rset=rset, row=0))
+ self.failUnless(self.vreg['actions'].select('reply_comment', req, rset=rset, row=1))
def test_add_related_actions(self):
rset, req = self.rset_and_req('Any X WHERE X is Comment')
@@ -105,8 +111,8 @@
Yeah !"""})[0][0]
self.commit()
c2rset= self.execute('Any X WHERE X eid %(x)s', {'x': c2eid}, 'x')
- v = self.vreg.select_view('fullthreadtext', self.request(),
- c2rset, row=0)
+ v = self.vreg['views'].select('fullthreadtext', self.request(),
+ rset=c2rset, row=0)
content = v.render(row=0)
# remove date
content = re.sub('..../../.. ..:..', '', content)
@@ -128,7 +134,6 @@
> On - admin wrote :
> some long **HTML** text which _should not_ fit on 80 characters, so i\'ll add
> some extra xxxxxxx. Yeah !
->
''')
diff --git a/test/unittest_hooks.py b/test/unittest_hooks.py
index c5ccf314a53b9bcdd207e6f9d207a64f2173cf2f_dGVzdC91bml0dGVzdF9ob29rcy5weQ==..02a1745b571bce7151fae2cffa44a00c0424340e_dGVzdC91bml0dGVzdF9ob29rcy5weQ== 100644
--- a/test/unittest_hooks.py
+++ b/test/unittest_hooks.py
@@ -11,5 +11,6 @@
req = self.session()
c = self.entity('Comment X', req=req)
req.set_pool()
- v = self.vreg.select_view('notif_after_add_relation_comments', req, c.rset, row=0)
+ v = self.vreg['views'].select('notif_after_add_relation_comments', req,
+ rset=c.rset, row=0)
content = v.render(row=0)
@@ -15,5 +16,5 @@
content = v.render(row=0)
- self.assertEquals(content,
+ self.assertTextEquals(content,
'''Yo !
@@ -22,7 +23,7 @@
c.comments[0].eid)
self.assertEquals(v.subject(), 'new comment for blogentry une news !')
-
+
if __name__ == '__main__':
from logilab.common.testlib import unittest_main
unittest_main()