- Remove the ``ITestingTemplateRenderer`` interface. When

    ``testing.registerDummyRenderer`` is used, it now registers a
    dummy implementation using ``ITemplateRenderer`` interface, which
    is checked for when the built-in templating facilities do
    rendering.  This change also allows developers to make explcit
    named utility registrations in the ZCML registry against
    ``ITemplateRenderer``; these will be found before any on-disk
    template.

3 files changed, 18 insertions, 18 deletions

diff --git a/repoze/bfg/tests/test_chameleon_genshi.py b/repoze/bfg/tests/test_chameleon_genshi.py
index 5a31ca6fa..8012101f5 100644
--- a/repoze/bfg/tests/test_chameleon_genshi.py
+++ b/repoze/bfg/tests/test_chameleon_genshi.py
@@ -140,16 +140,16 @@ class GetRendererTests(unittest.TestCase, Base):
         self.assertEqual(result, utility)
         self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
 
-    def test_testing(self):
+    def test_explicit_registration(self):
         from zope.component import getGlobalSiteManager
-        from repoze.bfg.interfaces import ITestingTemplateRenderer
+        from repoze.bfg.interfaces import ITemplateRenderer
         class Dummy:
             template = object()
             def implementation(self):
                 return self.template
         gsm = getGlobalSiteManager()
         utility = Dummy()
-        gsm.registerUtility(utility, ITestingTemplateRenderer, name='foo')
+        gsm.registerUtility(utility, ITemplateRenderer, name='foo')
         get = self._getFUT()
         result = get('foo')
         self.failUnless(result is utility)
@@ -195,16 +195,16 @@ class GetTemplateTests(unittest.TestCase, Base):
         self.assertEqual(result.filename, minimal)
         self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
 
-    def test_testing(self):
+    def test_explicit_registration(self):
         from zope.component import getGlobalSiteManager
-        from repoze.bfg.interfaces import ITestingTemplateRenderer
+        from repoze.bfg.interfaces import ITemplateRenderer
         class Dummy:
             template = object()
             def implementation(self):
                 return self.template
         gsm = getGlobalSiteManager()
         utility = Dummy()
-        gsm.registerUtility(utility, ITestingTemplateRenderer, name='foo')
+        gsm.registerUtility(utility, ITemplateRenderer, name='foo')
         get = self._getFUT()
         result = get('foo')
         self.failUnless(result is utility.template)
diff --git a/repoze/bfg/tests/test_chameleon_text.py b/repoze/bfg/tests/test_chameleon_text.py
index 8e53b7ff9..594c2806f 100644
--- a/repoze/bfg/tests/test_chameleon_text.py
+++ b/repoze/bfg/tests/test_chameleon_text.py
@@ -150,16 +150,16 @@ class GetRendererTests(unittest.TestCase, Base):
         self.assertEqual(result, utility)
         self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
 
-    def test_testing(self):
+    def test_explicit_registration(self):
         from zope.component import getGlobalSiteManager
-        from repoze.bfg.interfaces import ITestingTemplateRenderer
+        from repoze.bfg.interfaces import ITemplateRenderer
         class Dummy:
             template = object()
             def implementation(self):
                 return self.template
         gsm = getGlobalSiteManager()
         utility = Dummy()
-        gsm.registerUtility(utility, ITestingTemplateRenderer, name='foo')
+        gsm.registerUtility(utility, ITemplateRenderer, name='foo')
         get = self._getFUT()
         result = get('foo')
         self.failUnless(result is utility)
@@ -206,16 +206,16 @@ class GetTemplateTests(unittest.TestCase, Base):
         self.assertEqual(result.filename, minimal)
         self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
 
-    def test_testing(self):
+    def test_explicit_registration(self):
         from zope.component import getGlobalSiteManager
-        from repoze.bfg.interfaces import ITestingTemplateRenderer
+        from repoze.bfg.interfaces import ITemplateRenderer
         class Dummy:
             template = object()
             def implementation(self):
                 return self.template
         gsm = getGlobalSiteManager()
         utility = Dummy()
-        gsm.registerUtility(utility, ITestingTemplateRenderer, name='foo')
+        gsm.registerUtility(utility, ITemplateRenderer, name='foo')
         get = self._getFUT()
         result = get('foo')
         self.failUnless(result is utility.template)
diff --git a/repoze/bfg/tests/test_chameleon_zpt.py b/repoze/bfg/tests/test_chameleon_zpt.py
index 3ec956217..d2ee1704f 100644
--- a/repoze/bfg/tests/test_chameleon_zpt.py
+++ b/repoze/bfg/tests/test_chameleon_zpt.py
@@ -143,16 +143,16 @@ class GetRendererTests(unittest.TestCase, Base):
         self.assertEqual(result, utility)
         self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
 
-    def test_testing(self):
+    def test_explicit_registration(self):
         from zope.component import getGlobalSiteManager
-        from repoze.bfg.interfaces import ITestingTemplateRenderer
+        from repoze.bfg.interfaces import ITemplateRenderer
         class Dummy:
             template = object()
             def implementation(self):
                 return self.template
         gsm = getGlobalSiteManager()
         utility = Dummy()
-        gsm.registerUtility(utility, ITestingTemplateRenderer, name='foo')
+        gsm.registerUtility(utility, ITemplateRenderer, name='foo')
         get = self._getFUT()
         result = get('foo')
         self.failUnless(result is utility)
@@ -199,16 +199,16 @@ class GetTemplateTests(unittest.TestCase, Base):
         self.assertEqual(result.filename, minimal)
         self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
 
-    def test_testing(self):
+    def test_explicit_registration(self):
         from zope.component import getGlobalSiteManager
-        from repoze.bfg.interfaces import ITestingTemplateRenderer
+        from repoze.bfg.interfaces import ITemplateRenderer
         class Dummy:
             template = object()
             def implementation(self):
                 return self.template
         gsm = getGlobalSiteManager()
         utility = Dummy()
-        gsm.registerUtility(utility, ITestingTemplateRenderer, name='foo')
+        gsm.registerUtility(utility, ITemplateRenderer, name='foo')
         get = self._getFUT()
         result = get('foo')
         self.failUnless(result is utility.template)