[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/browser/tests/ Avoid having a resource directory and a Python module of the same name

[Hanno Schlichting]

Log message for revision 115557:
  Avoid having a resource directory and a Python module of the same name
  

Changed:
  D   Zope/trunk/src/Products/Five/browser/tests/pages/
  U   Zope/trunk/src/Products/Five/browser/tests/pages.zcml
  A   Zope/trunk/src/Products/Five/browser/tests/templates/
  U   Zope/trunk/src/Products/Five/browser/tests/test_pagetemplatefile.py

-=-
Modified: Zope/trunk/src/Products/Five/browser/tests/pages.zcml
===================================================================
--- Zope/trunk/src/Products/Five/browser/tests/pages.zcml	2010-08-08 16:04:39 UTC (rev 115556)
+++ Zope/trunk/src/Products/Five/browser/tests/pages.zcml	2010-08-08 16:11:14 UTC (rev 115557)
@@ -193,7 +193,7 @@
   <five:pagesFromDirectory
       for="Products.Five.tests.testing.simplecontent.ISimpleContent"
       module="Products.Five.browser.tests"
-      directory="pages"
+      directory="templates"
       permission="zope2.Public"
       />
 

Modified: Zope/trunk/src/Products/Five/browser/tests/test_pagetemplatefile.py
===================================================================
--- Zope/trunk/src/Products/Five/browser/tests/test_pagetemplatefile.py	2010-08-08 16:04:39 UTC (rev 115556)
+++ Zope/trunk/src/Products/Five/browser/tests/test_pagetemplatefile.py	2010-08-08 16:11:14 UTC (rev 115557)
@@ -30,7 +30,7 @@
         self.assertEqual(vptf.id, 'seagull.pt')
 
     def test_getId_with_path(self):
-        vptf = self._makeOne('pages/dirpage1.pt')
+        vptf = self._makeOne('templates/dirpage1.pt')
         self.assertEqual(vptf.id, 'dirpage1.pt')
 
     def test_pt_getEngine(self):
@@ -139,7 +139,7 @@
         request = DummyRequest()
         response = request.response = DummyResponse()
         view = self._makeView(context, request)
-        vptf = self._makeOne('pages/dirpage1.pt')
+        vptf = self._makeOne('templates/dirpage1.pt')
         body = vptf(view)
         self.assertEqual(body, DIRPAGE1)
         self.assertEqual(response._headers['Content-Type'], 'text/html')
@@ -150,13 +150,13 @@
         response = request.response = DummyResponse(
                                         {'Content-Type': 'text/xhtml'})
         view = self._makeView(context, request)
-        vptf = self._makeOne('pages/dirpage1.pt')
+        vptf = self._makeOne('templates/dirpage1.pt')
         body = vptf(view)
         self.assertEqual(response._headers['Content-Type'], 'text/xhtml')
 
     def test___get___(self):
         from Products.Five.browser.pagetemplatefile import BoundPageTemplate
-        template = self._makeOne('pages/dirpage1.pt')
+        template = self._makeOne('templates/dirpage1.pt')
         class Foo:
             def __init__(self, context, request):
                 self.context = context