Reword notfound and forbidden view handlers.

1 files changed, 16 insertions, 14 deletions

diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index f73fde9a7..ceb156f27 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -137,35 +137,39 @@ class TestForbiddenDirective(unittest.TestCase):
         self.assertEqual(derived_view(None, None), 'OK')
         self.assertEqual(derived_view.__name__, view.__name__)
 
-class TestViewUtility(unittest.TestCase):
+class TestSystemViewHandler(unittest.TestCase):
     def setUp(self):
         testing.setUp()
 
     def tearDown(self):
         testing.tearDown()
 
-    def _callFUT(self, context, view, attr, renderer, wrapper, iface):
-        from repoze.bfg.zcml import view_utility
-        return view_utility(context, view, attr, renderer, wrapper, iface)
+    def _makeOne(self, iface):
+        from repoze.bfg.zcml import SystemViewHandler
+        return SystemViewHandler(iface)
 
     def test_no_view_no_renderer(self):
+        handler = self._makeOne(IDummy)
         from zope.configuration.exceptions import ConfigurationError
         context = DummyContext()
-        self.assertRaises(ConfigurationError, self._callFUT, context,
-                          None, None, None, None, None)
+        handler(context)
+        actions = context.actions
+        self.assertEqual(len(actions), 1)
+        regadapt = actions[0]
+        self.assertEqual(regadapt['discriminator'], IDummy)
+        register = regadapt['callable']
+        self.assertRaises(ConfigurationError, register)
     
     def test_no_view_with_renderer(self):
         from zope.component import getSiteManager
-        from zope.interface import Interface
         from repoze.bfg.interfaces import IRendererFactory
         sm = getSiteManager()
         def renderer(path):
             return lambda *arg: 'OK'
         sm.registerUtility(renderer, IRendererFactory, name='dummy')
-        class IDummy(Interface):
-            pass
         context = DummyContext()
-        self._callFUT(context, None, None, 'dummy', None, IDummy)
+        handler = self._makeOne(IDummy)
+        handler(context, renderer='dummy')
         actions = context.actions
         self.assertEqual(len(actions), 1)
         regadapt = actions[0]
@@ -178,16 +182,14 @@ class TestViewUtility(unittest.TestCase):
 
     def test_template_renderer(self):
         from zope.component import getSiteManager
-        from zope.interface import Interface
         from repoze.bfg.interfaces import IRendererFactory
         sm = getSiteManager()
         def renderer(path):
             return lambda *arg: 'OK'
         sm.registerUtility(renderer, IRendererFactory, name='.pt')
-        class IDummy(Interface):
-            pass
         context = DummyContext()
-        self._callFUT(context, None, None, 'fixtures/minimal.pt', None, IDummy)
+        handler = self._makeOne(IDummy)
+        handler(context, renderer='fixtures/minimal.pt')
         actions = context.actions
         self.assertEqual(len(actions), 1)
         regadapt = actions[0]