[Plone-cvs] r10763 - plone.portlets/trunk/plone/portlets

[optilude <svn...@pl...>]

Author: optilude
Date: Sat Sep  2 22:01:39 2006
New Revision: 10763

Modified:
   plone.portlets/trunk/plone/portlets/configure.zcml
   plone.portlets/trunk/plone/portlets/tests.py
Log:
Fix tests by doing set-up there instead of in configure.zcml


Modified: plone.portlets/trunk/plone/portlets/configure.zcml
==============================================================================
--- plone.portlets/trunk/plone/portlets/configure.zcml	(original)
+++ plone.portlets/trunk/plone/portlets/configure.zcml	Sat Sep  2 22:01:39 2006
@@ -1,24 +1,6 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-    <!--
-      
-      TODO: Loading these like this breaks Plone ;-)
-      
-      set up in tests only
-      
-    <include package="zope.security" file="meta.zcml" />
-    <include package="zope.app.security" file="meta.zcml" />
-    <include package="zope.app.component" file="meta.zcml" />
-    <include package="zope.app.pagetemplate" file="meta.zcml" />
-  -->
-
     <include package="zope.annotation" />
-    <!--
-    <include package="zope.app.security" />
-    <include package="zope.app.event" />
-    <include package="zope.app.container" />
-    <include package="zope.contentprovider" />
-  -->
     
     <adapter factory=".assignable.localPortletAssignmentMappingAdapter" />
     <adapter factory=".assignable.LocalPortletAssignmentManager" />

Modified: plone.portlets/trunk/plone/portlets/tests.py
==============================================================================
--- plone.portlets/trunk/plone/portlets/tests.py	(original)
+++ plone.portlets/trunk/plone/portlets/tests.py	Sat Sep  2 22:01:39 2006
@@ -2,6 +2,15 @@
 
 import plone.portlets
 
+import zope.security
+import zope.app.security
+import zope.app.component
+import zope.app.pagetemplate
+
+import zope.app.event
+import zope.app.container
+import zope.contentprovider
+
 from zope.testing import doctest
 from zope.component.testing import setUp, tearDown
 from zope.configuration.xmlconfig import XMLConfig
@@ -10,6 +19,17 @@
 
 def configurationSetUp(test):
     setUp()
+    
+    XMLConfig('meta.zcml', zope.security)()
+    XMLConfig('meta.zcml', zope.app.security)()
+    XMLConfig('meta.zcml', zope.app.component)()
+    XMLConfig('meta.zcml', zope.app.pagetemplate)()
+    
+    XMLConfig('configure.zcml', zope.app.security)()
+    XMLConfig('configure.zcml', zope.app.event)()
+    XMLConfig('configure.zcml', zope.app.container)()
+    XMLConfig('configure.zcml', zope.contentprovider)()
+    
     XMLConfig('configure.zcml', plone.portlets)()