--- a/web/test/unittest_views_navigation.py Mon Aug 03 15:57:05 2009 +0200
+++ b/web/test/unittest_views_navigation.py Mon Aug 03 16:31:30 2009 +0200
@@ -19,31 +19,31 @@
def test_navigation_selection(self):
rset = self.execute('Any X,N WHERE X name N')
req = self.request()
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
self.assertIsInstance(navcomp, PageNavigation)
req.set_search_state('W:X:Y:Z')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
self.assertIsInstance(navcomp, PageNavigation)
req.set_search_state('normal')
rset = self.execute('Any X,N ORDERBY N WHERE X name N')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
self.assertIsInstance(navcomp, SortedNavigation)
req.set_search_state('W:X:Y:Z')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
self.assertIsInstance(navcomp, SortedNavigation)
req.set_search_state('normal')
rset = self.execute('Any X,N LIMIT 10 WHERE X name N')
- navcomp = self.vreg.select_object('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select_object('navigation', req, rset=rset)
self.assertEquals(navcomp, None)
req.set_search_state('W:X:Y:Z')
- navcomp = self.vreg.select_object('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select_object('navigation', req, rset=rset)
self.assertEquals(navcomp, None)
req.set_search_state('normal')
rset = self.execute('Any N, COUNT(RDEF) GROUPBY N ORDERBY N WHERE RDEF relation_type RT, RT name N')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
self.assertIsInstance(navcomp, SortedNavigation)
req.set_search_state('W:X:Y:Z')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
self.assertIsInstance(navcomp, SortedNavigation)
@@ -51,22 +51,22 @@
rset = self.execute('Any X,N ORDERBY N WHERE X name N')
req = self.request()
req.set_search_state('W:X:Y:Z')
- navcomp = self.vreg.select('components', 'navigation', rset.req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', rset.req, rset=rset)
html = navcomp.render()
rset = self.execute('Any RDEF ORDERBY RT WHERE RDEF relation_type RT')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
html = navcomp.render()
rset = self.execute('Any RDEF ORDERBY RDEF WHERE RDEF relation_type RT')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
html = navcomp.render()
rset = self.execute('CWAttribute RDEF ORDERBY RDEF')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
html = navcomp.render()
rset = self.execute('Any RDEF ORDERBY N WHERE RDEF relation_type RT, RT name N')
- navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', req, rset=rset)
html = navcomp.render()
rset = self.execute('Any N, COUNT(RDEF) GROUPBY N ORDERBY N WHERE RDEF relation_type RT, RT name N')
- navcomp = self.vreg.select('components', 'navigation', rset.req, rset=rset)
+ navcomp = self.vreg['components'].select('navigation', rset.req, rset=rset)
html = navcomp.render()