Coverage.

Remove set_security_policies configurator API method.

8 files changed, 79 insertions, 14 deletions

diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py
index ed84735b4..1185f85c8 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/repoze/bfg/tests/test_configuration.py
@@ -122,6 +122,12 @@ class ConfiguratorTests(unittest.TestCase):
         result = config.registry.getUtility(IAuthenticationPolicy)
         self.assertEqual(policy, result)
 
+    def test_ctor_authorization_policy_only(self):
+        from zope.configuration.exceptions import ConfigurationError
+        policy = object()
+        config = self.assertRaises(ConfigurationError,
+                                   self._makeOne, authorization_policy=policy)
+
     def test_ctor_no_root_factory(self):
         from repoze.bfg.interfaces import IRootFactory
         config = self._makeOne()
@@ -2576,9 +2582,6 @@ class DummyConfigurator(object):
         self.package = package
         self.settings = settings
 
-    def hook_zca(self):
-        self.zca_hooked = True
-
     def load_zcml(self, filename):
         self.zcml_file = filename
     
diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py
index 2e3abe259..9d4a9838d 100644
--- a/repoze/bfg/tests/test_integration.py
+++ b/repoze/bfg/tests/test_integration.py
@@ -89,14 +89,3 @@ class DummyRequest:
     def get_response(self, application):
         return application(None, None)
 
-class DummyZCMLContext:
-    def __init__(self):
-        self.actions = []
-        self.info = None
-
-    def action(self, discriminator=None, callable=None, args=None):
-        self.actions.append(
-            {'discriminator':discriminator,
-             'callable':callable,
-             'args':args}
-            )
diff --git a/repoze/bfg/tests/test_path.py b/repoze/bfg/tests/test_path.py
index a6ff94327..8522eb387 100644
--- a/repoze/bfg/tests/test_path.py
+++ b/repoze/bfg/tests/test_path.py
@@ -129,6 +129,10 @@ class TestPackageName(unittest.TestCase):
         module = DummyPackageOrModule(test_path)
         result = self._callFUT(module)
         self.assertEqual(result, 'repoze.bfg.tests')
+
+    def test_it_None(self):
+        result = self._callFUT(None)
+        self.assertEqual(result, '__main__')
     
 class DummyPackageOrModule:
     def __init__(self, real_package_or_module, raise_exc=None):
diff --git a/repoze/bfg/tests/test_resource.py b/repoze/bfg/tests/test_resource.py
index 9fee4f359..2e55d1044 100644
--- a/repoze/bfg/tests/test_resource.py
+++ b/repoze/bfg/tests/test_resource.py
@@ -368,6 +368,14 @@ class Test_resolve_resource_spec(unittest.TestCase):
         self.assertEqual(package_name, 'repoze.bfg.nottests')
         self.assertEqual(filename, 'test_resource.py')
 
+    def test_package_name_is_None(self):
+        pkg = None
+        path = 'test_resource.py'
+        package_name, filename = self._callFUT(path, pkg)
+        self.assertEqual(package_name, None)
+        self.assertEqual(filename, 'test_resource.py')
+        
+
 class TestFileOverride(unittest.TestCase):
     def _getTargetClass(self):
         from repoze.bfg.resource import FileOverride
diff --git a/repoze/bfg/tests/test_traversal.py b/repoze/bfg/tests/test_traversal.py
index be62939e5..307c241b4 100644
--- a/repoze/bfg/tests/test_traversal.py
+++ b/repoze/bfg/tests/test_traversal.py
@@ -865,6 +865,14 @@ class TestVirtualRoot(unittest.TestCase):
         result = self._callFUT(context, request)
         self.assertEqual(result, context)
 
+    def test_default_no_registry_on_request(self):
+        context = DummyContext()
+        request = _makeRequest()
+        del request.registry
+        request.environ['PATH_INFO'] = '/'
+        result = self._callFUT(context, request)
+        self.assertEqual(result, context)
+
 class TraverseTests(unittest.TestCase):
     def setUp(self):
         cleanUp()
