[Checkins] SVN: zope.app.intid/trunk/ Use zope.site instead of zope.app.folder and zope.app.component in tests.

[Sylvain Viollon]

Log message for revision 95590:
  Use zope.site instead of zope.app.folder and zope.app.component in tests.
  
  

Changed:
  U   zope.app.intid/trunk/CHANGES.txt
  U   zope.app.intid/trunk/setup.py
  U   zope.app.intid/trunk/src/zope/app/intid/browser/tracking.txt
  U   zope.app.intid/trunk/src/zope/app/intid/tests.py

-=-
Modified: zope.app.intid/trunk/CHANGES.txt
===================================================================
--- zope.app.intid/trunk/CHANGES.txt	2009-01-30 16:47:05 UTC (rev 95589)
+++ zope.app.intid/trunk/CHANGES.txt	2009-01-30 16:54:07 UTC (rev 95590)
@@ -5,8 +5,12 @@
 3.6.0 (unreleased)
 ------------------
 
-- Changed dependency from zope.app.container to zope.container.
+- Changed dependency from ``zope.app.container`` to
+  ``zope.container``.
 
+- Move test dependencies ``zope.app.folder`` and
+  ``zope.app.component`` as ``zope.site``.
+
 3.5.1 (2008-12-11)
 ------------------
 

Modified: zope.app.intid/trunk/setup.py
===================================================================
--- zope.app.intid/trunk/setup.py	2009-01-30 16:47:05 UTC (rev 95589)
+++ zope.app.intid/trunk/setup.py	2009-01-30 16:54:07 UTC (rev 95590)
@@ -49,11 +49,10 @@
       namespace_packages=['zope', 'zope.app'],
       extras_require = dict(test=['zope.app.testing',
                                   'zope.app.securitypolicy',
-                                  'zope.app.folder',
+                                  'zope.site',
                                   'zope.app.zcmlfiles']),
       install_requires = ['setuptools',
                           'ZODB3',
-                          'zope.app.component',
                           'zope.container',
                           'zope.app.keyreference',
                           'zope.component',

Modified: zope.app.intid/trunk/src/zope/app/intid/browser/tracking.txt
===================================================================
--- zope.app.intid/trunk/src/zope/app/intid/browser/tracking.txt	2009-01-30 16:47:05 UTC (rev 95589)
+++ zope.app.intid/trunk/src/zope/app/intid/browser/tracking.txt	2009-01-30 16:54:07 UTC (rev 95590)
@@ -54,7 +54,7 @@
   ... Content-Length: 64
   ... 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 ...
   ...
 
@@ -64,7 +64,7 @@
   ... Content-Length: 64
   ... 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 ...
   ...
 
@@ -74,7 +74,7 @@
   ... Content-Length: 64
   ... 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 ...
   ...
 
@@ -84,7 +84,7 @@
   ... Content-Length: 64
   ... 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 ...
   ...
 

Modified: zope.app.intid/trunk/src/zope/app/intid/tests.py
===================================================================
--- zope.app.intid/trunk/src/zope/app/intid/tests.py	2009-01-30 16:47:05 UTC (rev 95589)
+++ zope.app.intid/trunk/src/zope/app/intid/tests.py	2009-01-30 16:54:07 UTC (rev 95590)
@@ -34,7 +34,7 @@
 from zope.traversing.api import traverse
 
 from zope.app.testing import setup, ztapi
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
 
 from zope.app.intid import IntIds, intIdEventNotify
 from zope.app.intid.interfaces import IIntIds
@@ -189,7 +189,7 @@
 class TestSubscribers(ReferenceSetupMixin, unittest.TestCase):
 
     def setUp(self):
-        from zope.app.folder import Folder, rootFolder
+        from zope.site.folder import Folder, rootFolder
         from zope.component import provideHandler
 
         ReferenceSetupMixin.setUp(self)
@@ -210,7 +210,7 @@
         from zope.app.intid import removeIntIdSubscriber
         from zope.container.contained import ObjectRemovedEvent
         from zope.app.intid.interfaces import IIntIdRemovedEvent
-        from zope.app.folder.interfaces import IFolder
+        from zope.site.interfaces import IFolder
         parent_folder = self.root['folder1']['folder1_1']
         folder = self.root['folder1']['folder1_1']['folder1_1_1']
         id = self.utility.register(folder)
@@ -248,7 +248,7 @@
         from zope.app.intid import addIntIdSubscriber
         from zope.container.contained import ObjectAddedEvent
         from zope.app.intid.interfaces import IIntIdAddedEvent
-        from zope.app.folder.interfaces import IFolder
+        from zope.site.interfaces import IFolder
         parent_folder = self.root['folder1']['folder1_1']
         folder = self.root['folder1']['folder1_1']['folder1_1_1']
         setSite(self.folder1_1)