From 947b8bb21235cdaaa7d1b203ef74c814a59c31ed Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 18 Jun 2009 07:30:21 +0000 Subject: 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. --- repoze/bfg/tests/test_threadlocal.py | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'repoze/bfg/tests/test_threadlocal.py') 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()) + -- cgit v1.2.3