[Checkins] SVN: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/ Move object widget test (and needed macros) over into zope.formlib.
Martijn Faassen
faassen at startifact.com
Sat Jan 2 13:31:02 EST 2010
Log message for revision 107565:
Move object widget test (and needed macros) over into zope.formlib.
Changed:
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml
D zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_objectwidget.py
D zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget_macros.pt
-=-
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml 2010-01-02 18:30:00 UTC (rev 107564)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml 2010-01-02 18:31:02 UTC (rev 107565)
@@ -16,13 +16,6 @@
<browser:page
for="*"
- name="widget_macros"
- permission="zope.Public"
- template="widget_macros.pt"
- />
-
- <browser:page
- for="*"
name="addform_macros"
permission="zope.Public"
template="add.pt"
Deleted: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_objectwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_objectwidget.py 2010-01-02 18:30:00 UTC (rev 107564)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_objectwidget.py 2010-01-02 18:31:02 UTC (rev 107565)
@@ -1,75 +0,0 @@
-##############################################################################
-#
-# 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.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.
-#
-##############################################################################
-"""Test object widget
-
-$Id$
-"""
-import unittest
-from zope.component.testing import PlacelessSetup
-from zope.configuration.xmlconfig import XMLConfig
-from zope.interface import Interface, implements
-from zope.publisher.browser import TestRequest
-from zope.schema import Object, TextLine
-from zope.app.form.browser import ObjectWidget
-from zope.app.form.browser.tests import support
-
-class ITestContact(Interface):
- name = TextLine()
- email = TextLine()
-
-class TestContact(object):
- implements(ITestContact)
-
-class Test(PlacelessSetup, unittest.TestCase, support.VerifyResults):
-
- def setUp(self):
- PlacelessSetup.setUp(self)
- import zope.app.form
- XMLConfig('ftesting.zcml', zope.app.form)()
- self.field = Object(ITestContact, __name__=u'foo')
-
- def test_new(self):
- request = TestRequest()
- widget = ObjectWidget(self.field, request, TestContact)
- self.assertEquals(int(widget.hasInput()), 0)
- check_list = (
- 'input', 'name="field.foo.name"',
- 'input', 'name="field.foo.email"'
- )
- self.verifyResult(widget(), check_list)
-
- def test_edit(self):
- request = TestRequest(form={
- 'field.foo.name': u'fred',
- 'field.foo.email': u'fred at fred.com'
- })
- widget = ObjectWidget(self.field, request, TestContact)
- self.assertEquals(int(widget.hasInput()), 1)
- o = widget.getInputValue()
- self.assertEquals(hasattr(o, 'name'), 1)
- self.assertEquals(o.name, u'fred')
- self.assertEquals(o.email, u'fred at fred.com')
- check_list = (
- 'input', 'name="field.foo.name"', 'value="fred"',
- 'input', 'name="field.foo.email"', 'value="fred at fred.com"',
- )
- self.verifyResult(widget(), check_list)
-
-def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(Test))
- return suite
-
-if __name__=='__main__':
- unittest.main(defaultTest='test_suite')
Deleted: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget_macros.pt
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget_macros.pt 2010-01-02 18:30:00 UTC (rev 107564)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget_macros.pt 2010-01-02 18:31:02 UTC (rev 107565)
@@ -1,26 +0,0 @@
-<html i18n:domain="want an empty string, but zpt would ignore it :(">
- <body>
- <metal:block define-macro="widget_rows">
- <div class="row" tal:repeat="widget view/widgets">
- <metal:block define-macro="widget_row">
- <div class="label">
- <label for="field.name" title="The widget's hint"
- tal:attributes="for widget/name; title widget/hint"
- tal:content="widget/label" i18n:attributes="title"
- i18n:translate=""
- >The Label</label>
- </div>
- <tal:block define="error widget/error"
- condition="error" content="structure error"
- i18n:translate=""
- >
- The Error
- </tal:block>
- <div class="field" tal:content="structure widget">
- <input type="text" style="width:100%"/>
- </div>
- </metal:block>
- </div>
- </metal:block>
- </body>
-</html>
More information about the checkins
mailing list