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

Fri Jul 18 05:55:33 EDT 2008

Log message for revision 88481:
  refactor to ease test conversion

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

-=-
Added: 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	                        (rev 0)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/grok.py	2008-07-18 09:55:32 UTC (rev 88481)
@@ -0,0 +1 @@
+from components import Model, View

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 09:27:18 UTC (rev 88480)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/pluggability.py	2008-07-18 09:55:32 UTC (rev 88481)
@@ -35,8 +35,7 @@
 import grokcore.view
 from grokcore.view import components
 
-from grokcore.view.tests.components import TestView
-from grokcore.view.tests.components import TestModel
+from grokcore.view.tests import grok
 
 # Dummy template language:
 class MyTemplate(object):
@@ -72,23 +71,23 @@
     def __call__(self, filename, _prefix=None):
         return MyPageTemplate(filename=filename, _prefix=_prefix)
 
-class Cave(TestModel):
+class Cave(grok.Model):
     pass
 
-class Sebaayeni(TestView):
+class Sebaayeni(grok.View):
     pass
 
 sebaayeni = MyPageTemplate('<html><body>Sebaayeni is in South Africa</body></html>')
 
-class Lascaux(TestView):
+class Lascaux(grok.View):
     pass
 
 lascaux = MyPageTemplate(filename='lascaux.html')
 
-class Kakadu(TestView):
+class Kakadu(grok.View):
     pass
 
-class Sierra(TestView):
+class Sierra(grok.View):
 
     def namespace(self):
         return {'cave': 'Sierra de San Fransisco',

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 09:27:18 UTC (rev 88480)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/template/zpt.py	2008-07-18 09:55:32 UTC (rev 88481)
@@ -14,13 +14,12 @@
 
 """
 
-from grokcore.view.tests.components import TestView
-from grokcore.view.tests.components import TestModel
+from grokcore.view.tests import grok
 
 
-class Cave(TestModel):
+class Cave(grok.Model):
     pass
 
 
-class Piepmatz(TestView):
+class Piepmatz(grok.View):
     pass # template in zpt_templates/piepmatz.pt

