[Checkins] SVN: grokcore.message/trunk/s Severed all the unneeded dependencies. Testing is now clean.

[Souheil CHELFOUH]

Log message for revision 109577:
  Severed all the unneeded dependencies. Testing is now clean.
  

Changed:
  U   grokcore.message/trunk/setup.py
  U   grokcore.message/trunk/src/grokcore/message/ftesting.zcml
  U   grokcore.message/trunk/src/grokcore/message/tests.py

-=-
Modified: grokcore.message/trunk/setup.py
===================================================================
--- grokcore.message/trunk/setup.py	2010-03-02 22:12:48 UTC (rev 109576)
+++ grokcore.message/trunk/setup.py	2010-03-02 22:38:26 UTC (rev 109577)
@@ -12,15 +12,13 @@
     'setuptools',
     'z3c.flashmessage',
     'grokcore.component',
+    'zope.component',
     ]
 
 tests_require = [
-    'zope.app.testing',
-    'zope.app.zcmlfiles',
     'zope.publisher',
     'zope.security',
     'zope.session',
-    'zope.testing',
     ]
 
 setup(name='grokcore.message',

Modified: grokcore.message/trunk/src/grokcore/message/ftesting.zcml
===================================================================
--- grokcore.message/trunk/src/grokcore/message/ftesting.zcml	2010-03-02 22:12:48 UTC (rev 109576)
+++ grokcore.message/trunk/src/grokcore/message/ftesting.zcml	2010-03-02 22:38:26 UTC (rev 109577)
@@ -1,13 +1,26 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
-   i18n_domain="zope"
-   >
+   i18n_domain="zope">
 
-  <!-- This file is the equivalent of site.zcml and it is -->
-  <!-- used for functional testing setup -->
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.session" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
 
+  <include package="zope.security" />
+
+  <!-- We define exactly what we need. zope.session doesn't
+       declare all its dependencies. (zope.traversing) -->
+
+  <adapter
+      factory="zope.session.session.ClientId"
+      permission="zope.Public" 
+      />
+
+  <adapter
+      factory="zope.session.session.Session"
+      provides="zope.session.interfaces.ISession"
+      permission="zope.Public"
+      />
+
   <utility
     factory="zope.session.http.CookieClientIdManager"
     provides="zope.session.interfaces.IClientIdManager"

Modified: grokcore.message/trunk/src/grokcore/message/tests.py
===================================================================
--- grokcore.message/trunk/src/grokcore/message/tests.py	2010-03-02 22:12:48 UTC (rev 109576)
+++ grokcore.message/trunk/src/grokcore/message/tests.py	2010-03-02 22:38:26 UTC (rev 109577)
@@ -1,35 +1,30 @@
 # -*- coding: utf-8 -*-
 """Test harness"""
 
-import unittest
 import doctest
-import os
+import unittest
+import grokcore.message
 
-from zope.app.testing.functional import FunctionalDocFileSuite, ZCMLLayer
-import zope.security.management
-import zope.publisher.browser
+from zope.component.testlayer import ZCMLFileLayer
+from zope.publisher.browser import TestRequest
+from zope.security.management import newInteraction, endInteraction
 
 
-GrokcoreMessageLayer = ZCMLLayer(
-    os.path.join(os.path.dirname(__file__), 'ftesting.zcml'),
-    __name__, 'GrokcoreMessageLayer', allow_teardown=True)
+class GrokcoreMessageLayer(ZCMLFileLayer):
 
+    def setUp(self):
+        ZCMLFileLayer.setUp(self)
+        newInteraction(TestRequest())
 
-def setUp(test):
-    request = zope.publisher.browser.TestRequest()
-    zope.security.management.newInteraction()
-    interaction = zope.security.management.getInteraction()
-    interaction.add(request)
+    def tearDown(self):
+        endInteraction()
+        ZCMLFileLayer.tearDown(self)
 
-def tearDown(test):
-    pass
 
 def test_suite():
     suite = unittest.TestSuite()
-    test = FunctionalDocFileSuite('README.txt',
-                                  optionflags=doctest.ELLIPSIS,
-                                  setUp=setUp,
-                                  tearDown=tearDown)
-    test.layer = GrokcoreMessageLayer
+    test = doctest.DocFileSuite(
+        'README.txt', optionflags=doctest.ELLIPSIS)
+    test.layer = GrokcoreMessageLayer(grokcore.message)
     suite.addTest(test)
     return suite