--- a/web/test/unittest_viewselector.py Wed Sep 14 09:11:50 2011 +0200
+++ b/web/test/unittest_viewselector.py Wed Sep 14 09:55:51 2011 +0200
@@ -344,21 +344,21 @@
req = self.request()
self.assertIsInstance(self.vreg['views'].select('index', req, rset=rset),
startup.IndexView)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'primary', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'table', req, rset=rset)
# no entity
req = self.request()
rset = req.execute('Any X WHERE X eid 999999')
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'index', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'creation', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'primary', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'table', req, rset=rset)
# one entity
req = self.request()
@@ -371,9 +371,9 @@
editforms.EditionFormView)
self.assertIsInstance(self.vreg['views'].select('table', req, rset=rset),
tableview.TableView)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'creation', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'index', req, rset=rset)
# list of entities of the same type
req = self.request()
@@ -384,7 +384,7 @@
baseviews.ListView)
self.assertIsInstance(self.vreg['views'].select('table', req, rset=rset),
tableview.TableView)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'creation', req, rset=rset)
# list of entities of different types
req = self.request()
@@ -395,31 +395,31 @@
baseviews.ListView)
self.assertIsInstance(self.vreg['views'].select('table', req, rset=rset),
tableview.TableView)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'creation', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'index', req, rset=rset)
# whatever
req = self.request()
rset = req.execute('Any N, X WHERE X in_group Y, Y name N')
self.assertIsInstance(self.vreg['views'].select('table', req, rset=rset),
tableview.TableView)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'index', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'creation', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'primary', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'list', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'edition', req, rset=rset)
# mixed query
req = self.request()
rset = req.execute('Any U,G WHERE U is CWUser, G is CWGroup')
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'edition', req, rset=rset)
- self.assertTrueRaises(NoSelectableObject,
+ self.assertRaises(NoSelectableObject,
self.vreg['views'].select, 'creation', req, rset=rset)
self.assertIsInstance(self.vreg['views'].select('table', req, rset=rset),
tableview.TableView)