summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-01-15 01:05:18 +0000
committerChris McDonough <chrism@agendaless.com>2009-01-15 01:05:18 +0000
commit7cd5d4bf56a8ccd6ae2eeb0cd4be0f1688892e0f (patch)
tree0e742f4fbe2d842125b06694dbd6aed40f5a37a4
parentc8cf2256655ee4b34ec501325b9016608b5cce5f (diff)
downloadpyramid-7cd5d4bf56a8ccd6ae2eeb0cd4be0f1688892e0f.tar.gz
pyramid-7cd5d4bf56a8ccd6ae2eeb0cd4be0f1688892e0f.tar.bz2
pyramid-7cd5d4bf56a8ccd6ae2eeb0cd4be0f1688892e0f.zip
Test coverage.
-rw-r--r--repoze/bfg/chameleon_genshi.py1
-rw-r--r--repoze/bfg/chameleon_text.py1
-rw-r--r--repoze/bfg/chameleon_zpt.py1
-rw-r--r--repoze/bfg/router.py2
-rw-r--r--repoze/bfg/tests/test_router.py11
-rw-r--r--repoze/bfg/tests/test_xslt.py21
6 files changed, 33 insertions, 4 deletions
diff --git a/repoze/bfg/chameleon_genshi.py b/repoze/bfg/chameleon_genshi.py
index 8c33dee14..69047abc7 100644
--- a/repoze/bfg/chameleon_genshi.py
+++ b/repoze/bfg/chameleon_genshi.py
@@ -73,4 +73,3 @@ def render_template_to_response(path, **kw):
result = renderer(**kw)
response_factory = queryUtility(IResponseFactory, default=Response)
return response_factory(result)
-
diff --git a/repoze/bfg/chameleon_text.py b/repoze/bfg/chameleon_text.py
index 525957af1..453328d9c 100644
--- a/repoze/bfg/chameleon_text.py
+++ b/repoze/bfg/chameleon_text.py
@@ -84,4 +84,3 @@ def render_template_to_response(path, **kw):
result = renderer(**kw)
response_factory = queryUtility(IResponseFactory, default=Response)
return response_factory(result)
-
diff --git a/repoze/bfg/chameleon_zpt.py b/repoze/bfg/chameleon_zpt.py
index c3662770f..187395bc6 100644
--- a/repoze/bfg/chameleon_zpt.py
+++ b/repoze/bfg/chameleon_zpt.py
@@ -75,4 +75,3 @@ def render_template_to_response(path, **kw):
result = renderer(**kw)
response_factory = queryUtility(IResponseFactory, default=Response)
return response_factory(result)
-
diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index 755434870..4494fc506 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -49,7 +49,7 @@ class Router(object):
@property
def root_policy(self):
""" Backwards compatibility alias """
- return self.registry.getUtility(IRootFactory)
+ return getUtility(IRootFactory)
def __call__(self, environ, start_response):
"""
diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index e0d27b332..0a3928d40 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -93,6 +93,17 @@ class RouterTests(unittest.TestCase):
environ.update(extras)
return environ
+ def test_root_policy(self):
+ rootfactory = make_rootfactory(None)
+ environ = self._makeEnviron()
+ context = DummyContext()
+ traversalfactory = make_traversal_factory(context, '', [])
+ self._registerTraverserFactory(traversalfactory, '', None)
+ logger = self._registerLogger()
+ self._registerRootFactory(rootfactory)
+ router = self._makeOne(None)
+ self.assertEqual(router.root_policy, rootfactory)
+
def test_call_no_view_registered_no_isettings(self):
rootfactory = make_rootfactory(None)
environ = self._makeEnviron()
diff --git a/repoze/bfg/tests/test_xslt.py b/repoze/bfg/tests/test_xslt.py
index 38e693937..eed0fc808 100644
--- a/repoze/bfg/tests/test_xslt.py
+++ b/repoze/bfg/tests/test_xslt.py
@@ -198,3 +198,24 @@ class RenderTransformTests(Base, unittest.TestCase):
self.assertEqual(result, resultstr)
self.assertEqual(queryUtility(INodeTemplateRenderer, minimal), utility)
+class TestGetProcessor(Base, unittest.TestCase):
+ def _callFUT(self, fn, auto_reload=False):
+ from repoze.bfg.xslt import get_processor
+ return get_processor(fn, auto_reload)
+
+ def test_no_processors(self):
+ from lxml.etree import XSLT
+ from repoze.bfg.xslt import xslt_pool
+ del xslt_pool.processors
+ path = self._getTemplatePath('minimal.xsl')
+ result = self._callFUT(path)
+ self.failUnless(isinstance(result, XSLT))
+
+ def test_empty_processors(self):
+ from lxml.etree import XSLT
+ from repoze.bfg.xslt import xslt_pool
+ xslt_pool.processors = {}
+ path = self._getTemplatePath('minimal.xsl')
+ result = self._callFUT(path)
+ self.failUnless(isinstance(result, XSLT))
+