--- a/web/test/unittest_views_navigation.py	Fri Jun 05 15:06:55 2009 +0200
+++ b/web/test/unittest_views_navigation.py	Fri Jun 05 15:09:20 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_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
         self.assertIsInstance(navcomp, PageNavigation)
         req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg.select_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', '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_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
         self.assertIsInstance(navcomp, SortedNavigation)
         req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg.select_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', '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_component('navigation', req, rset)
+        navcomp = self.vreg.select_object('components', 'navigation', req, rset=rset)
         self.assertEquals(navcomp, None)
         req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg.select_component('navigation', req, rset)
+        navcomp = self.vreg.select_object('components', '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_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
         self.assertIsInstance(navcomp, SortedNavigation)
         req.set_search_state('W:X:Y:Z')
-        navcomp = self.vreg.select_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', '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_component('navigation', rset.req, rset)
+        navcomp = self.vreg.select('components', 'navigation', rset.req, rset=rset)
         html = navcomp.render()
         rset = self.execute('Any RDEF ORDERBY RT WHERE RDEF relation_type RT')
-        navcomp = self.vreg.select_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
         html = navcomp.render()
         rset = self.execute('Any RDEF ORDERBY RDEF WHERE RDEF relation_type RT')
-        navcomp = self.vreg.select_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', 'navigation', req, rset=rset)
         html = navcomp.render()
         rset = self.execute('CWAttribute RDEF ORDERBY RDEF')
-        navcomp = self.vreg.select_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', '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_component('navigation', req, rset)
+        navcomp = self.vreg.select('components', '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_component('navigation', rset.req, rset)
+        navcomp = self.vreg.select('components', 'navigation', rset.req, rset=rset)
         html = navcomp.render()
 
 
@@ -77,12 +77,12 @@
         view = mock_object(is_primary=lambda x: True)
         rset = self.execute('CWUser X LIMIT 1')
         req = self.request()
-        objs = self.vreg.possible_vobjects('contentnavigation', req, rset,
+        objs = self.vreg.possible_vobjects('contentnavigation', req, rset=rset,
                                            view=view, context='navtop')
         # breadcrumbs should be in headers by default
         clsids = set(obj.id for obj in objs)
         self.failUnless('breadcrumbs' in clsids)
-        objs = self.vreg.possible_vobjects('contentnavigation', req, rset,
+        objs = self.vreg.possible_vobjects('contentnavigation', req, rset=rset,
                                           view=view, context='navbottom')
         # breadcrumbs should _NOT_ be in footers by default
         clsids = set(obj.id for obj in objs)
@@ -91,12 +91,12 @@
                      'P value "navbottom"')
         # breadcrumbs should now be in footers
         req.cnx.commit()
-        objs = self.vreg.possible_vobjects('contentnavigation', req, rset,
+        objs = self.vreg.possible_vobjects('contentnavigation', req, rset=rset,
                                           view=view, context='navbottom')
 
         clsids = [obj.id for obj in objs]
         self.failUnless('breadcrumbs' in clsids)
-        objs = self.vreg.possible_vobjects('contentnavigation', req, rset,
+        objs = self.vreg.possible_vobjects('contentnavigation', req, rset=rset,
                                           view=view, context='navtop')
 
         clsids = [obj.id for obj in objs]