[Zope3-checkins] CVS: Zope3/src/zope/app/browser/content/tests - __init__.py:1.2 test_dtmlpageeval.py:1.2 test_imagedata.py:1.2 test_imageupload.py:1.2 test_zptpageeval.py:1.2
Jim Fulton
jim@zope.com
Wed, 25 Dec 2002 09:14:02 -0500
Update of /cvs-repository/Zope3/src/zope/app/browser/content/tests
In directory cvs.zope.org:/tmp/cvs-serv15352/src/zope/app/browser/content/tests
Added Files:
__init__.py test_dtmlpageeval.py test_imagedata.py
test_imageupload.py test_zptpageeval.py
Log Message:
Grand renaming:
- Renamed most files (especially python modules) to lower case.
- Moved views and interfaces into separate hierarchies within each
project, where each top-level directory under the zope package
is a separate project.
- Moved everything to src from lib/python.
lib/python will eventually go away. I need access to the cvs
repository to make this happen, however.
There are probably some bits that are broken. All tests pass
and zope runs, but I haven't tried everything. There are a number
of cleanups I'll work on tomorrow.
=== Zope3/src/zope/app/browser/content/tests/__init__.py 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:14:02 2002
+++ Zope3/src/zope/app/browser/content/tests/__init__.py Wed Dec 25 09:12:31 2002
@@ -0,0 +1,2 @@
+#
+# This file is necessary to make this directory a package.
=== Zope3/src/zope/app/browser/content/tests/test_dtmlpageeval.py 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:14:02 2002
+++ Zope3/src/zope/app/browser/content/tests/test_dtmlpageeval.py Wed Dec 25 09:12:31 2002
@@ -0,0 +1,65 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (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
+#
+##############################################################################
+"""
+
+$Id$
+"""
+
+from unittest import TestCase, TestSuite, main, makeSuite
+from zope.testing.cleanup import CleanUp # Base class w registry cleanup
+
+from zope.app.browser.content.dtmlpageeval import \
+ DTMLPageEval
+from zope.proxy.context import ContextWrapper
+
+
+class Test(CleanUp, TestCase):
+
+ def test(self):
+
+ class Template:
+ def render(self, request, **kw):
+ self.called = request, kw
+ request.response.setHeader('content-type', self.content_type)
+ return 42
+
+ content_type = 'text/x-test'
+
+ class Folder: name='zope'
+ folder = Folder()
+
+ class Request(object):
+
+ def _getResponse(self):
+ return self
+
+ response = property(_getResponse)
+
+ def setHeader(self, name, value):
+ setattr(self, name, value)
+
+ request = Request()
+
+ template = ContextWrapper(Template(), folder)
+
+ view = DTMLPageEval(template, None)
+ self.assertEqual(view.index(request), 42)
+ self.assertEqual(template.called, (request, {}))
+ self.assertEqual(getattr(request, 'content-type'), 'text/x-test')
+
+def test_suite():
+ return makeSuite(Test)
+
+if __name__=='__main__':
+ main(defaultTest='test_suite')
=== Zope3/src/zope/app/browser/content/tests/test_imagedata.py 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:14:02 2002
+++ Zope3/src/zope/app/browser/content/tests/test_imagedata.py Wed Dec 25 09:12:31 2002
@@ -0,0 +1,70 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (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.
+#
+##############################################################################
+"""
+
+$Id$
+"""
+
+import unittest
+
+from zope.app.browser.content.image import ImageData
+from zope.app.content.image import Image
+
+
+class Test( unittest.TestCase ):
+
+ def testData(self):
+ """ """
+ image = Image('Data')
+
+ id = ImageData(image, None)
+
+ self.assertEqual(id(), 'Data')
+
+
+ def testTag(self):
+ """ """
+
+ # We need that, sinc eabsolute_url is not implemented yet.
+ def absolute_url():
+ return '/img'
+
+ image = Image()
+ fe = ImageData(image, None)
+ fe.absolute_url = absolute_url
+
+ self.assertEqual(fe.tag(),
+ '<img src="/img" alt="" height="-1" width="-1" border="0" />')
+ self.assertEqual(fe.tag(alt="Test Image"),
+ '<img src="/img" alt="Test Image" '
+ 'height="-1" width="-1" border="0" />')
+ self.assertEqual(fe.tag(height=100, width=100),
+ '<img src="/img" alt="" height="100" width="100" border="0" />')
+ self.assertEqual(fe.tag(border=1),
+ '<img src="/img" alt="" height="-1" width="-1" border="1" />')
+ self.assertEqual(fe.tag(css_class="Image"),
+ '<img src="/img" alt="" '
+ 'height="-1" width="-1" border="0" class="Image" />')
+ self.assertEqual(fe.tag(height=100, width="100",
+ border=1, css_class="Image"),
+ '<img src="/img" alt="" '
+ 'height="100" width="100" class="Image" border="1" />')
+
+
+def test_suite():
+ loader = unittest.TestLoader()
+ return loader.loadTestsFromTestCase( Test )
+
+if __name__=='__main__':
+ unittest.main()
=== Zope3/src/zope/app/browser/content/tests/test_imageupload.py 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:14:02 2002
+++ Zope3/src/zope/app/browser/content/tests/test_imageupload.py Wed Dec 25 09:12:31 2002
@@ -0,0 +1,115 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (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.
+#
+##############################################################################
+"""XXX short summary goes here.
+
+XXX longer description goes here.
+
+$Id$
+"""
+
+import os
+import unittest
+
+import zope.app.content # __file__
+
+from zope.app.browser.content.image import ImageUpload
+from zope.app.browser.form.editview import EditView
+from zope.app.browser.form.widget import BytesWidget, BytesAreaWidget
+from zope.app.content.image import Image, IImage
+from zope.app.tests.placelesssetup import PlacelessSetup
+from zope.component.view import provideView, setDefaultViewName
+from zope.publisher.browser import TestRequest
+from zope.publisher.interfaces.browser import IBrowserPresentation
+from zope.schema.interfaces import IField, IBytesLine, IBytes
+
+
+class IU(ImageUpload, EditView):
+ schema = IImage
+
+
+class Test(PlacelessSetup, unittest.TestCase):
+
+ def setUp(self):
+ PlacelessSetup.setUp(self)
+
+ # Configure the widget views
+ setDefaultViewName(IField, IBrowserPresentation, 'edit')
+ provideView(IBytesLine, 'edit', IBrowserPresentation, BytesWidget)
+ provideView(IBytes, 'edit', IBrowserPresentation, BytesAreaWidget)
+
+ icondir = os.path.split(zope.app.browser.content.__file__)[0]
+ data = open(os.path.join(icondir, 'image_icon.gif'), 'rb').read()
+ image = Image(data)
+ self.__view = IU(image, TestRequest())
+
+ def test_size(self):
+ self.assertEqual(self.__view.size(), "16 x 16 pixels")
+
+ def test_apply_update_no_data(self):
+ view = self.__view
+ ct = view.context.contentType
+ data = view.context.data
+ d = {}
+ self.failUnless(view.apply_update(d))
+ self.assertEqual(view.context.contentType, ct)
+ self.assertEqual(view.context.data, data)
+ d = {'contentType': 'image/gif'}
+ self.failUnless(view.apply_update(d))
+ self.assertEqual(view.context.contentType, ct)
+ self.assertEqual(view.context.data, data)
+
+ def test_apply_update_new_contentType(self):
+ view = self.__view
+ view.context.contentType = 'foo/bar'
+ self.assertEqual(view.context.contentType, 'foo/bar')
+ data = view.context.data
+ d = {'contentType': 'xxx/yyy'}
+ self.failIf(view.apply_update(d))
+ self.assertEqual(view.context.contentType, 'xxx/yyy')
+ self.assertEqual(view.context.data, data)
+
+ def test_apply_update_new_data(self):
+ view = self.__view
+ gifdata = view.context.data
+ view.context.contentType = 'foo/bar'
+ view.context.data = ''
+ ct = view.context.contentType
+ self.assertEqual(ct, 'foo/bar')
+ data = view.context.data
+ self.assertEqual(data, '')
+ d = {'data': gifdata}
+ self.failIf(view.apply_update(d))
+ self.assertEqual(view.context.contentType, 'image/gif')
+ self.assertEqual(view.context.data, gifdata)
+
+ def test_apply_update_new_data_and_new_ct(self):
+ view = self.__view
+ gifdata = view.context.data
+ view.context.contentType = 'foo/bar'
+ view.context.data = ''
+ ct = view.context.contentType
+ self.assertEqual(ct, 'foo/bar')
+ data = view.context.data
+ self.assertEqual(data, '')
+ d = {'contentType': 'xxx/yyy', 'data': gifdata}
+ self.failIf(view.apply_update(d))
+ self.assertEqual(view.context.contentType, 'image/gif')
+ self.assertEqual(view.context.data, gifdata)
+
+
+def test_suite():
+ return unittest.makeSuite(Test)
+
+if __name__=='__main__':
+ unittest.main(defaultTest='test_suite')
=== Zope3/src/zope/app/browser/content/tests/test_zptpageeval.py 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:14:02 2002
+++ Zope3/src/zope/app/browser/content/tests/test_zptpageeval.py Wed Dec 25 09:12:31 2002
@@ -0,0 +1,63 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (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
+#
+##############################################################################
+"""
+
+Revision information:
+$Id$
+"""
+
+from unittest import TestCase, TestSuite, main, makeSuite
+from zope.testing.cleanup import CleanUp # Base class w registry cleanup
+
+from zope.app.browser.content.zpt import ZPTPageEval
+from zope.proxy.context import ContextWrapper
+
+
+class Test(CleanUp, TestCase):
+
+ def testTemplateRendering(self):
+
+ class Template:
+ def render(self, request, **kw):
+ self.called = request, kw
+ return 42
+
+ content_type = 'text/x-test'
+
+ class Folder: name='zope'
+ folder = Folder()
+
+ class Request(object):
+ def _getResponse(self):
+ return self
+
+ response = property(_getResponse)
+
+ def setHeader(self, name, value):
+ setattr(self, name, value)
+
+ request = Request()
+
+ template = ContextWrapper(Template(), folder)
+
+ view = ZPTPageEval(template, None)
+ self.assertEqual(view.index(request), 42)
+ self.assertEqual(template.called, (request, {}))
+ self.assertEqual(getattr(request, 'content-type'), 'text/x-test')
+
+def test_suite():
+ return makeSuite(Test)
+
+if __name__=='__main__':
+ main(defaultTest='test_suite')