Coverage.

2 files changed, 38 insertions, 12 deletions

diff --git a/repoze/bfg/tests/test_renderers.py b/repoze/bfg/tests/test_renderers.py
index 3ceb672b8..6e33f4ce5 100644
--- a/repoze/bfg/tests/test_renderers.py
+++ b/repoze/bfg/tests/test_renderers.py
@@ -165,6 +165,21 @@ class TestRendererFromName(unittest.TestCase):
         result = self._callFUT(fixture)
         self.assertEqual(result, renderer)
 
+    def test_it_no_renderer(self):
+        self.assertRaises(ValueError, self._callFUT, 'foo')
+        
+
+class Test_json_renderer_factory(unittest.TestCase):
+    def _callFUT(self, name):
+        from repoze.bfg.renderers import json_renderer_factory
+        return json_renderer_factory(name)
+
+    def test_it(self):
+        renderer = self._callFUT(None)
+        result = renderer({'a':1})
+        self.assertEqual(result, '{"a": 1}')
+                          
+
 class DummyFactory:
     def __init__(self, renderer):
         self.renderer = renderer
diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py
index 3106359a3..c4bbb719c 100644
--- a/repoze/bfg/tests/test_view.py
+++ b/repoze/bfg/tests/test_view.py
@@ -631,7 +631,7 @@ class Test_map_view(unittest.TestCase):
         from repoze.bfg.view import map_view
         return map_view(view, *arg, **kw)
 
-    def _registerRenderer(self):
+    def _registerRenderer(self, name='.txt'):
         from repoze.bfg.interfaces import IRendererFactory
         from repoze.bfg.interfaces import ITemplateRenderer
         from zope.interface import implements
@@ -648,7 +648,7 @@ class Test_map_view(unittest.TestCase):
 
         factory = RendererFactory()
         sm = getSiteManager()
-        sm.registerUtility(factory, IRendererFactory, name='.txt')
+        sm.registerUtility(factory, IRendererFactory, name=name)
 
     def test_view_as_function_context_and_request(self):
         def view(context, request):
@@ -664,7 +664,7 @@ class Test_map_view(unittest.TestCase):
         self.failIf(result is view)
         self.assertRaises(TypeError, result, None, None)
 
-    def test_view_as_function_with_attr_and_template(self):
+    def test_view_as_function_with_attr_and_renderer(self):
         self._registerRenderer()
         def view(context, request):
             """ """
@@ -719,7 +719,7 @@ class Test_map_view(unittest.TestCase):
         self.assertEqual(view.__name__, result.__name__)
         self.assertEqual(result(None, None), 'OK')
 
-    def test_view_as_newstyle_class_context_and_request_with_attr_and_template(
+    def test_view_as_newstyle_class_context_and_request_with_attr_and_renderer(
         self):
         self._registerRenderer()
         class view(object):
@@ -762,7 +762,7 @@ class Test_map_view(unittest.TestCase):
         self.assertEqual(view.__name__, result.__name__)
         self.assertEqual(result(None, None), 'OK')
 
-    def test_view_as_newstyle_class_requestonly_with_attr_and_template(self):
+    def test_view_as_newstyle_class_requestonly_with_attr_and_renderer(self):
         self._registerRenderer()
         class view(object):
             def __init__(self, request):
@@ -804,7 +804,7 @@ class Test_map_view(unittest.TestCase):
         self.assertEqual(view.__name__, result.__name__)
         self.assertEqual(result(None, None), 'OK')
 
-    def test_view_as_oldstyle_class_context_and_request_with_attr_and_template(
+    def test_view_as_oldstyle_class_context_and_request_with_attr_and_renderer(
         self):
         self._registerRenderer()
         class view:
@@ -847,7 +847,7 @@ class Test_map_view(unittest.TestCase):
         self.assertEqual(view.__name__, result.__name__)
         self.assertEqual(result(None, None), 'OK')
 
-    def test_view_as_oldstyle_class_requestonly_with_attr_and_template(self):
+    def test_view_as_oldstyle_class_requestonly_with_attr_and_renderer(self):
         self._registerRenderer()
         class view:
             def __init__(self, request):
@@ -881,7 +881,7 @@ class Test_map_view(unittest.TestCase):
         self.failIf(result is view)
         self.assertEqual(result(None, None), 'OK')
 
-    def test_view_as_instance_context_and_request_attr_and_template(self):
+    def test_view_as_instance_context_and_request_attr_and_renderer(self):
         self._registerRenderer()
         class View:
             def index(self, context, request):
@@ -917,7 +917,7 @@ class Test_map_view(unittest.TestCase):
         self.failUnless('instance' in result.__name__)
         self.assertEqual(result(None, None), 'OK')
 
-    def test_view_as_instance_requestonly_with_attr_and_template(self):
+    def test_view_as_instance_requestonly_with_attr_and_renderer(self):
         self._registerRenderer()
         class View:
             def index(self, request):
@@ -932,7 +932,7 @@ class Test_map_view(unittest.TestCase):
         request = DummyRequest()
         self.assertEqual(result(None, request).body, 'Hello!')
 
-    def test_view_templateonly(self):
+    def test_view_rendereronly(self):
         self._registerRenderer()
         def view(context, request):
             return {'a':'1'}
@@ -944,6 +944,17 @@ class Test_map_view(unittest.TestCase):
         request = DummyRequest()
         self.assertEqual(result(None, request).body, 'Hello!')
 
+    def test_view_defaultrendereronly(self):
+        self._registerRenderer(name='')
+        def view(context, request):
+            return {'a':'1'}
+        result = self._callFUT(view)
+        self.failIf(result is view)
+        self.assertEqual(view.__module__, result.__module__)
+        self.assertEqual(view.__doc__, result.__doc__)
+        request = DummyRequest()
+        self.assertEqual(result(None, request).body, 'Hello!')
+
 class TestRequestOnly(unittest.TestCase):
     def _callFUT(self, arg):
         from repoze.bfg.view import requestonly
@@ -1153,12 +1164,12 @@ class Test_rendered_response(unittest.TestCase):
     def tearDown(self):
         cleanUp()
 
-    def _callFUT(self, template_name, response, view=None,
+    def _callFUT(self, renderer_name, response, view=None,
                  context=None, request=None):
         from repoze.bfg.view import rendered_response
         if request is None:
             request = DummyRequest()
-        return rendered_response(template_name, response, view, context,
+        return rendered_response(renderer_name, response, view, context,
                                  request)
 
     def _registerRenderer(self):