repoze.bfg.request.get_request -> repoze.bfg.threadlocal.get_current_request

repoze.bfg.registry.get_registry -> repoze.bfg.threadlocal.get_current_registry

Remove getSiteManager from registry module.

1 files changed, 43 insertions, 0 deletions

diff --git a/repoze/bfg/tests/test_threadlocal.py b/repoze/bfg/tests/test_threadlocal.py
index 230bb3726..2cf405508 100644
--- a/repoze/bfg/tests/test_threadlocal.py
+++ b/repoze/bfg/tests/test_threadlocal.py
@@ -44,3 +44,46 @@ class TestThreadLocalManager(unittest.TestCase):
         local.clear()
         self.assertEqual(local.get(), 1)
 
+
+class TestGetCurrentRequest(unittest.TestCase):
+    def _callFUT(self):
+        from repoze.bfg.threadlocal import get_current_request
+        return get_current_request()
+
+    def test_it_None(self):
+        request = self._callFUT()
+        self.assertEqual(request, None)
+
+    def test_it(self):
+        from repoze.bfg.threadlocal import manager
+        request = object()
+        try:
+            manager.push({'request':request})
+            self.assertEqual(self._callFUT(), request)
+        finally:
+            manager.pop()
+        self.assertEqual(self._callFUT(), None)
+
+class GetCurrentRegistryTests(unittest.TestCase):
+    def setUp(self):
+        cleanUp()
+
+    def tearDown(self):
+        cleanUp()
+        
+    def _callFUT(self):
+        from repoze.bfg.threadlocal import get_current_registry
+        return get_current_registry()
+
+    def test_local(self):
+        from repoze.bfg.threadlocal import manager
+        try:
+            manager.push({'registry':123})
+            self.assertEqual(self._callFUT(), 123)
+        finally:
+            manager.pop()
+    
+    def test_global(self):
+        from zope.component import getGlobalSiteManager
+        self.assertEqual(self._callFUT(), getGlobalSiteManager())
+