[Checkins] SVN: megrok.chameleon/branches/sylvain-grokcore-view-only/ Start to fix tests so they work without depending on Grok.
Sylvain Viollon
sylvain at infrae.com
Fri Apr 17 04:49:02 EDT 2009
Log message for revision 99240:
Start to fix tests so they work without depending on Grok.
Changed:
U megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg
U megrok.chameleon/branches/sylvain-grokcore-view-only/setup.py
U megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt
U megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/configure.zcml
U megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/ftesting.zcml
U megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py
U megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py
U megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/test_megrok_chameleon.py
-=-
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg 2009-04-17 08:49:02 UTC (rev 99240)
@@ -8,8 +8,6 @@
[versions]
zope.i18n = 3.5
-chameleon.zpt = 1.0b9
-chameleon.genshi = 1.0b3
[data]
recipe = zc.recipe.filestorage
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/setup.py
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/setup.py 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/setup.py 2009-04-17 08:49:02 UTC (rev 99240)
@@ -22,7 +22,7 @@
'Programming Language :: Python :: 2.5',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
- ],
+ ],
keywords="grok chameleon template",
author="Uli Fouquet",
author_email="grok-dev at zope.org",
@@ -33,14 +33,17 @@
include_package_data=True,
zip_safe=False,
install_requires=['setuptools',
+ 'zope.component',
+ 'zope.publisher',
'grokcore.view',
'grokcore.component',
'z3c.testsetup',
'chameleon.zpt',
'chameleon.genshi',
'z3c.pt',
+ # for ftests:
+ 'zope.securitypolicy',
+ 'zope.app.zcmlfiles',
+ 'zope.app.authentication',
],
- entry_points="""
- # Add entry points here
- """,
)
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt 2009-04-17 08:49:02 UTC (rev 99240)
@@ -50,9 +50,9 @@
grok the `megrok.chameleon` package. This way the new template types
are registered with the framework::
- >>> import grok
- >>> grok.testing.grok('megrok.chameleon')
- >>> grok.testing.grok('megrok.chameleon.tests.cpt_fixture')
+ >>> import grokcore.view
+ >>> grokcore.view.testing.grok('megrok.chameleon')
+ >>> grokcore.view.testing.grok('megrok.chameleon.tests.cpt_fixture')
We create a mammoth, which should provide us a bunch of chameleon page
template driven views and put it in the database to setup location
@@ -206,13 +206,13 @@
This template knows about the following vars:
<BLANKLINE>
template (the template instance):
- <vars template in ...vars.cpt>
+ <vars template in ...vars.cpt>
<BLANKLINE>
view (the associated view):
- <megrok.chameleon.tests.cpt_fixture.app.Vars object at 0x...>
+ <megrok.chameleon.tests.cpt_fixture.app.Vars object at 0x...>
<BLANKLINE>
context (the context of the view):
- <megrok.chameleon.tests.cpt_fixture.app.Mammoth object at 0x...>
+ <megrok.chameleon.tests.cpt_fixture.app.Mammoth object at 0x...>
<BLANKLINE>
request (the current request):
CONTENT_LENGTH: 0
@@ -221,7 +221,7 @@
SERVER_URL: http://127.0.0.1
<BLANKLINE>
static (the static dir of the application):
- <grokcore.view.components.DirectoryResource object at 0x...>
+ <grokcore.view.components.DirectoryResource object at 0x...>
</body>
</html>
@@ -232,12 +232,11 @@
We can also define inline templates. In our ``app.py`` we defined an
inline template like this::
- import grok
from megrok.chameleon import components
...
- class Inline(grok.View):
+ class Inline(grokcore.view.View):
sometext = 'Some Text'
inline = components.ChameleonPageTemplate(
@@ -293,9 +292,8 @@
grok the `megrok.chameleon` package. This way the new template types
are registered with the framework::
- >>> import grok
- >>> grok.testing.grok('megrok.chameleon')
- >>> grok.testing.grok('megrok.chameleon.tests.genshi_fixture')
+ >>> grokcore.view.testing.grok('megrok.chameleon')
+ >>> grokcore.view.testing.grok('megrok.chameleon.tests.genshi_fixture')
We create a mammoth, which should provide us a bunch of Genshi driven
views and put it in the database to setup location info::
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/configure.zcml
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/configure.zcml 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/configure.zcml 2009-04-17 08:49:02 UTC (rev 99240)
@@ -1,4 +1,4 @@
-<configure
+<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok">
@@ -7,5 +7,5 @@
<include package="chameleon.zpt" />
<include package="z3c.pt" />
<grok:grok package="." />
-
+
</configure>
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/ftesting.zcml
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/ftesting.zcml 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/ftesting.zcml 2009-04-17 08:49:02 UTC (rev 99240)
@@ -2,14 +2,18 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok"
i18n_domain="megrok.chameleon"
- package="megrok.chameleon"
- >
+ package="megrok.chameleon">
- <include package="grok" />
<include package="megrok.chameleon" />
<grok:grok package=".tests" />
<!-- Typical functional testing security setup -->
+ <include package="zope.app.zcmlfiles" file="meta.zcml" />
+ <include package="zope.securitypolicy" file="meta.zcml" />
+
+ <include package="zope.app.zcmlfiles" />
+ <include package="zope.app.authentication" />
+
<securityPolicy
component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
/>
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py 2009-04-17 08:49:02 UTC (rev 99240)
@@ -1,24 +1,24 @@
-import grok
+import grokcore.view
from megrok.chameleon import components
-class Mammoth(grok.Application, grok.Container):
+class Mammoth(grokcore.view.Context):
pass
-class CavePainting(grok.View):
+class CavePainting(grokcore.view.View):
pass
-class Food(grok.View):
-
+class Food(grokcore.view.View):
+
text = "<ME GROK EAT MAMMOTH!>"
-
+
def me_do(self):
return self.text
-class Inline(grok.View):
+class Inline(grokcore.view.View):
sometext = 'Some Text'
inline = components.ChameleonPageTemplate(
"<html><body>ME GROK HAS INLINES! ${view.sometext}</body></html>")
-class Vars(grok.View):
+class Vars(grokcore.view.View):
pass
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py 2009-04-17 08:49:02 UTC (rev 99240)
@@ -1,31 +1,31 @@
-import grok
+import grokcore.view
from megrok.chameleon import components
-class Mammoth(grok.Application, grok.Container):
+class Mammoth(grokcore.view.Context):
pass
-class CavePainting(grok.View):
+class CavePainting(grokcore.view.View):
pass
-class Static(grok.View):
+class Static(grokcore.view.View):
def render(self): return
pass
-class Gatherer(grok.View):
+class Gatherer(grokcore.view.View):
pass
-
-class Food(grok.View):
-
+
+class Food(grokcore.view.View):
+
text = "ME GROK EAT MAMMOTH!"
-
+
def me_do(self):
return self.text
-class Hunter(grok.View):
-
+class Hunter(grokcore.view.View):
+
game = "MAMMOTH!"
-class Inline(grok.View):
+class Inline(grokcore.view.View):
pass
inline = components.ChameleonPageTemplate(
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/test_megrok_chameleon.py
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/test_megrok_chameleon.py 2009-04-17 05:08:42 UTC (rev 99239)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/test_megrok_chameleon.py 2009-04-17 08:49:02 UTC (rev 99240)
@@ -1,5 +1,10 @@
import z3c.testsetup
+import zope.testing.doctest
from megrok.chameleon.tests import FunctionalLayer
+flags = (zope.testing.doctest.ELLIPSIS |
+ zope.testing.doctest.NORMALIZE_WHITESPACE)
+
test_suite = z3c.testsetup.register_all_tests('megrok.chameleon',
+ optionflags=flags,
layer=FunctionalLayer)
More information about the Checkins
mailing list