diff options
Diffstat (limited to 'repoze/bfg/tests/test_template.py')
| -rw-r--r-- | repoze/bfg/tests/test_template.py | 80 |
1 files changed, 29 insertions, 51 deletions
diff --git a/repoze/bfg/tests/test_template.py b/repoze/bfg/tests/test_template.py index 31aa074d8..8d16972b8 100644 --- a/repoze/bfg/tests/test_template.py +++ b/repoze/bfg/tests/test_template.py @@ -1,18 +1,18 @@ import unittest -from zope.component.testing import PlacelessSetup +from zope.testing.cleanup import cleanUp -class Base(PlacelessSetup): +class Base(object): def setUp(self): - from zope.deprecation import __show__ - __show__.off() - PlacelessSetup.setUp(self) + cleanUp() + import warnings + warnings.simplefilter('ignore') def tearDown(self): - from zope.deprecation import __show__ - __show__.on() - PlacelessSetup.tearDown(self) - + cleanUp() + import warnings + warnings.resetwarnings() + def _zcmlConfigure(self): import repoze.bfg.includes import zope.configuration.xmlconfig @@ -24,42 +24,28 @@ class Base(PlacelessSetup): here = os.path.abspath(os.path.dirname(__file__)) return os.path.join(here, 'fixtures', name) -class RenderTemplateTests(unittest.TestCase, Base): - def setUp(self): - Base.setUp(self) - - def tearDown(self): - Base.tearDown(self) - - def _getFUT(self): +class RenderTemplateTests(Base, unittest.TestCase): + def _callFUT(self, *arg, **kw): from repoze.bfg.template import render_template - return render_template + return render_template(*arg, **kw) def test_it(self): self._zcmlConfigure() minimal = self._getTemplatePath('minimal.pt') - render = self._getFUT() - result = render(minimal) + result = self._callFUT(minimal) self.failUnless(isinstance(result, str)) self.assertEqual(result, '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>') -class RenderTemplateToResponseTests(unittest.TestCase, Base): - def setUp(self): - Base.setUp(self) - - def tearDown(self): - Base.tearDown(self) - - def _getFUT(self): +class RenderTemplateToResponseTests(Base, unittest.TestCase): + def _callFUT(self, *arg, **kw): from repoze.bfg.template import render_template_to_response - return render_template_to_response + return render_template_to_response(*arg, **kw) def test_it(self): self._zcmlConfigure() minimal = self._getTemplatePath('minimal.pt') - render = self._getFUT() - result = render(minimal) + result = self._callFUT(minimal) from webob import Response self.failUnless(isinstance(result, Response)) self.assertEqual(result.app_iter, @@ -67,45 +53,37 @@ class RenderTemplateToResponseTests(unittest.TestCase, Base): self.assertEqual(result.status, '200 OK') self.assertEqual(len(result.headerlist), 2) -class GetTemplateTests(unittest.TestCase, Base): - def setUp(self): - Base.setUp(self) - - def tearDown(self): - Base.tearDown(self) - - def _getFUT(self): +class GetTemplateTests(Base, unittest.TestCase): + def _callFUT(self, *arg, **kw): from repoze.bfg.template import get_template - return get_template + return get_template(*arg, **kw) def test_nonabs_registered(self): self._zcmlConfigure() from zope.component import getGlobalSiteManager from zope.component import queryUtility from repoze.bfg.chameleon_zpt import ZPTTemplateFactory - from repoze.bfg.interfaces import ITemplate + from repoze.bfg.interfaces import ITemplateRenderer minimal = self._getTemplatePath('minimal.pt') utility = ZPTTemplateFactory(minimal) gsm = getGlobalSiteManager() - gsm.registerUtility(utility, ITemplate, name=minimal) - get = self._getFUT() - result = get(minimal) + gsm.registerUtility(utility, ITemplateRenderer, name=minimal) + result = self._callFUT(minimal) self.assertEqual(result.filename, minimal) - self.assertEqual(queryUtility(ITemplate, minimal), utility) + self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility) def test_nonabs_unregistered(self): self._zcmlConfigure() from zope.component import getGlobalSiteManager from zope.component import queryUtility from repoze.bfg.chameleon_zpt import ZPTTemplateFactory - from repoze.bfg.interfaces import ITemplate + from repoze.bfg.interfaces import ITemplateRenderer minimal = self._getTemplatePath('minimal.pt') - self.assertEqual(queryUtility(ITemplate, minimal), None) + self.assertEqual(queryUtility(ITemplateRenderer, minimal), None) utility = ZPTTemplateFactory(minimal) gsm = getGlobalSiteManager() - gsm.registerUtility(utility, ITemplate, name=minimal) - get = self._getFUT() - result = get(minimal) + gsm.registerUtility(utility, ITemplateRenderer, name=minimal) + result = self._callFUT(minimal) self.assertEqual(result.filename, minimal) - self.assertEqual(queryUtility(ITemplate, minimal), utility) + self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility) |