[CMF-checkins] SVN: CMF/trunk/CMF - get rid of installProduct('Five')

[Yvo Schubbe]

Log message for revision 69233:
  - get rid of installProduct('Five')

Changed:
  U   CMF/trunk/CMFCalendar/tests/test_Calendar.py
  U   CMF/trunk/CMFCore/tests/base/testcase.py
  U   CMF/trunk/CMFDefault/tests/test_DiscussionReply.py
  U   CMF/trunk/CMFDefault/tests/test_Image.py
  U   CMF/trunk/CMFDefault/tests/test_Portal.py
  U   CMF/trunk/CMFDefault/tests/test_join.py
  U   CMF/trunk/CMFTopic/tests/test_DateC.py

-=-
Modified: CMF/trunk/CMFCalendar/tests/test_Calendar.py
===================================================================
--- CMF/trunk/CMFCalendar/tests/test_Calendar.py	2006-07-21 11:44:41 UTC (rev 69232)
+++ CMF/trunk/CMFCalendar/tests/test_Calendar.py	2006-07-21 12:46:12 UTC (rev 69233)
@@ -18,7 +18,6 @@
 import unittest
 from Testing import ZopeTestCase
 ZopeTestCase.installProduct('ZCTextIndex', 1)
-ZopeTestCase.installProduct('Five', 1)
 ZopeTestCase.installProduct('CMFCore', 1)
 ZopeTestCase.installProduct('CMFDefault', 1)
 ZopeTestCase.utils.setupCoreSessions()
@@ -123,6 +122,7 @@
         setUpTraversing()
         setUpGenericSetup()
         zcml.load_config('permissions.zcml', Products.Five)
+        zcml.load_config('configure.zcml', Products.Five.browser)
         zcml.load_config('configure.zcml', Products.Five.skin)
         zcml.load_config('configure.zcml', Products.CMFCalendar)
         zcml.load_config('configure.zcml', Products.CMFCore)

