[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/zptpage/ remove
zope.app.i18n dep, merge ftests into tests
Bernd Dorn
bernd.dorn at lovelysystems.com
Tue Mar 27 09:04:41 EDT 2007
Log message for revision 73726:
remove zope.app.i18n dep, merge ftests into tests
Changed:
D Zope3/trunk/src/zope/app/zptpage/browser/ftests.py
A Zope3/trunk/src/zope/app/zptpage/browser/tests.py
A Zope3/trunk/src/zope/app/zptpage/i18n.py
U Zope3/trunk/src/zope/app/zptpage/interfaces.py
U Zope3/trunk/src/zope/app/zptpage/zptpage.py
-=-
Deleted: Zope3/trunk/src/zope/app/zptpage/browser/ftests.py
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/browser/ftests.py 2007-03-27 12:55:16 UTC (rev 73725)
+++ Zope3/trunk/src/zope/app/zptpage/browser/ftests.py 2007-03-27 13:04:40 UTC (rev 73726)
@@ -1,217 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2003, 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Functional tests for ZPT Page.
-
-$Id$
-"""
-import unittest
-from zope.app.testing.functional import BrowserTestCase
-from zope.app.zptpage.zptpage import ZPTPage
-from xml.sax.saxutils import escape
-from zope.app.zptpage.testing import ZPTPageLayer
-
-class ZPTPageTest(BrowserTestCase):
-
- content = u'<html><body><h1 tal:content="request/URL/1" /></body></html>'
-
- def addZPTPage(self):
- zptpage = ZPTPage()
- zptpage.source = self.content
- root = self.getRootFolder()
- root['zptpage'] = zptpage
- self.commit()
-
-
- def testAddForm(self):
- response = self.publish(
- '/+/zope.app.zptpage.ZPTPage=',
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- body = response.getBody()
- self.assert_('Add a ZPT Page' in body)
- self.assert_('Source' in body)
- self.assert_('Expand macros' in body)
- self.assert_('Evaluate Inline Code' in body)
- self.assert_('Object Name' in body)
- self.assert_('"Add"' in body)
- self.checkForBrokenLinks(body, '/+/zope.app.zptpage.ZPTPage=',
- 'mgr:mgrpw')
-
-
- def testAdd(self):
- response = self.publish(
- '/+/zope.app.zptpage.ZPTPage=',
- form={'type_name': u'zope.app.zptpage.ZPTPage',
- 'field.source': u'<h1>A ZPT Page</h1>',
- 'field.expand.used': u'',
- 'field.evaluateInlineCode.used': u'',
- 'add_input_name': u'zptpage',
- 'UPDATE_SUBMIT': u'Add'},
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 302)
- self.assertEqual(response.getHeader('Location'),
- 'http://localhost/@@contents.html')
- root = self.getRootFolder()
- self.assert_('zptpage' in root)
- zptpage = root['zptpage']
- self.assertEqual(zptpage.source, '<h1>A ZPT Page</h1>')
- self.assertEqual(zptpage.expand, False)
- self.assertEqual(zptpage.evaluateInlineCode, False)
-
- response = self.publish(
- '/+/zope.app.zptpage.ZPTPage=',
- form={'type_name': u'zope.app.zptpage.ZPTPage',
- 'field.source': u'<h1>A ZPT Page</h1>\n',
- 'field.expand.used': u'',
- 'field.expand': u'on',
- 'field.evaluateInlineCode.used': u'',
- 'field.evaluateInlineCode': u'on',
- 'add_input_name': u'zptpage1',
- 'UPDATE_SUBMIT': u'Add'},
- basic='mgr:mgrpw')
- root = self.getRootFolder()
- zptpage = root['zptpage1']
- self.assertEqual(zptpage.source, '<h1>A ZPT Page</h1>\n')
- self.assertEqual(zptpage.expand, True)
- self.assertEqual(zptpage.evaluateInlineCode, True)
-
-
- def testEditForm(self):
- self.addZPTPage()
- response = self.publish(
- '/zptpage/@@edit.html',
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- body = response.getBody()
- self.assert_('Source' in body)
- self.assert_('Expand macros' in body)
- self.assert_('Content Type' in body)
- self.assert_(escape(self.content) in body)
- self.checkForBrokenLinks(body, '/zptpage/@@edit.html', 'mgr:mgrpw')
-
-
- def testEdit(self):
- self.addZPTPage()
- response = self.publish(
- '/zptpage/@@edit.html',
- form={'form.source': u'<h1>A ZPT Page</h1>\n',
- 'form.expand.used': u'',
- 'form.expand': u'on',
- 'form.content_type': u'text/html',
- 'form.actions.apply': u'Apply'},
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- body = response.getBody()
- self.assert_('Source' in body)
- self.assert_(escape(u'<h1>A ZPT Page</h1>') in body)
- root = self.getRootFolder()
- zptpage = root['zptpage']
- self.assertEqual(zptpage.source, '<h1>A ZPT Page</h1>\n')
- self.assertEqual(zptpage.expand, True)
- self.assertEqual(zptpage.content_type, 'text/html')
-
- def testIssue199(self):
- # This is a test to protect us against issue 199 in the future
- self.addZPTPage()
- source = u"""<html metal:use-macro="container/@@standard_macros/page">
- <body>
- <div metal:fill-slot="body">
- write this in the body slot.
- </div>
- </body>
- </html>"""
-
- response = self.publish(
- '/zptpage/@@edit.html',
- form={'form.source': source,
- 'form.expand.used': u'',
- 'form.expand': u'on',
- 'form.actions.apply': u'Apply'},
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- body = response.getBody()
- # Check for a string from the default template
- self.assert_(escape(u'Z3 UI') in body)
- self.failIf(u"Macro expansion failed" in body)
-
- def testIndex(self):
- self.addZPTPage()
- response = self.publish(
- '/zptpage/@@index.html',
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- self.assertEqual(response.getBase(), '')
- body = response.getBody()
- self.assertEqual(
- body,
- '<html><body><h1>http://localhost/zptpage</h1></body></html>\n')
- self.checkForBrokenLinks(body, '/zptpage/@@index.html', 'mgr:mgrpw')
-
- def testPreview(self):
- self.addZPTPage()
- response = self.publish(
- '/zptpage/@@preview.html',
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- body = response.getBody()
- self.assert_('<iframe src="."' in body)
- self.checkForBrokenLinks(body, '/zptpage/@@preview.html', 'mgr:mgrpw')
-
- def testSource(self):
- self.addZPTPage()
- response = self.publish(
- '/zptpage/@@source.html',
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- body = response.getBody()
- self.assertEqual(body, self.content)
-
- def testInlineCode(self):
- self.addZPTPage()
- response = self.publish(
- '/zptpage/@@inlineCode.html',
- form={'field.evaluateInlineCode.used': u'',
- 'field.evaluateInlineCode': u'on',
- 'UPDATE_SUBMIT': u'Edit'},
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- body = response.getBody()
- self.assert_('Inline Code' in body)
- self.assert_('Evaluate Inline Code' in body)
- self.checkForBrokenLinks(body, '/zptpage/@@edit.html', 'mgr:mgrpw')
-
- response = self.publish(
- '/zptpage/@@inlineCode.html',
- basic='mgr:mgrpw')
- self.assertEqual(response.getStatus(), 200)
- root = self.getRootFolder()
- zptpage = root['zptpage']
- self.assertEqual(zptpage.evaluateInlineCode, True)
-
-
-def test_suite():
- from zope.app.testing.functional import FunctionalDocFileSuite
- collector = FunctionalDocFileSuite('collector266.txt', 'collector269.txt')
- url = FunctionalDocFileSuite('url.txt')
- collector.layer = ZPTPageLayer
- ZPTPageTest.layer = ZPTPageLayer
- url.layer = ZPTPageLayer
- return unittest.TestSuite((
- unittest.makeSuite(ZPTPageTest),
- collector,
- url,
- ))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Copied: Zope3/trunk/src/zope/app/zptpage/browser/tests.py (from rev 73724, Zope3/trunk/src/zope/app/zptpage/browser/ftests.py)
Added: Zope3/trunk/src/zope/app/zptpage/i18n.py
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/i18n.py 2007-03-27 12:55:16 UTC (rev 73725)
+++ Zope3/trunk/src/zope/app/zptpage/i18n.py 2007-03-27 13:04:40 UTC (rev 73726)
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Customization of zope.i18n for the Zope application server
+
+$Id$
+"""
+__docformat__ = 'restructuredtext'
+
+# import this as _ to create i18n messages in the zope domain
+from zope.i18nmessageid import MessageFactory
+ZopeMessageFactory = MessageFactory('zope')
Property changes on: Zope3/trunk/src/zope/app/zptpage/i18n.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: Zope3/trunk/src/zope/app/zptpage/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/interfaces.py 2007-03-27 12:55:16 UTC (rev 73725)
+++ Zope3/trunk/src/zope/app/zptpage/interfaces.py 2007-03-27 13:04:40 UTC (rev 73726)
@@ -17,7 +17,7 @@
"""
from zope.schema import SourceText, Bool, TextLine
from zope.interface import Interface
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.zptpage.i18n import ZopeMessageFactory as _
class IZPTPage(Interface):
"""ZPT Pages are a persistent implementation of Page Templates."""
Modified: Zope3/trunk/src/zope/app/zptpage/zptpage.py
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/zptpage.py 2007-03-27 12:55:16 UTC (rev 73725)
+++ Zope3/trunk/src/zope/app/zptpage/zptpage.py 2007-03-27 13:04:40 UTC (rev 73726)
@@ -27,7 +27,7 @@
from zope.filerepresentation.interfaces import IFileFactory
from zope.app.pagetemplate.engine import AppPT
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.zptpage.i18n import ZopeMessageFactory as _
from zope.app.container.contained import Contained
from zope.app.publication.interfaces import IFileContent
from zope.app.zptpage.interfaces import IZPTPage, IRenderZPTPage
More information about the Zope3-Checkins
mailing list