[Checkins] SVN: Sandbox/darrylcousins/mars.layer/ Tidied up tests
Darryl Cousins
darryl at darrylcousins.net.nz
Mon Jul 16 03:37:23 EDT 2007
Log message for revision 78020:
Tidied up tests
Changed:
U Sandbox/darrylcousins/mars.layer/buildout.cfg
U Sandbox/darrylcousins/mars.layer/setup.py
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/directive.py
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py
D Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_all.py
A Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py
A Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt
U Sandbox/darrylcousins/mars.layer/src/mars/layer/meta.py
A Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py
-=-
Modified: Sandbox/darrylcousins/mars.layer/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/mars.layer/buildout.cfg 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/buildout.cfg 2007-07-16 07:37:22 UTC (rev 78020)
@@ -5,6 +5,9 @@
[test]
recipe = zc.recipe.testrunner
eggs = mars.layer [test]
+defaults = ['--tests-pattern', '^f?tests$',
+ '-v'
+ ]
[zope3]
location = .
Modified: Sandbox/darrylcousins/mars.layer/setup.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/setup.py 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/setup.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -26,21 +26,12 @@
extras_require = dict(
test=['zope.app.testing',
'zope.testbrowser',
- 'zope.app.zcmlfiles',
- 'zope.app.securitypolicy',
- 'zope.app.authentication',
'z3c.pagelet',
]
),
install_requires = [
'setuptools',
- 'zope.app.intid',
- 'zope.app.catalog',
- 'zope.component',
- 'zope.interface',
- 'zope.publisher',
'grok',
- 'martian',
'z3c.form',
'z3c.formui',
'z3c.layer',
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/directive.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/directive.py 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/directive.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -2,7 +2,7 @@
Test the claimed directives.
>>> import grok
- >>> grok.grok('mars.layer.tests.directive')
+ >>> grok.grok('mars.layer.ftests.directive')
>>> from zope.testbrowser.testing import Browser
>>> browser = Browser()
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml 2007-07-16 07:37:22 UTC (rev 78020)
@@ -10,8 +10,6 @@
<include package="z3c.layer.minimal.tests" file="ftesting.zcml" />
- <include package="grok" />
-
</configure>
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -1,7 +1,7 @@
"""
>>> import grok
- >>> grok.grok('mars.layer.tests.minimal')
+ >>> grok.grok('mars.layer.ftests.minimal')
>>> from zope.testbrowser.testing import Browser
>>> browser = Browser()
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml 2007-07-16 07:37:22 UTC (rev 78020)
@@ -10,8 +10,6 @@
<include package="z3c.layer.pagelet.tests" file="ftesting.zcml" />
- <include package="grok" />
-
</configure>
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -1,7 +1,7 @@
"""
>>> import grok
- >>> grok.grok('mars.layer.tests.pagelet')
+ >>> grok.grok('mars.layer.ftests.pagelet')
>>> from zope.testbrowser.testing import Browser
>>> browser = Browser()
Deleted: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_all.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_all.py 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_all.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -1,29 +0,0 @@
-import unittest
-from pkg_resources import resource_listdir
-
-from grok.ftests.test_grok_functional import FunctionalDocTestSuite
-
-from zope.app.testing import functional
-functional.defineLayer('TestMinimalLayer', 'minimal-ftesting.zcml')
-functional.defineLayer('TestPageletLayer', 'pagelet-ftesting.zcml')
-
-def test_suite():
- suite = unittest.TestSuite()
- dottedname = 'mars.layer.tests.%s'
- for name in ['minimal', 'directive']:
- test = FunctionalDocTestSuite(dottedname % name)
- test.layer = TestMinimalLayer
- suite.addTest(test)
-
- test = FunctionalDocTestSuite(dottedname % 'pagelet')
- test.layer = TestPageletLayer
- suite.addTest(test)
-
- return suite
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
-
-
-
Added: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py (rev 0)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -0,0 +1,39 @@
+import unittest
+from zope.testing import doctest
+
+from zope.app.testing.functional import FunctionalTestSetup, getRootFolder
+from zope.app.testing import functional
+functional.defineLayer('TestMinimalLayer', 'minimal-ftesting.zcml')
+functional.defineLayer('TestPageletLayer', 'pagelet-ftesting.zcml')
+
+optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
+globs = dict(getRootFolder=getRootFolder)
+
+def setUp(test):
+ FunctionalTestSetup().setUp()
+
+def tearDown(test):
+ FunctionalTestSetup().tearDown()
+
+def test_suite():
+ suite = unittest.TestSuite()
+ dottedname = 'mars.layer.ftests.%s'
+ for name in ['minimal', 'directive']:
+ test = doctest.DocTestSuite(
+ dottedname % name, setUp=setUp, globs=globs,
+ tearDown=tearDown, optionflags=optionflags)
+ test.layer = TestMinimalLayer
+ suite.addTest(test)
+ test = doctest.DocTestSuite(
+ dottedname % 'pagelet', setUp=setUp, globs=globs,
+ tearDown=tearDown, optionflags=optionflags)
+ test.layer = TestPageletLayer
+ suite.addTest(test)
+ return suite
+
+
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='test_suite')
+
+
Property changes on: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py
___________________________________________________________________
Name: svn:keywords
+ Id
Added: Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt (rev 0)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt 2007-07-16 07:37:22 UTC (rev 78020)
@@ -0,0 +1,26 @@
+==========
+Mars Layer
+==========
+
+Initially I began with defining a single layer but as I developed mars.fordemo I
+realised the possibility of defining more layers here in this package.
+
+ >>> import mars.layer
+
+The mars.layer.layer directive can be used in a module to define the layer for
+all of the components in the file. Layers aren't ``grokked`` as such but
+mars.layer.Skin is.
+
+ >>> class IMyLayer(mars.layer.ILayer):
+ ... pass
+
+ >>> class MySkin(mars.layer.Skin):
+ ... mars.layer.layer(IMyLayer)
+
+ >>> from mars.layer.meta import SkinGrokker
+ >>> SkinGrokker().grok('', MySkin, None, None, None)
+ True
+
+ >>> from zope.publisher.interfaces.browser import IBrowserSkinType
+ >>> IBrowserSkinType.providedBy(IMyLayer)
+ True
Property changes on: Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt
___________________________________________________________________
Name: svn:keywords
+ Date Author
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/meta.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/meta.py 2007-07-16 06:59:20 UTC (rev 78019)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/meta.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -1,8 +1,7 @@
import martian
import grok
import zope.component
-from zope.publisher.interfaces.browser import (IDefaultBrowserLayer,
- IBrowserRequest,
+from zope.publisher.interfaces.browser import (IBrowserRequest,
IBrowserSkinType)
from martian import util
import mars.layer
Added: Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py (rev 0)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py 2007-07-16 07:37:22 UTC (rev 78020)
@@ -0,0 +1,24 @@
+import unittest
+from zope.testing import doctest
+
+optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
+
+def setUp(test):
+ pass
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTests([doctest.DocFileSuite('./layer.txt',
+ setUp=setUp,
+ optionflags=optionflags),
+ ])
+
+ return suite
+
+
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='test_suite')
+
+
+
Property changes on: Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py
___________________________________________________________________
Name: svn:keywords
+ Id
More information about the Checkins
mailing list