[Checkins] SVN: zope.app.xmlrpcintrospection/trunk/ Refactor duplicate test file. Use zope.site instead of zope.app.folder in it.

Sylvain Viollon sylvain at infrae.com
Fri Jan 30 11:28:23 EST 2009


Log message for revision 95583:
  Refactor duplicate test file. Use zope.site instead of zope.app.folder in it.
  
  

Changed:
  U   zope.app.xmlrpcintrospection/trunk/CHANGES.txt
  U   zope.app.xmlrpcintrospection/trunk/setup.py
  U   zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/README.txt
  U   zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/ftests.py
  U   zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/tests/test_functional.py

-=-
Modified: zope.app.xmlrpcintrospection/trunk/CHANGES.txt
===================================================================
--- zope.app.xmlrpcintrospection/trunk/CHANGES.txt	2009-01-30 16:25:09 UTC (rev 95582)
+++ zope.app.xmlrpcintrospection/trunk/CHANGES.txt	2009-01-30 16:28:23 UTC (rev 95583)
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+3.5.0 (unreleased)
+------------------
+
+- Update ``zope.app.folder`` with ``zope.site``.
+
 3.4.0 (2007-11-03)
 ------------------
 

Modified: zope.app.xmlrpcintrospection/trunk/setup.py
===================================================================
--- zope.app.xmlrpcintrospection/trunk/setup.py	2009-01-30 16:25:09 UTC (rev 95582)
+++ zope.app.xmlrpcintrospection/trunk/setup.py	2009-01-30 16:28:23 UTC (rev 95583)
@@ -53,7 +53,7 @@
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
       extras_require=dict(test=['zope.app.testing',
-                                'zope.app.folder',
+                                'zope.site',
                                 'zope.app.securitypolicy',
                                 'zope.app.zcmlfiles']),
       install_requires=['setuptools',

Modified: zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/README.txt
===================================================================
--- zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/README.txt	2009-01-30 16:25:09 UTC (rev 95582)
+++ zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/README.txt	2009-01-30 16:28:23 UTC (rev 95583)
@@ -69,7 +69,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.interfaces.IFolder"
   ...       methods="contents"
   ...       class="zope.app.xmlrpcintrospection.README.FolderListing"
   ...       permission="zope.ManageContent"
@@ -85,7 +85,7 @@
   ... Content-Length: 73
   ... Content-Type: application/x-www-form-urlencoded
   ...
-  ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f1""")
+  ... type_name=BrowserAdd__zope.site.folder.Folder&new_value=f1""")
   HTTP/1.1 303 See Other
   ...
 
@@ -95,7 +95,7 @@
   ... Content-Length: 73
   ... Content-Type: application/x-www-form-urlencoded
   ...
-  ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f2""")
+  ... type_name=BrowserAdd__zope.site.folder.Folder&new_value=f2""")
   HTTP/1.1 303 See Other
   ...
 
@@ -194,7 +194,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.interfaces.IFolder"
   ...       methods="contents2"
   ...       class="zope.app.xmlrpcintrospection.README.FolderListing2"
   ...       permission="zope.ManageContent"
@@ -281,7 +281,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.folder.IFolder"
   ...       methods="says says_not_decorated"
   ...       class="zope.app.xmlrpcintrospection.README.JacksonFiveRPC"
   ...       permission="zope.ManageContent"
@@ -381,7 +381,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.folder.IFolder"
   ...       methods="says says_not_documented"
   ...       class="zope.app.xmlrpcintrospection.README.JacksonFiveRPCDocumented"
   ...       permission="zope.ManageContent"

Modified: zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/ftests.py
===================================================================
--- zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/ftests.py	2009-01-30 16:25:09 UTC (rev 95582)
+++ zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/ftests.py	2009-01-30 16:28:23 UTC (rev 95583)
@@ -18,13 +18,13 @@
 
 import re
 import zope.interface
-import zope.app.folder.folder
+import zope.site.interfaces
 import zope.publisher.interfaces.xmlrpc
 from zope.testing import renormalizing
 from zope.app.testing import ztapi, functional, setup
 from zope.app.xmlrpcintrospection.testing import XmlrpcIntrospectionLayer
 
-
+# FIXME: This should be a layer, but maybe people depend on it.
 def setUp(test):
     setup.setUpTestAsModule(test, 'zope.app.xmlrpcintrospection.README')
 
@@ -37,13 +37,13 @@
     # requires the object that was registered and we don't have that handy.
     # (OK, we could get it if we want. Maybe later.)
 
-    ztapi.provideView(zope.app.folder.folder.IFolder,
+    ztapi.provideView(zope.site.interfaces.IFolder,
                         zope.publisher.interfaces.xmlrpc.IXMLRPCRequest,
                         zope.interface,
                         'contents',
                         None,
                         )
-    ztapi.provideView(zope.app.folder.folder.IFolder,
+    ztapi.provideView(zope.site.interfaces.IFolder,
                         zope.publisher.interfaces.xmlrpc.IXMLRPCRequest,
                         zope.interface,
                         'contents',
@@ -58,13 +58,3 @@
     ])
 
 
-def test_suite():
-    suite = functional.FunctionalDocFileSuite(
-        'README.txt', setUp=setUp, tearDown=tearDown, checker=checker)
-    suite.layer = XmlrpcIntrospectionLayer
-    return suite
-
-
-if __name__ == '__main__':
-    import unittest
-    unittest.main(defaultTest='test_suite')

Modified: zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/tests/test_functional.py
===================================================================
--- zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/tests/test_functional.py	2009-01-30 16:25:09 UTC (rev 95582)
+++ zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection/tests/test_functional.py	2009-01-30 16:28:23 UTC (rev 95583)
@@ -16,48 +16,10 @@
 $Id$
 """
 
-import re
-import zope.interface
-import zope.app.folder.folder
-import zope.publisher.interfaces.xmlrpc
-from zope.testing import renormalizing
-from zope.app.testing import ztapi, functional, setup
+from zope.app.testing import functional
+from zope.app.xmlrpcintrospection.ftests import setUp, tearDown, checker
 from zope.app.xmlrpcintrospection.testing import XmlrpcIntrospectionLayer
 
-
-def setUp(test):
-    setup.setUpTestAsModule(test, 'zope.app.xmlrpcintrospection.README')
-
-
-def tearDown(test):
-    # clean up the views we registered:
-
-    # we use the fact that registering None unregisters whatever is
-    # registered. We can't use an unregistration call because that
-    # requires the object that was registered and we don't have that handy.
-    # (OK, we could get it if we want. Maybe later.)
-
-    ztapi.provideView(zope.app.folder.folder.IFolder,
-                        zope.publisher.interfaces.xmlrpc.IXMLRPCRequest,
-                        zope.interface,
-                        'contents',
-                        None,
-                        )
-    ztapi.provideView(zope.app.folder.folder.IFolder,
-                        zope.publisher.interfaces.xmlrpc.IXMLRPCRequest,
-                        zope.interface,
-                        'contents',
-                        None,
-                        )
-
-    setup.tearDownTestAsModule(test)
-
-
-checker = renormalizing.RENormalizing([
-    (re.compile(r"HTTP/1\.([01]) (\d\d\d) .*"), r"HTTP/1.\1 \2 <MESSAGE>"),
-    ])
-
-
 def test_suite():
     suite = functional.FunctionalDocFileSuite(
         '../README.txt', setUp=setUp, tearDown=tearDown, checker=checker)



More information about the Checkins mailing list