Move to Chameleon.

1 files changed, 6 insertions, 55 deletions

diff --git a/repoze/bfg/tests/test_template.py b/repoze/bfg/tests/test_template.py
index ba3745132..42baa6492 100644
--- a/repoze/bfg/tests/test_template.py
+++ b/repoze/bfg/tests/test_template.py
@@ -19,40 +19,6 @@ class Base(PlacelessSetup):
         here = os.path.abspath(os.path.dirname(__file__))
         return os.path.join(here, 'fixtures', name)
         
-class Z3CPTTemplateFactoryTests(unittest.TestCase, Base):
-    def setUp(self):
-        Base.setUp(self)
-
-    def tearDown(self):
-        Base.tearDown(self)
-
-    def _getTargetClass(self):
-        from repoze.bfg.template import Z3CPTTemplateFactory
-        return Z3CPTTemplateFactory
-
-    def _makeOne(self, *arg, **kw):
-        klass = self._getTargetClass()
-        return klass(*arg, **kw)
-
-    def test_instance_implements_ITemplate(self):
-        from zope.interface.verify import verifyObject
-        from repoze.bfg.interfaces import ITemplate
-        path = self._getTemplatePath('minimal.pt')
-        verifyObject(ITemplate, self._makeOne(path))
-
-    def test_class_implements_ITemplate(self):
-        from zope.interface.verify import verifyClass
-        from repoze.bfg.interfaces import ITemplate
-        verifyClass(ITemplate, self._getTargetClass())
-
-    def test_call(self):
-        self._zcmlConfigure()
-        minimal = self._getTemplatePath('minimal.pt')
-        instance = self._makeOne(minimal)
-        result = instance()
-        self.failUnless(isinstance(result, str))
-        self.assertEqual(result, '<div>\n</div>')
-
 class RenderTemplateTests(unittest.TestCase, Base):
     def setUp(self):
         Base.setUp(self)
@@ -70,7 +36,7 @@ class RenderTemplateTests(unittest.TestCase, Base):
         render = self._getFUT()
         result = render(minimal)
         self.failUnless(isinstance(result, str))
-        self.assertEqual(result, '<div>\n</div>')
+        self.assertEqual(result, '<div>\n</div>\n')
 
 class RenderTemplateToResponseTests(unittest.TestCase, Base):
     def setUp(self):
@@ -90,7 +56,7 @@ class RenderTemplateToResponseTests(unittest.TestCase, Base):
         result = render(minimal)
         from webob import Response
         self.failUnless(isinstance(result, Response))
-        self.assertEqual(result.app_iter, ['<div>\n</div>'])
+        self.assertEqual(result.app_iter, ['<div>\n</div>\n'])
         self.assertEqual(result.status, '200 OK')
         self.assertEqual(len(result.headerlist), 2)
 
@@ -109,10 +75,10 @@ class GetTemplateTests(unittest.TestCase, Base):
         self._zcmlConfigure()
         from zope.component import getGlobalSiteManager
         from zope.component import queryUtility
-        from repoze.bfg.template import Z3CPTTemplateFactory
+        from repoze.bfg.chameleon_zpt import ZPTTemplateFactory
         from repoze.bfg.interfaces import ITemplate
         minimal = self._getTemplatePath('minimal.pt')
-        utility = Z3CPTTemplateFactory(minimal)
+        utility = ZPTTemplateFactory(minimal)
         gsm = getGlobalSiteManager()
         gsm.registerUtility(utility, ITemplate, name=minimal)
         get = self._getFUT()
@@ -124,11 +90,11 @@ class GetTemplateTests(unittest.TestCase, Base):
         self._zcmlConfigure()
         from zope.component import getGlobalSiteManager
         from zope.component import queryUtility
-        from repoze.bfg.template import Z3CPTTemplateFactory
+        from repoze.bfg.chameleon_zpt import ZPTTemplateFactory
         from repoze.bfg.interfaces import ITemplate
         minimal = self._getTemplatePath('minimal.pt')
         self.assertEqual(queryUtility(ITemplate, minimal), None)
-        utility = Z3CPTTemplateFactory(minimal)
+        utility = ZPTTemplateFactory(minimal)
         gsm = getGlobalSiteManager()
         gsm.registerUtility(utility, ITemplate, name=minimal)
         get = self._getFUT()
@@ -136,18 +102,3 @@ class GetTemplateTests(unittest.TestCase, Base):
         self.assertEqual(result.filename, minimal)
         self.assertEqual(queryUtility(ITemplate, minimal), utility)
 
-    def test_nonabs_registered(self):
-        self._zcmlConfigure()
-        from zope.component import getGlobalSiteManager
-        from zope.component import queryUtility
-        from repoze.bfg.template import Z3CPTTemplateFactory
-        from repoze.bfg.interfaces import ITemplate
-        minimal = self._getTemplatePath('minimal.pt')
-        utility = Z3CPTTemplateFactory(minimal)
-        gsm = getGlobalSiteManager()
-        gsm.registerUtility(utility, ITemplate, name=minimal)
-        get = self._getFUT()
-        result = get(minimal)
-        self.assertEqual(result.filename, minimal)
-        self.assertEqual(queryUtility(ITemplate, minimal), utility)
-