[Checkins] SVN: grok/branches/grokcore.xxx/ move 'view' tests from
grok to grokcore.view
Godefroid Chapelle
gotcha at bubblenet.be
Fri Jul 18 07:13:10 EDT 2008
Log message for revision 88492:
move 'view' tests from grok to grokcore.view
Changed:
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/grok.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/test_all.py
A grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/
A grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/ambiguouscontext.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirandinlinetemplate.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplate.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplateandrender.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplatesonly.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/eithertemplateorrender.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/explicitimplicittemplate.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline_unassociated.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inlinebogus.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/missingcontext.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/namemultiple.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/namemultiple_fixture.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nameunicode.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nomodulename.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nomodulename_fixture.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/notemplateorrender.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/template.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatedirectory.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatefile.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatenotfound.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatereload.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/twoviewsusetemplate.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/unassociated.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/update.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/update_redirect.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/view.py
U grok/branches/grokcore.xxx/src/grok/testing.py
U grok/branches/grokcore.xxx/src/grok/tests/test_grok.py
D grok/branches/grokcore.xxx/src/grok/tests/view/
-=-
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/grok.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/grok.py 2008-07-18 11:09:42 UTC (rev 88491)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/grok.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -1,2 +1,3 @@
from grokcore.view.tests.components import Model, View
from grokcore.view import testing
+from grokcore.component import name
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/test_all.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/test_all.py 2008-07-18 11:09:42 UTC (rev 88491)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/test_all.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -51,7 +51,7 @@
def test_suite():
suite = unittest.TestSuite()
- for name in ['template', 'static']:
+ for name in ['template', 'static', 'view']:
suite.addTest(suiteFromPackage(name))
return suite
Copied: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view (from rev 88477, grok/branches/grokcore.xxx/src/grok/tests/view)
Property changes on: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view
___________________________________________________________________
Name: svn:mergeinfo
+
Added: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt (rev 0)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/TODO.txt 2008-07-18 11:13:09 UTC (rev 88492)
@@ -0,0 +1 @@
+* move namemultiple, nameunicode, nomodulename from tests/view to grokcore.component
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/ambiguouscontext.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/ambiguouscontext.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/ambiguouscontext.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -5,18 +5,20 @@
Traceback (most recent call last):
...
GrokError: Multiple possible contexts for
- <class 'grok.tests.view.ambiguouscontext.Club'>, please use the
+ <class 'grokcore.view.tests.view.ambiguouscontext.Club'>, please use the
'context' directive.
"""
+from grokcore.view.tests import grok
-import grok
class Cave(grok.Model):
pass
+
class Mammoth(grok.Model):
pass
+
class Club(grok.View):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirandinlinetemplate.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/dirandinlinetemplate.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirandinlinetemplate.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -6,10 +6,11 @@
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Conflicting templates found for name 'cavepainting' in module
- <module 'grok.tests.view.dirandinlinetemplate' from ...
+ <module 'grokcore.view.tests.view.dirandinlinetemplate' from ...
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
class Mammoth(grok.Model):
pass
@@ -17,4 +18,4 @@
class CavePainting(grok.View):
pass
-cavepainting = grok.PageTemplate("nothing")
+cavepainting = grokcore.view.PageTemplate("nothing")
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplate.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/dirtemplate.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplate.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -2,7 +2,7 @@
Templates can also be found in a directory with the same name as the module:
>>> grok.testing.grok(__name__)
-
+
>>> manfred = Mammoth()
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
@@ -24,13 +24,16 @@
</html>
"""
-import grok
+from grokcore.view.tests import grok
+
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
pass
+
class Food(grok.View):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplateandrender.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/dirtemplateandrender.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplateandrender.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -6,16 +6,19 @@
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Multiple possible ways to render view
- <class 'grok.tests.view.dirtemplateandrender.CavePainting'>.
+ <class 'grokcore.view.tests.view.dirtemplateandrender.CavePainting'>.
It has both a 'render' method as well as an associated template.
in:
-
+
"""
-import grok
+from grokcore.view.tests import grok
+
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
+
def render(self):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplatesonly.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/dirtemplatesonly.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/dirtemplatesonly.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -1,10 +1,9 @@
"""
A template directory may only contain recognized template files::
- >>> from grok.testing import warn
>>> import warnings
>>> saved_warn = warnings.warn
- >>> warnings.warn = warn
+ >>> warnings.warn = grok.testing.warn
>>> grok.testing.grok(__name__)
From grok.testing's warn():
@@ -14,10 +13,12 @@
>>> warnings.warn = saved_warn
"""
-import grok
+from grokcore.view.tests import grok
+
class Mammoth(grok.Model):
pass
+
class Index(grok.View):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/eithertemplateorrender.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/eithertemplateorrender.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/eithertemplateorrender.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -5,17 +5,21 @@
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Multiple possible ways to render view
- <class 'grok.tests.view.eithertemplateorrender.CavePainting'>.
+ <class 'grokcore.view.tests.view.eithertemplateorrender.CavePainting'>.
It has both a 'render' method as well as an associated template.
in:
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
+
def render(self):
pass
-cavepainting = grok.PageTemplate("nothing")
+cavepainting = grokcore.view.PageTemplate("nothing")
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/explicitimplicittemplate.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/explicitimplicittemplate.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/explicitimplicittemplate.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -1,25 +1,30 @@
"""
It is too confusing to have a template that would be implicitly
associated with a view while that view already refers to another
-template using grok.template. Therefore there is an error:
+template using grokcore.view.template. Therefore there is an error:
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
ConfigurationExecutionError: martian.error.GrokError: Multiple possible templates for view
- <class 'grok.tests.view.explicitimplicittemplate.Painting'>.
+ <class 'grokcore.view.tests.view.explicitimplicittemplate.Painting'>.
It uses grok.template('cavepainting'), but there is also a template
called 'painting'.
in:
-
+
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class Painting(grok.View):
- grok.template('cavepainting')
+ grokcore.view.template('cavepainting')
-cavepainting = grok.PageTemplate("GROK CAVEPAINT MAMMOTH!")
-painting = grok.PageTemplate("GROK PAINT MAMMOTH!")
+
+cavepainting = grokcore.view.PageTemplate("GROK CAVEPAINT MAMMOTH!")
+
+painting = grokcore.view.PageTemplate("GROK PAINT MAMMOTH!")
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/inline.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -3,7 +3,7 @@
using a variable named `viewname_pt`:
>>> grok.testing.grok(__name__)
-
+
>>> manfred = Mammoth()
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
@@ -15,8 +15,8 @@
<h1>Mammoth Cave Painting</h1>
<ul>
<li><zope.publisher.browser.TestRequest instance URL=http://127.0.0.1></li>
- <li><grok.tests.view.inline.CavePainting object at 0x...></li>
- <li><grok.tests.view.inline.Mammoth object at 0x...></li>
+ <li><grokcore.view.tests.view.inline.CavePainting object at 0x...></li>
+ <li><grokcore.view.tests.view.inline.Mammoth object at 0x...></li>
<li><zope.app.pagetemplate.engine.TraversableModuleImporter object at 0x...></li>
</ul>
</body>
@@ -34,15 +34,19 @@
<html><body><h1>GROK HUNT MAMMOTH!</h1></body></html>
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
pass
-cavepainting = grok.PageTemplate("""\
+
+cavepainting = grokcore.view.PageTemplate("""\
<html>
<body>
<h1 tal:content="string:Mammoth Cave Painting"/>
@@ -56,10 +60,11 @@
</html>
""")
+
class Hunt(grok.View):
grok.name('hunting')
-hunt = grok.PageTemplate("""\
+
+hunt = grokcore.view.PageTemplate("""\
<html><body><h1>GROK HUNT MAMMOTH!</h1></body></html>
""")
-
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline_unassociated.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/inline_unassociated.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline_unassociated.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -10,17 +10,20 @@
>>> grok.testing.grok(__name__)
From grok.testing's warn():
...UserWarning: Found the following unassociated template(s) when grokking
- 'grok.tests.view.inline_unassociated': club. Define view classes inheriting
+ 'grokcore.view.tests.view.inline_unassociated': club. Define view classes inheriting
from grok.View to enable the template(s)...
>>> warnings.warn = saved_warn
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
-club = grok.PageTemplate("""\
+
+club = grokcore.view.PageTemplate("""\
<html><body><h1>GROK CLUB MAMMOTH!</h1></body></html>
""")
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inlinebogus.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/inlinebogus.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inlinebogus.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -3,8 +3,8 @@
We do not accept bogus inline template such as ones that contain
encoded strings:
- >>> import grok
- >>> grok.PageTemplate('''
+ >>> import grokcore.view
+ >>> grokcore.view.PageTemplate('''
... <html>
... <body><h1 tal:content="string:Mammoth Cave Painting"/>
... <p>ööö</p>
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/missingcontext.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/missingcontext.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/missingcontext.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -5,12 +5,12 @@
Traceback (most recent call last):
...
GrokError: No module-level context for
- <class 'grok.tests.view.missingcontext.Club'>, please use the
+ <class 'grokcore.view.tests.view.missingcontext.Club'>, please use the
'context' directive.
"""
+from grokcore.view.tests import grok
-import grok
class Club(grok.View):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/namemultiple.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/namemultiple.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/namemultiple.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -1,7 +1,7 @@
"""
You can't call grok.name multiple times for a view
- >>> import grok.tests.view.namemultiple_fixture
+ >>> import grokcore.view.tests.view.namemultiple_fixture
Traceback (most recent call last):
...
GrokImportError: The 'name' directive can only be called once per class.
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/namemultiple_fixture.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/namemultiple_fixture.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/namemultiple_fixture.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -1,7 +1,7 @@
"""
This should fail:
"""
-import grok
+from grokcore.view.tests import grok
class MultipleNames(grok.View):
grok.name('mammoth')
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nameunicode.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/nameunicode.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nameunicode.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -16,16 +16,22 @@
unicode or ASCII.
"""
-import grok
+from grokcore.view.tests import grok
+
def pass_unicode():
+
class View(object):
grok.name(u'name')
+
def pass_encodedstring():
+
class View(object):
grok.name("ölkj")
+
def pass_object():
+
class View(object):
grok.name(object())
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nomodulename.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/nomodulename.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nomodulename.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -1,7 +1,7 @@
"""
You can't call grok.name on a module:
- >>> import grok.tests.view.nomodulename_fixture
+ >>> import grokcore.view.tests.view.nomodulename_fixture
Traceback (most recent call last):
...
GrokImportError: The 'name' directive can only be used on class level.
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nomodulename_fixture.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/nomodulename_fixture.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/nomodulename_fixture.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -1,5 +1,6 @@
"""
This should fail:
"""
-import grok
+from grokcore.view.tests import grok
+
grok.name('viewname')
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/notemplateorrender.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/notemplateorrender.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/notemplateorrender.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -4,16 +4,17 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- ConfigurationExecutionError: martian.error.GrokError: View <class 'grok.tests.view.notemplateorrender.CavePainting'>
+ ConfigurationExecutionError: martian.error.GrokError: View <class 'grokcore.view.tests.view.notemplateorrender.CavePainting'>
has no associated template or 'render' method.
in:
"""
+from grokcore.view.tests import grok
-import grok
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/template.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/template.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/template.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -20,22 +20,28 @@
<html><body><h1>GROK EAT MAMMOTH!</h1></body></html>
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class Painting(grok.View):
- grok.template('cavepainting')
+ grokcore.view.template('cavepainting')
-cavepainting = grok.PageTemplate("""\
+
+cavepainting = grokcore.view.PageTemplate("""\
<html><body><h1>GROK PAINT MAMMOTH!</h1></body></html>
""")
+
class Food(grok.View):
- grok.template('food_template')
+ grokcore.view.template('food_template')
grok.name('meal')
-food_template = grok.PageTemplate("""\
+
+food_template = grokcore.view.PageTemplate("""\
<html><body><h1>GROK EAT MAMMOTH!</h1></body></html>
""")
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatedirectory.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/templatedirectory.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatedirectory.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -16,12 +16,16 @@
</html>
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
-grok.templatedir('templatedirectoryname')
+grokcore.view.templatedir('templatedirectoryname')
+
+
class Mammoth(grok.Model):
pass
+
class Food(grok.View):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatefile.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/templatefile.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatefile.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -18,14 +18,19 @@
</html>
"""
-import grok
import os.path
+from grokcore.view.tests import grok
+import grokcore.view
+
+
class Mammoth(grok.Model):
pass
+
class Food(grok.View):
pass
-food = grok.PageTemplate(filename=os.path.join('templatedirectoryname',
- 'food.pt'))
+
+food = grokcore.view.PageTemplate(filename=os.path.join(
+ 'templatedirectoryname', 'food.pt'))
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatenotfound.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/templatenotfound.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatenotfound.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -5,16 +5,19 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- ConfigurationExecutionError: martian.error.GrokError: View <class 'grok.tests.view.templatenotfound.Painting'>
+ ConfigurationExecutionError: martian.error.GrokError: View <class 'grokcore.view.tests.view.templatenotfound.Painting'>
has no associated template or 'render' method.
in:
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class Painting(grok.View):
- grok.template('cavepainting')
+ grokcore.view.template('cavepainting')
# no cavepainting template here
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatereload.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/templatereload.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/templatereload.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -30,10 +30,12 @@
>>> template.write('before')
>>> template.close()
"""
-import grok
+from grokcore.view.tests import grok
+
class Mammoth(grok.Model):
pass
+
class Index(grok.View):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/twoviewsusetemplate.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/twoviewsusetemplate.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/twoviewsusetemplate.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -33,29 +33,37 @@
Traceback (most recent call last):
...
ComponentLookupError:
- ((<grok.tests.view.twoviewsusetemplate.Mammoth object at 0x...>,
+ ((<grokcore.view.tests.view.twoviewsusetemplate.Mammoth object at 0x...>,
<zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>),
<InterfaceClass zope.interface.Interface>, 'templ')
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class A(grok.View):
pass
-a = grok.PageTemplate("View A")
+a = grokcore.view.PageTemplate("View A")
+
+
class B(grok.View):
- grok.template('a')
+ grokcore.view.template('a')
+
class C(grok.View):
- grok.template('templ')
+ grokcore.view.template('templ')
+
class D(grok.View):
- grok.template('templ')
+ grokcore.view.template('templ')
-templ = grok.PageTemplate('Template')
+
+templ = grokcore.view.PageTemplate('Template')
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/unassociated.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/unassociated.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/unassociated.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -2,23 +2,20 @@
Templates that are not associated with a view class will provoke an
error:
- >>> from grok.testing import warn
>>> import warnings
>>> saved_warn = warnings.warn
- >>> warnings.warn = warn
+ >>> warnings.warn = grok.testing.warn
>>> grok.testing.grok(__name__)
From grok.testing's warn():
...UserWarning: Found the following unassociated template(s) when grokking
- 'grok.tests.view.unassociated': index. Define view classes inheriting from
+ 'grokcore.view.tests.view.unassociated': index. Define view classes inheriting from
grok.View to enable the template(s)...
Also templates of modules named equally as the package name the module
resides in, should be found without error or warning. We check this
with the local package `modequalspkgname`::
- >>> warnings.warn = warn
-
>>> pkg = __name__.rsplit('.', 1)[0] + '.modequalspkgname'
>>> grok.testing.grok(pkg) is None
True
@@ -26,7 +23,8 @@
>>> warnings.warn = saved_warn
"""
-import grok
+from grokcore.view.tests import grok
+
class Mammoth(grok.Model):
pass
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/update.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/update.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/update.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -23,20 +23,24 @@
<h1>red</h1>
</body>
</html>
-
+
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
+
def update(self):
self.color = "red"
-cavepainting = grok.PageTemplate("""\
+cavepainting = grokcore.view.PageTemplate("""\
<html>
<body>
<h1 tal:content="view/color"/>
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/update_redirect.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/update_redirect.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/update_redirect.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -17,17 +17,21 @@
somewhere-else
"""
-import grok
+from grokcore.view.tests import grok
+import grokcore.view
+
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
+
def update(self):
self.request.response.redirect('somewhere-else')
-cavepainting = grok.PageTemplate("""\
+cavepainting = grokcore.view.PageTemplate("""\
<html>
<body>
<h1 tal:content="this-is-an-error" />
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/view.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/view/view.py 2008-07-18 09:02:51 UTC (rev 88477)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/view.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -28,20 +28,22 @@
>>> view = component.getMultiAdapter((manfred, request), name='food')
Traceback (most recent call last):
...
- ComponentLookupError: ((<grok.tests.view.view.Mammoth object at 0x...>, <zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>), <InterfaceClass zope.interface.Interface>, 'food')
+ ComponentLookupError: ((<grokcore.view.tests.view.view.Mammoth object at 0x...>, <zope.publisher.browser.TestRequest instance URL=http://127.0.0.1>), <InterfaceClass zope.interface.Interface>, 'food')
"""
+from grokcore.view.tests import grok
-import grok
class Mammoth(grok.Model):
pass
+
class CavePainting(grok.View):
def render(self):
return 'A cave painting of a mammoth'
+
class Food(grok.View):
"""Grok says: ME NO SEE MAMMOTH, ME SEE MEAL!"""
grok.name('meal')
Modified: grok/branches/grokcore.xxx/src/grok/testing.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/testing.py 2008-07-18 11:09:42 UTC (rev 88491)
+++ grok/branches/grokcore.xxx/src/grok/testing.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -13,13 +13,13 @@
##############################################################################
"""Grok test helpers
"""
-import sys
import os.path
import z3c.testsetup
from zope.configuration.config import ConfigurationMachine
from grokcore.component import zcml
-# Provide this import here for BBB reasons:
+# Provide these imports here for BBB reasons:
from grokcore.component.testing import grok_component
+from grokcore.view.testing import warn
class GrokTestCollector(z3c.testsetup.TestCollector):
@@ -47,33 +47,3 @@
zcml.do_grok('grokcore.view.templatereg', config)
zcml.do_grok(module_name, config)
config.execute_actions()
-
-def warn(message, category=None, stacklevel=1):
- """Intended to replace warnings.warn in tests.
-
- Modified copy from zope.deprecation.tests to:
-
- * make the signature identical to warnings.warn
- * to check for *.pyc and *.pyo files.
-
- When zope.deprecation is fixed, this warn function can be removed again.
- """
- print "From grok.testing's warn():"
-
- frame = sys._getframe(stacklevel)
- path = frame.f_globals['__file__']
- if path.endswith('.pyc') or path.endswith('.pyo'):
- path = path[:-1]
-
- file = open(path)
- lineno = frame.f_lineno
- for i in range(lineno):
- line = file.readline()
-
- print "%s:%s: %s: %s\n %s" % (
- path,
- frame.f_lineno,
- category.__name__,
- message,
- line.strip(),
- )
Modified: grok/branches/grokcore.xxx/src/grok/tests/test_grok.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/tests/test_grok.py 2008-07-18 11:09:42 UTC (rev 88491)
+++ grok/branches/grokcore.xxx/src/grok/tests/test_grok.py 2008-07-18 11:13:09 UTC (rev 88492)
@@ -42,7 +42,7 @@
def test_suite():
suite = unittest.TestSuite()
- for name in ['adapter', 'error', 'view', 'event', 'security', 'catalog',
+ for name in ['adapter', 'error', 'event', 'security', 'catalog',
'zcml', 'utility', 'xmlrpc', 'json', 'container',
'traversal', 'form', 'grokker', 'directive',
'baseclass', 'annotation', 'application',
More information about the Checkins
mailing list