[Checkins] SVN: z3ext.controlpanel/trunk/s update tests

[Nikolay Kim]

Log message for revision 99147:
  update tests

Changed:
  U   z3ext.controlpanel/trunk/setup.py
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/ftesting.zcml

-=-
Modified: z3ext.controlpanel/trunk/setup.py
===================================================================
--- z3ext.controlpanel/trunk/setup.py	2009-04-13 10:46:06 UTC (rev 99146)
+++ z3ext.controlpanel/trunk/setup.py	2009-04-13 11:06:23 UTC (rev 99147)
@@ -84,6 +84,7 @@
                                   'zope.traversing',
                                   'zope.testing',
                                   'zope.testbrowser',
+				  'z3ext.autoinclude',
                                   ]),
       include_package_data = True,
       zip_safe = False

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/ftesting.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/ftesting.zcml	2009-04-13 10:46:06 UTC (rev 99146)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/ftesting.zcml	2009-04-13 11:06:23 UTC (rev 99147)
@@ -2,40 +2,13 @@
    xmlns="http://namespaces.zope.org/zope"
    i18n_domain="zope">
 
-  <!-- This file is the equivalent of site.zcml and it is -->
-  <!-- used for functional testing setup -->
+  <include package="z3ext.autoinclude" file="meta.zcml" />
+  <includeAllDependencies package="z3ext.controlpanel" extras="test" />
 
-  <include package="zope.component" file="meta.zcml" />
-  <include package="zope.securitypolicy" file="meta.zcml" />
-  <include package="zope.viewlet" file="meta.zcml" />
-  <include package="zope.app.component" file="meta.zcml" />
-  <include package="zope.app.security" file="meta.zcml" />
-  <include package="zope.app.pagetemplate" file="meta.zcml" />
-
-  <include package="zope.securitypolicy" />
-  <include package="zope.contentprovider" />
-  <include package="zope.app.security" />
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.authentication" />
-  <include package="zope.session" />
-
-  <include package="z3c.form" file="meta.zcml" />
-  <include package="z3c.form" />
-
-  <include package="z3ext.resource" file="meta.zcml" />
-  <include package="z3ext.resourcepackage" file="meta.zcml" />
-  <include package="z3ext.controlpanel" file="meta.zcml" />
-  <include package="z3ext.layout" file="meta.zcml" />
-  <include package="z3ext.layout" />
-  <include package="z3ext.layoutform" />
-  <include package="z3ext.resource" />
-  <include package="z3ext.resourcepackage" />
-  <include package="z3ext.statusmessage" />
-  <include package="z3ext.controlpanel" />
   <include package="z3ext.controlpanel.browser.tests" />
 
   <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+     component="z3ext.security.securitypolicy.SecurityPolicy" />
 
   <role id="zope.Anonymous" title="Everybody"
         description="All users have this role implicitly" />