diff --git a/repoze/bfg/tests/test_url.py b/repoze/bfg/tests/test_url.py
index 52a19c7f8..86c1cdf11 100644
--- a/repoze/bfg/tests/test_url.py
+++ b/repoze/bfg/tests/test_url.py
@@ -127,6 +127,15 @@ class ModelURLTests(unittest.TestCase):
         result = self._callFUT(root, request)
         self.assertEqual(result, 'http://example.com:5432/')
 
+    def test_no_registry_on_request(self):
+        from repoze.bfg.threadlocal import get_current_registry
+        reg = get_current_registry()
+        request = DummyRequest()
+        self._registerContextURL(reg)
+        root = DummyContext()
+        result = self._callFUT(root, request)
+        self.assertEqual(result, 'http://example.com/context/')
+
 class TestRouteUrl(unittest.TestCase):
     def setUp(self):
         cleanUp()
@@ -224,6 +233,19 @@ class TestStaticUrl(unittest.TestCase):
         url = self._callFUT('repoze.bfg.tests:fixtures/minimal.pt', request)
         self.assertEqual(url, 'http://example.com:5432/1/2/3')
 
+    def test_found_abs_no_registry_on_request(self):
+        from repoze.bfg.threadlocal import get_current_registry
+        from repoze.bfg.interfaces import IRoutesMapper
+        from repoze.bfg.static import StaticRootFactory
+        factory = StaticRootFactory('repoze.bfg.tests:fixtures')
+        routes = [DummyRoute('name', factory=factory)]
+        mapper = DummyRoutesMapper(result='/1/2/3', routes = routes)
+        registry = get_current_registry()
+        registry.registerUtility(mapper, IRoutesMapper)
+        request = DummyRequest()
+        url = self._callFUT('repoze.bfg.tests:fixtures/minimal.pt', request)
+        self.assertEqual(url, 'http://example.com:5432/1/2/3')
+
 class DummyContext(object):
     def __init__(self, next=None):
         self.next = next
diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py
index 43e435eab..2b33a4ac7 100644
--- a/repoze/bfg/tests/test_view.py
+++ b/repoze/bfg/tests/test_view.py
@@ -56,6 +56,13 @@ class RenderViewToResponseTests(BaseTest, unittest.TestCase):
         result = self._callFUT(context, request, name='notregistered')
         self.assertEqual(result, None)
 
+    def test_call_no_registry_on_request(self):
+        request = self._makeRequest()
+        del request.registry
+        context = self._makeContext()
+        result = self._callFUT(context, request, name='notregistered')
+        self.assertEqual(result, None)
+
     def test_call_view_registered_secure(self):
         request = self._makeRequest()
         context = self._makeContext()
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 2ad26bc97..1954adf64 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -551,6 +551,30 @@ class TestResourceDirective(unittest.TestCase):
         self.assertEqual(action['args'], ('a', 'b', None))
 
 
+class TestRendererDirective(unittest.TestCase):
+    def setUp(self):
+        testing.setUp()
+
+    def tearDown(self):
+        testing.tearDown()
+
+    def _callFUT(self, *arg, **kw):
+        from repoze.bfg.zcml import renderer
+        return renderer(*arg, **kw)
+
+    def test_it(self):
+        from repoze.bfg.threadlocal import get_current_registry
+        from repoze.bfg.interfaces import IRendererFactory
+        context = DummyContext()
+        renderer = lambda *arg, **kw: None
+        self._callFUT(context, renderer, 'r')
+        actions = context.actions
+        self.assertEqual(len(actions), 1)
+        action = actions[0]
+        self.assertEqual(action['discriminator'], (IRendererFactory, 'r'))
+        reg = get_current_registry()
+        self.failUnless(reg.getUtility(IRendererFactory, 'r'), renderer)
+    
 class TestZCMLConfigure(unittest.TestCase):
     i = 0
     def _callFUT(self, path, package):