[Checkins] SVN: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/ refactor to ease test conversion

Godefroid Chapelle gotcha at bubblenet.be
Fri Jul 18 06:11:09 EDT 2008


Log message for revision 88484:
  refactor to ease test conversion

Changed:
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py
  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/static/statichaspy.py
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/static/staticispackage.py
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/pluggability.py
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/zpt.py
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/test_all.py

-=-
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py	2008-07-18 10:02:47 UTC (rev 88483)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py	2008-07-18 10:11:08 UTC (rev 88484)
@@ -2,7 +2,9 @@
 
 from zope import interface
 from zope.publisher.browser import BrowserPage
+from zope.configuration.config import ConfigurationMachine
 
+from grokcore.component import zcml
 from grokcore.component.interfaces import IContext
 
 import grokcore.view
@@ -43,3 +45,18 @@
                       "View %r, macro %s" % (self, key),
                       DeprecationWarning, 1)
         return value
+
+
+class Testing(object):
+
+    def grok(self, module_name):
+        config = ConfigurationMachine()
+        zcml.do_grok('grokcore.component.meta', config)
+        zcml.do_grok('grokcore.view.meta', config)
+        zcml.do_grok('grokcore.view.templatereg', config)
+        zcml.do_grok('grokcore.view.tests.meta', config)
+        zcml.do_grok(module_name, config)
+        config.execute_actions()
+
+
+testing = Testing()

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 10:02:47 UTC (rev 88483)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/grok.py	2008-07-18 10:11:08 UTC (rev 88484)
@@ -1 +1 @@
-from components import Model, View
+from grokcore.view.tests.components import Model, View, testing

Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/static/statichaspy.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/static/statichaspy.py	2008-07-18 10:02:47 UTC (rev 88483)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/static/statichaspy.py	2008-07-18 10:11:08 UTC (rev 88484)
@@ -2,8 +2,8 @@
 When a package contains a 'static' resource directory, it must not also contain
 a module called 'static.py':
 
-  >>> from grokcore.view.tests.test_all import grok
-  >>> grok('grokcore.view.tests.static.statichaspy_fixture')
+  >>> from grokcore.view.tests import grok
+  >>> grok.testing.grok('grokcore.view.tests.static.statichaspy_fixture')
   Traceback (most recent call last):
     ...
   GrokError: A package can not contain both a 'static' resource directory

Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/static/staticispackage.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/static/staticispackage.py	2008-07-18 10:02:47 UTC (rev 88483)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/static/staticispackage.py	2008-07-18 10:11:08 UTC (rev 88484)
@@ -1,8 +1,8 @@
 """
 It is an error for the 'static' directory to be a python package:
 
-  >>> from grokcore.view.tests.test_all import grok
-  >>> grok('grokcore.view.tests.static.staticispackage_fixture')
+  >>> from grokcore.view.tests import grok
+  >>> grok.testing.grok('grokcore.view.tests.static.staticispackage_fixture')
   Traceback (most recent call last):
     ...
   GrokError: The 'static' resource directory must not be a python package.

Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/pluggability.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/pluggability.py	2008-07-18 10:02:47 UTC (rev 88483)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/pluggability.py	2008-07-18 10:11:08 UTC (rev 88484)
@@ -1,8 +1,7 @@
 """
 Testing the plugging in of a template language
 
-  >>> from grokcore.view.tests.test_all import grok
-  >>> grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> from zope.publisher.browser import TestRequest
@@ -37,8 +36,9 @@
 
 from grokcore.view.tests import grok
 
-# Dummy template language:
+
 class MyTemplate(object):
+    '''Dummy template language'''
 
     def __init__(self, text):
         self._text = text
@@ -47,6 +47,7 @@
         # Silliest template language ever:
         return self._text % kw
 
+
 class MyPageTemplate(components.GrokTemplate):
 
     def setFromString(self, string):
@@ -63,30 +64,40 @@
     def render(self, view):
         return self._template.render(**self.getNamespace(view))
 
+
 class MyPageTemplateFactory(grokcore.component.GlobalUtility):
 
-    grokcore.component.implements(grokcore.view.interfaces.ITemplateFileFactory)
+    grokcore.component.implements(
+        grokcore.view.interfaces.ITemplateFileFactory)
     grokcore.component.name('mtl')
 
     def __call__(self, filename, _prefix=None):
         return MyPageTemplate(filename=filename, _prefix=_prefix)
 
+
 class Cave(grok.Model):
     pass
 
+
 class Sebaayeni(grok.View):
     pass
 
-sebaayeni = MyPageTemplate('<html><body>Sebaayeni is in South Africa</body></html>')
 
+sebaayeni = MyPageTemplate(
+    '<html><body>Sebaayeni is in South Africa</body></html>')
+
+
 class Lascaux(grok.View):
     pass
 
+
 lascaux = MyPageTemplate(filename='lascaux.html')
 
+
 class Kakadu(grok.View):
     pass
 
+
 class Sierra(grok.View):
 
     def namespace(self):

Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/zpt.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/zpt.py	2008-07-18 10:02:47 UTC (rev 88483)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/zpt.py	2008-07-18 10:11:08 UTC (rev 88484)
@@ -1,7 +1,6 @@
 """
 
-  >>> from grokcore.view.tests.test_all import grok
-  >>> grok(__name__)
+  >>> grok.testing.grok(__name__)
 
   >>> cave = Cave()
   >>> from zope.publisher.browser import TestRequest

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 10:02:47 UTC (rev 88483)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/test_all.py	2008-07-18 10:11:08 UTC (rev 88484)
@@ -5,21 +5,8 @@
 
 from zope.testing import doctest, cleanup, renormalizing
 import zope.component.eventtesting
-from zope.configuration.config import ConfigurationMachine
 
-from grokcore.component import zcml
 
-
-def grok(module_name):
-    config = ConfigurationMachine()
-    zcml.do_grok('grokcore.component.meta', config)
-    zcml.do_grok('grokcore.view.meta', config)
-    zcml.do_grok('grokcore.view.templatereg', config)
-    zcml.do_grok('grokcore.view.tests.meta', config)
-    zcml.do_grok(module_name, config)
-    config.execute_actions()
-
-
 class GrokcoreViewLayer:
 
     @classmethod



More information about the Checkins mailing list