← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/routing/test_router.py

  • Committer: William Grant
  • Date: 2009-07-05 03:49:31 UTC
  • mto: (1294.4.2 ui-the-third)
  • mto: This revision was merged to the branch mainline in revision 1353.
  • Revision ID: grantw@unimelb.edu.au-20090705034931-e41r97axkoxeitw6
Move i.w.tutorial traversal stuff into i.w.tutorial.traversal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/routing/test_router.py
1
1
from nose.tools import assert_equal, raises
2
2
 
3
 
from ivle.webapp.publisher import (INF, InsufficientPathSegments, NoPath,
4
 
                                   NotFound, RouteConflict, Publisher, ROOT)
 
3
from ivle.webapp.routing import (INF, InsufficientPathSegments, NoPath,
 
4
                                 NotFound, RouteConflict, Router, ROOT)
5
5
 
6
6
class Root(object):
7
7
    def __init__(self):
147
147
class TestResolution(BaseTest):
148
148
    def setUp(self):
149
149
        super(TestResolution, self).setUp()
150
 
        self.rtr = Publisher(root=self.r, viewset='browser')
 
150
        self.rtr = Router(root=self.r, viewset='browser')
151
151
        self.rtr.add_set_switch('api', 'api')
152
152
        self.rtr.add_forward(Root, None, root_to_subject, 1)
153
153
        self.rtr.add_forward(Subject, None, subject_to_offering, 2)
304
304
class TestGeneration(BaseTest):
305
305
    def setUp(self):
306
306
        super(TestGeneration, self).setUp()
307
 
        self.rtr = Publisher(root=self.r, viewset='browser')
 
307
        self.rtr = Router(root=self.r, viewset='browser')
308
308
        self.rtr.add_set_switch('api', 'api')
309
309
        self.rtr.add_reverse(Subject, subject_url)
310
310
        self.rtr.add_reverse(Offering, offering_url)
408
408
        '/info1/2009/1/+projects/p1'
409
409
        )
410
410
 
411
 
    def testRoot(self):
412
 
        assert_equal(self.rtr.generate(self.r), '/')
413
411
 
414
412
 
415
413
class TestErrors(BaseTest):
416
414
    def setUp(self):
417
415
        super(TestErrors, self).setUp()
418
 
        self.rtr = Publisher(root=self.r)
 
416
        self.rtr = Router(root=self.r)
419
417
        self.rtr.add_forward(Root, None, root_to_subject, 1)
420
418
        self.rtr.add_forward(Subject, '+foo', lambda s: s.name + 'foo', 0)
421
419
        self.rtr.add_forward(Subject, None, subject_to_offering, 2)