Modified: CMF/trunk/CMFCore/tests/base/testcase.py
===================================================================
--- CMF/trunk/CMFCore/tests/base/testcase.py	2006-07-21 11:44:41 UTC (rev 69232)
+++ CMF/trunk/CMFCore/tests/base/testcase.py	2006-07-21 12:46:12 UTC (rev 69233)
@@ -44,10 +44,25 @@
 </configure>
 """
 
+_REQUEST_ZCML = """
+<configure
+    xmlns:five="http://namespaces.zope.org/five"
+    >
+
+  <!-- make Zope 2's REQUEST implement the right thing -->
+  <five:implements
+      class="ZPublisher.HTTPRequest.HTTPRequest"
+      interface="zope.publisher.interfaces.browser.IBrowserRequest"
+      />
+
+</configure>
+"""
+
 def setUpTraversing():
     import Products
 
     zcml.load_config('meta.zcml', Products.Five)
+    zcml.load_string(_REQUEST_ZCML)
     try:
         import zope.traversing
         zcml.load_config('traversing.zcml', Products.Five)
@@ -57,7 +72,7 @@
 
 def setUpEvents():
     import Products
-    import zope.app
+    import zope.app.event
 
     #   First, set up "stock" OFS event propagation
     zcml.load_config('meta.zcml', Products.Five)

Modified: CMF/trunk/CMFDefault/tests/test_DiscussionReply.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_DiscussionReply.py	2006-07-21 11:44:41 UTC (rev 69232)
+++ CMF/trunk/CMFDefault/tests/test_DiscussionReply.py	2006-07-21 12:46:12 UTC (rev 69233)
@@ -18,7 +18,6 @@
 import unittest
 from Testing import ZopeTestCase
 ZopeTestCase.installProduct('ZCTextIndex', 1)
-ZopeTestCase.installProduct('Five', 1)
 ZopeTestCase.installProduct('CMFCore', 1)
 ZopeTestCase.installProduct('CMFDefault', 1)
 
@@ -42,6 +41,7 @@
         setUpTraversing()
         setUpGenericSetup()
         zcml.load_config('permissions.zcml', Products.Five)
+        zcml.load_config('configure.zcml', Products.Five.browser)
         zcml.load_config('configure.zcml', Products.CMFCore)
         zcml.load_config('configure.zcml', Products.CMFDefault)
         zcml.load_config('configure.zcml', Products.DCWorkflow)

Modified: CMF/trunk/CMFDefault/tests/test_Image.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_Image.py	2006-07-21 11:44:41 UTC (rev 69232)
+++ CMF/trunk/CMFDefault/tests/test_Image.py	2006-07-21 12:46:12 UTC (rev 69233)
@@ -18,7 +18,6 @@
 import unittest
 from Testing import ZopeTestCase
 ZopeTestCase.installProduct('ZCTextIndex', 1)
-ZopeTestCase.installProduct('Five', 1)
 ZopeTestCase.installProduct('CMFCore', 1)
 ZopeTestCase.installProduct('CMFDefault', 1)
 
@@ -120,6 +119,7 @@
         setUpTraversing()
         setUpGenericSetup()
         zcml.load_config('permissions.zcml', Products.Five)
+        zcml.load_config('configure.zcml', Products.Five.browser)
         zcml.load_config('configure.zcml', Products.CMFCore)
         zcml.load_config('configure.zcml', Products.CMFDefault)
         zcml.load_config('configure.zcml', Products.DCWorkflow)

Modified: CMF/trunk/CMFDefault/tests/test_Portal.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_Portal.py	2006-07-21 11:44:41 UTC (rev 69232)
+++ CMF/trunk/CMFDefault/tests/test_Portal.py	2006-07-21 12:46:12 UTC (rev 69233)
@@ -18,7 +18,6 @@
 import unittest
 from Testing import ZopeTestCase
 ZopeTestCase.installProduct('ZCTextIndex', 1)
-ZopeTestCase.installProduct('Five', 1)
 ZopeTestCase.installProduct('CMFCore', 1)
 ZopeTestCase.installProduct('CMFDefault', 1)
 
@@ -61,6 +60,7 @@
         setUpTraversing()
         setUpGenericSetup()
         zcml.load_config('permissions.zcml', Products.Five)
+        zcml.load_config('configure.zcml', Products.Five.browser)
         zcml.load_config('configure.zcml', Products.CMFCore)
         zcml.load_config('configure.zcml', Products.CMFDefault)
         zcml.load_config('configure.zcml', Products.DCWorkflow)

Modified: CMF/trunk/CMFDefault/tests/test_join.py
===================================================================
--- CMF/trunk/CMFDefault/tests/test_join.py	2006-07-21 11:44:41 UTC (rev 69232)
+++ CMF/trunk/CMFDefault/tests/test_join.py	2006-07-21 12:46:12 UTC (rev 69233)
@@ -18,7 +18,6 @@
 import unittest
 from Testing import ZopeTestCase
 ZopeTestCase.installProduct('ZCTextIndex', 1)
-ZopeTestCase.installProduct('Five', 1)
 ZopeTestCase.installProduct('CMFCore', 1)
 ZopeTestCase.installProduct('CMFDefault', 1)
 
@@ -38,6 +37,7 @@
         TransactionalTest.setUp(self)
         setUpGenericSetup()
         zcml.load_config('permissions.zcml', Products.Five)
+        zcml.load_config('configure.zcml', Products.Five.browser)
         zcml.load_config('configure.zcml', Products.CMFCore)
         zcml.load_config('configure.zcml', Products.CMFDefault)
         zcml.load_config('configure.zcml', Products.DCWorkflow)

Modified: CMF/trunk/CMFTopic/tests/test_DateC.py
===================================================================
--- CMF/trunk/CMFTopic/tests/test_DateC.py	2006-07-21 11:44:41 UTC (rev 69232)
+++ CMF/trunk/CMFTopic/tests/test_DateC.py	2006-07-21 12:46:12 UTC (rev 69233)
@@ -18,7 +18,6 @@
 import unittest
 from Testing import ZopeTestCase
 ZopeTestCase.installProduct('ZCTextIndex', 1)
-ZopeTestCase.installProduct('Five', 1)
 ZopeTestCase.installProduct('CMFCore', 1)
 ZopeTestCase.installProduct('CMFDefault', 1)
 
@@ -169,6 +168,7 @@
         RequestTest.setUp(self)
         setUpGenericSetup()
         zcml.load_config('permissions.zcml', Products.Five)
+        zcml.load_config('configure.zcml', Products.Five.browser)
         zcml.load_config('configure.zcml', Products.CMFCore)
         zcml.load_config('configure.zcml', Products.CMFDefault)
         zcml.load_config('configure.zcml', Products.DCWorkflow)