[Checkins] SVN: grokcore.json/trunk/src/grokcore/json/ Cleaned up the tests.
Souheil CHELFOUH
souheil at chelfouh.com
Tue Nov 2 21:51:41 EDT 2010
Log message for revision 118130:
Cleaned up the tests.
Changed:
U grokcore.json/trunk/src/grokcore/json/configure.zcml
U grokcore.json/trunk/src/grokcore/json/ftesting.zcml
A grokcore.json/trunk/src/grokcore/json/ftests/test_functional.py
D grokcore.json/trunk/src/grokcore/json/ftests/test_grok_functional.py
U grokcore.json/trunk/src/grokcore/json/meta.py
U grokcore.json/trunk/src/grokcore/json/meta.zcml
D grokcore.json/trunk/src/grokcore/json/tests/test_grok.py
A grokcore.json/trunk/src/grokcore/json/tests/test_package.py
-=-
Modified: grokcore.json/trunk/src/grokcore/json/configure.zcml
===================================================================
--- grokcore.json/trunk/src/grokcore/json/configure.zcml 2010-11-03 01:44:42 UTC (rev 118129)
+++ grokcore.json/trunk/src/grokcore/json/configure.zcml 2010-11-03 01:51:41 UTC (rev 118130)
@@ -3,91 +3,6 @@
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:grok="http://namespaces.zope.org/grok">
- <include package="zope.app.publication" file="meta.zcml" />
- <include package="zope.browserpage" file="meta.zcml" />
- <include package="zope.component" file="meta.zcml" />
- <include package="zope.i18n" file="meta.zcml" />
- <include package="zope.principalregistry" file="meta.zcml" />
- <include package="zope.publisher" file="meta.zcml" />
- <include package="zope.security" file="meta.zcml" />
- <include package="zope.securitypolicy" file="meta.zcml" />
+ <include file="meta.zcml" />
- <include package="grok" file="meta.zcml" />
-
- <include package="zope.app.appsetup" />
- <include package="zope.app.http" />
- <include package="zope.app.publication" />
- <include package="zope.annotation" />
- <include package="zope.browserpage" />
- <include package="zope.catalog" />
- <include package="zope.component" />
- <include package="zope.contentprovider" />
- <include package="zope.intid" />
- <include package="zope.keyreference" />
- <include package="zope.location" />
- <include package="zope.login" />
- <include package="zope.password" />
- <include package="zope.principalregistry" />
- <include package="zope.publisher" />
- <include package="zope.security " />
- <include package="zope.securitypolicy" />
- <include package="zope.site" />
- <include package="zope.traversing" />
- <include package="zope.traversing.browser" />
-
- <include package="grokcore.annotation" />
- <include package="grokcore.formlib" />
- <include package="grokcore.site" />
- <include package="grokcore.view" />
- <include package="grokcore.viewlet" />
-
- <securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
- <adapter factory=".components.ContextTraverser" />
- <adapter factory=".components.ContainerTraverser" />
-
- <browser:defaultView
- for=".interfaces.IContext"
- name="index"
- />
-
- <!-- we register a ++rest++ traversal namespace -->
- <adapter
- factory=".rest.rest_skin"
- for="* zope.publisher.interfaces.browser.IHTTPRequest"
- provides="zope.traversing.interfaces.ITraversable"
- name="rest"
- />
-
- <!-- this overrides Zope 3's publication factories because they have
- the same name; we also need to change the priority because of
- the ZCML discriminator -->
- <publisher
- name="XMLRPC"
- factory=".publication.GrokXMLRPCFactory"
- methods="POST"
- mimetypes="text/xml"
- priority="21"
- />
-
- <publisher
- name="BROWSER"
- factory=".publication.GrokBrowserFactory"
- methods="GET POST HEAD"
- mimetypes="*"
- priority="11"
- />
-
- <publisher
- name="HTTP"
- factory=".publication.GrokHTTPFactory"
- methods="*"
- mimetypes="*"
- priority="1"
- />
-
- <!-- need to grok this for some basic REST support -->
- <grok:grok package=".rest" />
-
</configure>
Modified: grokcore.json/trunk/src/grokcore/json/ftesting.zcml
===================================================================
--- grokcore.json/trunk/src/grokcore/json/ftesting.zcml 2010-11-03 01:44:42 UTC (rev 118129)
+++ grokcore.json/trunk/src/grokcore/json/ftesting.zcml 2010-11-03 01:51:41 UTC (rev 118130)
@@ -5,33 +5,6 @@
i18n_domain="grok"
package="grok">
- <include package="grok" />
- <grok:grok package="grok.ftests" />
+ <include package="grokcore.json" />
- <browser:defaultView name="index.html" />
-
- <securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
- />
-
- <unauthenticatedPrincipal
- id="zope.anybody"
- title="Unauthenticated User"
- />
- <grant
- permission="zope.View"
- principal="zope.anybody"
- />
-
- <principal
- id="zope.mgr"
- title="Manager"
- login="mgr"
- password="mgrpw"
- />
-
- <role id="zope.Manager" title="Site Manager" />
- <grantAll role="zope.Manager" />
- <grant role="zope.Manager" principal="zope.mgr" />
-
</configure>
Copied: grokcore.json/trunk/src/grokcore/json/ftests/test_functional.py (from rev 118068, grokcore.json/trunk/src/grokcore/json/ftests/test_grok_functional.py)
===================================================================
--- grokcore.json/trunk/src/grokcore/json/ftests/test_functional.py (rev 0)
+++ grokcore.json/trunk/src/grokcore/json/ftests/test_functional.py 2010-11-03 01:51:41 UTC (rev 118130)
@@ -0,0 +1,66 @@
+import re
+import unittest, doctest
+import grokcore.json
+
+from pkg_resources import resource_listdir
+from zope.testing import renormalizing
+from zope.app.wsgi.testlayer import BrowserLayer, http
+
+FunctionalLayer = BrowserLayer(grokcore.json)
+
+checker = renormalizing.RENormalizing([
+ # Accommodate to exception wrapping in newer versions of mechanize
+ (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
+ ])
+
+def http_call(method, path, data=None, **kw):
+ """Function to help make RESTful calls.
+
+ method - HTTP method to use
+ path - testbrowser style path
+ data - (body) data to submit
+ kw - any request parameters
+ """
+
+ if path.startswith('http://localhost'):
+ path = path[len('http://localhost'):]
+ request_string = '%s %s HTTP/1.1\n' % (method, path)
+ for key, value in kw.items():
+ request_string += '%s: %s\n' % (key, value)
+ if data is not None:
+ request_string += '\r\n'
+ request_string += data
+ return http(request_string, handle_errors=False)
+
+def suiteFromPackage(name):
+ files = resource_listdir(__name__, name)
+ suite = unittest.TestSuite()
+ for filename in files:
+ if not filename.endswith('.py'):
+ continue
+ if filename == '__init__.py':
+ continue
+
+ dottedname = 'grokcore.json.ftests.%s.%s' % (name, filename[:-3])
+ test = doctest.DocTestSuite(
+ dottedname,
+ checker=checker,
+ extraglobs=dict(http_call=http_call,
+ http=http,
+ getRootFolder=FunctionalLayer.getRootFolder),
+ optionflags=(doctest.ELLIPSIS+
+ doctest.NORMALIZE_WHITESPACE+
+ doctest.REPORT_NDIFF))
+ test.layer = FunctionalLayer
+
+ suite.addTest(test)
+ return suite
+
+def test_suite():
+ suite = unittest.TestSuite()
+ for name in ['json']:
+ suite.addTest(suiteFromPackage(name))
+ return suite
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='test_suite')
Deleted: grokcore.json/trunk/src/grokcore/json/ftests/test_grok_functional.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/ftests/test_grok_functional.py 2010-11-03 01:44:42 UTC (rev 118129)
+++ grokcore.json/trunk/src/grokcore/json/ftests/test_grok_functional.py 2010-11-03 01:51:41 UTC (rev 118130)
@@ -1,70 +0,0 @@
-import re
-import unittest, doctest
-import grok
-
-from pkg_resources import resource_listdir
-from zope.testing import renormalizing
-from zope.app.wsgi.testlayer import BrowserLayer, http
-
-FunctionalLayer = BrowserLayer(grok)
-
-checker = renormalizing.RENormalizing([
- # Accommodate to exception wrapping in newer versions of mechanize
- (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
- ])
-
-def http_call(method, path, data=None, **kw):
- """Function to help make RESTful calls.
-
- method - HTTP method to use
- path - testbrowser style path
- data - (body) data to submit
- kw - any request parameters
- """
-
- if path.startswith('http://localhost'):
- path = path[len('http://localhost'):]
- request_string = '%s %s HTTP/1.1\n' % (method, path)
- for key, value in kw.items():
- request_string += '%s: %s\n' % (key, value)
- if data is not None:
- request_string += '\r\n'
- request_string += data
- return http(request_string, handle_errors=False)
-
-def suiteFromPackage(name):
- files = resource_listdir(__name__, name)
- suite = unittest.TestSuite()
- for filename in files:
- if not filename.endswith('.py'):
- continue
- if filename == '__init__.py':
- continue
-
- dottedname = 'grok.ftests.%s.%s' % (name, filename[:-3])
- test = doctest.DocTestSuite(
- dottedname,
- checker=checker,
- extraglobs=dict(http_call=http_call,
- http=http,
- getRootFolder=FunctionalLayer.getRootFolder),
- optionflags=(doctest.ELLIPSIS+
- doctest.NORMALIZE_WHITESPACE+
- doctest.REPORT_NDIFF))
- test.layer = FunctionalLayer
-
- suite.addTest(test)
- return suite
-
-def test_suite():
- suite = unittest.TestSuite()
- for name in [
- 'xmlrpc',
- 'traversal', 'form', 'url', 'security', 'rest',
- 'catalog', 'site', 'application', 'viewlet', 'json',
- 'lifecycle']:
- suite.addTest(suiteFromPackage(name))
- return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: grokcore.json/trunk/src/grokcore/json/meta.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/meta.py 2010-11-03 01:44:42 UTC (rev 118129)
+++ grokcore.json/trunk/src/grokcore/json/meta.py 2010-11-03 01:51:41 UTC (rev 118130)
@@ -11,8 +11,8 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""JSON Grokking elements.
"""
-"""
import martian
import grok
from grokcore.json import JSON
Modified: grokcore.json/trunk/src/grokcore/json/meta.zcml
===================================================================
--- grokcore.json/trunk/src/grokcore/json/meta.zcml 2010-11-03 01:44:42 UTC (rev 118129)
+++ grokcore.json/trunk/src/grokcore/json/meta.zcml 2010-11-03 01:51:41 UTC (rev 118130)
@@ -3,16 +3,9 @@
xmlns:meta="http://namespaces.zope.org/meta"
xmlns:grok="http://namespaces.zope.org/grok">
- <include package="z3c.autoinclude" file="meta.zcml" />
-
<!-- Load the grokkers -->
<include package="grokcore.component" file="meta.zcml" />
- <include package="grokcore.formlib" file="meta.zcml" />
- <include package="grokcore.security" file="meta.zcml" />
<include package="grokcore.view" file="meta.zcml" />
- <include package="grokcore.viewlet" file="meta.zcml" />
- <include package="grokcore.annotation" file="meta.zcml" />
- <include package="grokcore.site" file="meta.zcml" />
<grok:grok package=".meta" />
</configure>
Deleted: grokcore.json/trunk/src/grokcore/json/tests/test_grok.py
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/test_grok.py 2010-11-03 01:44:42 UTC (rev 118129)
+++ grokcore.json/trunk/src/grokcore/json/tests/test_grok.py 2010-11-03 01:51:41 UTC (rev 118130)
@@ -1,55 +0,0 @@
-import re
-import unittest
-from pkg_resources import resource_listdir
-from zope.testing import doctest, cleanup, renormalizing
-import zope.component.eventtesting
-
-def setUpZope(test):
- zope.component.eventtesting.setUp(test)
-
-def cleanUpZope(test):
- cleanup.cleanUp()
-
-checker = renormalizing.RENormalizing([
- # str(Exception) has changed from Python 2.4 to 2.5 (due to
- # Exception now being a new-style class). This changes the way
- # exceptions appear in traceback printouts.
- (re.compile(r"ConfigurationExecutionError: <class '([\w.]+)'>:"),
- r'ConfigurationExecutionError: \1:'),
- ])
-
-def suiteFromPackage(name):
- files = resource_listdir(__name__, name)
- suite = unittest.TestSuite()
- for filename in files:
- if not filename.endswith('.py'):
- continue
- if filename.endswith('_fixture.py'):
- continue
- if filename == '__init__.py':
- continue
-
- dottedname = 'grok.tests.%s.%s' % (name, filename[:-3])
- test = doctest.DocTestSuite(dottedname,
- setUp=setUpZope,
- tearDown=cleanUpZope,
- checker=checker,
- optionflags=doctest.ELLIPSIS+
- doctest.NORMALIZE_WHITESPACE)
-
- suite.addTest(test)
- return suite
-
-def test_suite():
- suite = unittest.TestSuite()
- for name in ['adapter', 'error', 'event', 'security', 'catalog',
- 'zcml', 'utility', 'xmlrpc', 'json', 'container',
- 'traversal', 'grokker', 'directive',
- 'baseclass', 'application',
- 'viewlet',
- 'conflict']:
- suite.addTest(suiteFromPackage(name))
- return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Copied: grokcore.json/trunk/src/grokcore/json/tests/test_package.py (from rev 118068, grokcore.json/trunk/src/grokcore/json/tests/test_grok.py)
===================================================================
--- grokcore.json/trunk/src/grokcore/json/tests/test_package.py (rev 0)
+++ grokcore.json/trunk/src/grokcore/json/tests/test_package.py 2010-11-03 01:51:41 UTC (rev 118130)
@@ -0,0 +1,48 @@
+import re
+import unittest
+from pkg_resources import resource_listdir
+from zope.testing import doctest, cleanup, renormalizing
+
+
+def cleanUpZope(test):
+ cleanup.cleanUp()
+
+
+checker = renormalizing.RENormalizing([
+ # str(Exception) has changed from Python 2.4 to 2.5 (due to
+ # Exception now being a new-style class). This changes the way
+ # exceptions appear in traceback printouts.
+ (re.compile(r"ConfigurationExecutionError: <class '([\w.]+)'>:"),
+ r'ConfigurationExecutionError: \1:'),
+ ])
+
+
+def suiteFromPackage(name):
+ files = resource_listdir(__name__, name)
+ suite = unittest.TestSuite()
+ for filename in files:
+ if not filename.endswith('.py'):
+ continue
+ if filename.endswith('_fixture.py'):
+ continue
+ if filename == '__init__.py':
+ continue
+
+ dottedname = 'grokcore.json.tests.%s.%s' % (name, filename[:-3])
+ test = doctest.DocTestSuite(dottedname,
+ tearDown=cleanUpZope,
+ checker=checker,
+ optionflags=doctest.ELLIPSIS+
+ doctest.NORMALIZE_WHITESPACE)
+
+ suite.addTest(test)
+ return suite
+
+def test_suite():
+ suite = unittest.TestSuite()
+ for name in ['json']:
+ suite.addTest(suiteFromPackage(name))
+ return suite
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='test_suite')
More information about the checkins
mailing list