[Checkins] SVN: grokcore.layout/trunk/src/grokcore/layout/tests/ re-add tests that got accidentally removed
Jan Wijbrand Kolman
cvs-admin at zope.org
Tue May 1 18:22:35 UTC 2012
Log message for revision 125539:
re-add tests that got accidentally removed
Changed:
U grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml
A grokcore.layout/trunk/src/grokcore/layout/tests/models/
D grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py
U grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py
U grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py
-=-
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml 2012-05-01 18:07:17 UTC (rev 125538)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml 2012-05-01 18:22:32 UTC (rev 125539)
@@ -7,6 +7,7 @@
<include package="zope.security" />
<include package="grokcore.layout" />
<grok:grok package=".layout" />
+ <grok:grok package=".models" />
<!-- In order to test the errorviews that stem from zope.errorview. -->
<include package="zope.errorview.tests" file="ftesting.zcml"/>
<!-- We do not grok the other packages on purpose -->
Deleted: grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py 2012-05-01 07:35:51 UTC (rev 125449)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py 2012-05-01 18:22:32 UTC (rev 125539)
@@ -1,192 +0,0 @@
-"""
- >>> from grokcore.layout import ILayout
- >>> from zope.component import getMultiAdapter
- >>> from zope.publisher.browser import TestRequest
-
- >>> cow = Cow()
- >>> request = TestRequest()
-
- >>> mylayout = getMultiAdapter((request, cow), ILayout)
-
- FormPage:
- >>> myform = getMultiAdapter((cow, request), name='myformpage')
- >>> print myform()
- <html>
- <body>
- <div class="layout"><form action="http://127.0.0.1" method="post"
- class="edit-form" enctype="multipart/form-data">
- <BLANKLINE>
- <BLANKLINE>
- <BLANKLINE>
- <BLANKLINE>
- <BLANKLINE>
- <table class="form-fields">
- <tbody>
- <BLANKLINE>
- <tr>
- <td class="label">
- <BLANKLINE>
- <label for="form.color">
- <span class="required">*</span><span>Color</span>
- </label>
- </td>
- <td class="field">
- <div class="widget"><input class="textType" id="form.color" name="form.color" size="20" type="text" value="" /></div>
- <BLANKLINE>
- </td>
- </tr>
- <BLANKLINE>
- </tbody>
- </table>
- <BLANKLINE>
- <div id="actionsView">
- <BLANKLINE>
- </div>
- </form>
- </div>
- </body>
- </html>
-
-
-
-
- Display form:
- >>> myview = getMultiAdapter((cow, request), name='myview')
- >>> print myview()
- <html>
- <body>
- <div class="layout">...
- <tr class="even">
- <td class="fieldname">
- Color
- </td>
- <td>
- globally dark
- </td>
- </tr>...
- </div>
- </body>
- </html>
-
- >>> myview
- <grokcore.layout.tests.models.forms.MyView object at ...>
- >>> myview.layout
- <grokcore.layout.tests.models.forms.Master object at ...>
- >>> print myview.content()
- <table class="listing">
- <thead>
- <tr>
- <th class="label-column"> </th>
- <th> </th>
- </tr>
- </thead>
- <tbody>
- <BLANKLINE>
- <tr class="even">
- <td class="fieldname">
- Color
- </td>
- <td>
- globally dark
- </td>
- </tr>
- <BLANKLINE>
- </tbody>
- <tfoot>
- <tr class="controls">
- <td colspan="2" class="align-right">
- </td>
- </tr>
- </tfoot>
- </table>
- <BLANKLINE>
-
- Edit form:
- >>> myeditview = getMultiAdapter((cow, request), name='myeditview')
- >>> print myeditview()
- <html>
- <body>
- <div class="layout"><form action="http://127.0.0.1" method="post"
- class="edit-form" enctype="multipart/form-data">
- <BLANKLINE>
- <BLANKLINE>
- <BLANKLINE>
- <BLANKLINE>
- <BLANKLINE>
- <table class="form-fields">
- <tbody>
- <BLANKLINE>
- <tr>
- <td class="label">
- <BLANKLINE>
- <label for="form.color">
- <span class="required">*</span><span>Color</span>
- </label>
- </td>
- <td class="field">
- <div class="widget"><input class="textType" id="form.color" name="form.color" size="20" type="text" value="globally dark" /></div>
- <BLANKLINE>
- </td>
- </tr>
- <BLANKLINE>
- </tbody>
- </table>
- <BLANKLINE>
- <div id="actionsView">
- <span class="actionButtons">
- <input type="submit" id="form.actions.apply" name="form.actions.apply" value="Apply" class="button" />
- </span>
- </div>
- </form>
- </div>
- </body>
- </html>
- <BLANKLINE>
-
- >>> myeditview
- <grokcore.layout.tests.models.forms.MyEditView object at ...>
- >>> myeditview.layout
- <grokcore.layout.tests.models.forms.Master object at ...>
- >>> print myeditview.content()
- <form action="http://127.0.0.1" method="post"
- class="edit-form" enctype="multipart/form-data">
- ...<span>Color</span>...
- ... value="globally dark" ...
- ... value="Apply" ...
- </form>
-
-
-"""
-import grokcore.component as grok
-
-from grokcore.view import templatedir
-from grokcore.layout import Layout, DisplayFormPage, EditFormPage, FormPage
-from zope import interface, schema
-
-
-templatedir('templates')
-
-
-class ICowProperties(interface.Interface):
- color = schema.TextLine(title=u"Color")
-
-
-class Cow(grok.Context):
- grok.implements(ICowProperties)
- color = u"globally dark"
-
-
-class Master(Layout):
- grok.name('master')
- grok.context(Cow)
-
-
-class MyView(DisplayFormPage):
- grok.context(Cow)
-
-
-class MyEditView(EditFormPage):
- grok.context(Cow)
-
-class MyFormPage(FormPage):
- grok.context(Cow)
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py 2012-05-01 07:35:51 UTC (rev 125449)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/page.py 2012-05-01 18:22:32 UTC (rev 125539)
@@ -29,18 +29,16 @@
templatedir('templates')
-
class Cow(grok.Context):
pass
-
class Master(Layout):
grok.name('master')
grok.context(Cow)
-
class MyView(Page):
grok.context(interface.Interface)
+ grok.name('myview')
def render(self):
return "<p> My nice Content </p>"
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py 2012-05-01 18:07:17 UTC (rev 125538)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py 2012-05-01 18:22:32 UTC (rev 125539)
@@ -24,7 +24,6 @@
continue
if filename == '__init__.py':
continue
-
dottedname = 'grokcore.layout.tests.%s.%s' % (name, filename[:-3])
suite.addTest(make_test(dottedname))
return suite
@@ -32,6 +31,6 @@
def test_suite():
suite = unittest.TestSuite()
- for name in ['layout', 'errors']:
+ for name in ['layout', 'models', 'errors']:
suite.addTest(suiteFromPackage(name))
return suite
More information about the checkins
mailing list