[Checkins] SVN: zope.app.form/trunk/ Reduce zope.app test dependencies by avoiding zope.app.securitypolicy and zope.app.zcmlfiles.

[Hanno Schlichting]

Log message for revision 106719:
  Reduce zope.app test dependencies by avoiding zope.app.securitypolicy and zope.app.zcmlfiles.
  

Changed:
  U   zope.app.form/trunk/CHANGES.txt
  U   zope.app.form/trunk/setup.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/testconfigure.zcml
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml
  U   zope.app.form/trunk/src/zope/app/form/ftesting.zcml

-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt	2009-12-17 20:31:13 UTC (rev 106718)
+++ zope.app.form/trunk/CHANGES.txt	2009-12-17 22:12:30 UTC (rev 106719)
@@ -5,6 +5,8 @@
 3.11.0 (unreleased)
 ===================
 
+- Reduce zope.app test dependencies by avoiding zope.app.securitypolicy and
+  zope.app.zcmlfiles.
 
 3.10.0 (2009-12-17)
 ===================

Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py	2009-12-17 20:31:13 UTC (rev 106718)
+++ zope.app.form/trunk/setup.py	2009-12-17 22:12:30 UTC (rev 106719)
@@ -67,16 +67,25 @@
       extras_require={'test': [
             'ZODB3',
             'zc.sourcefactory',
+            'zope.browserpage',
+            'zope.browserresource',
+            'zope.container',
+            'zope.principalregistry',
+            'zope.site',
+            'zope.traversing',
+            'zope.app.appsetup',
+            'zope.app.basicskin',
             'zope.app.component',
-            'zope.app.securitypolicy',
+            'zope.app.container',
+            'zope.app.locales',
+            'zope.app.publication',
+            'zope.app.publisher',
             'zope.app.testing',
-            'zope.app.zcmlfiles',
-            'zope.browserpage',
-            'zope.location',
             ]},
       install_requires=[
           "setuptools",
           "transaction",
+          "zope.app.pagetemplate",
           "zope.browser >= 1.1",
           "zope.browsermenu",
           "zope.component",

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/testconfigure.zcml
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/testconfigure.zcml	2009-12-17 20:31:13 UTC (rev 106718)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/testconfigure.zcml	2009-12-17 22:12:30 UTC (rev 106719)
@@ -7,7 +7,7 @@
   <!-- Test view for folders -->
   <browser:pages
       permission="zope.View" 
-      for="zope.app.folder.interfaces.IFolder"
+      for="zope.site.interfaces.IFolder"
       class=".SchemaTestObject.EditFactory">
       <browser:page name="testSchemaFormView.html" attribute="form" />
       <browser:page name="testSchemaFormAction.html" attribute="action" />

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml	2009-12-17 20:31:13 UTC (rev 106718)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/widgetDirectives.zcml	2009-12-17 22:12:30 UTC (rev 106719)
@@ -3,7 +3,6 @@
            i18n_domain="zope">
 
   <include package="zope.app.component" file="meta.zcml" />
-  <include package="zope.app.security" file="meta.zcml" />
   <include package="zope.app.form.browser" file="meta.zcml" />
 
   <zope:view

Modified: zope.app.form/trunk/src/zope/app/form/ftesting.zcml
===================================================================
--- zope.app.form/trunk/src/zope/app/form/ftesting.zcml	2009-12-17 20:31:13 UTC (rev 106718)
+++ zope.app.form/trunk/src/zope/app/form/ftesting.zcml	2009-12-17 22:12:30 UTC (rev 106719)
@@ -1,58 +1,62 @@
 <configure
-   xmlns="http://namespaces.zope.org/zope"
-   i18n_domain="zope"
-   package="zope.app.form"
-   >
+  xmlns="http://namespaces.zope.org/zope"
+  xmlns:browser="http://namespaces.zope.org/browser"
+  xmlns:i18n="http://namespaces.zope.org/i18n"
+  i18n_domain="zope"
+  package="zope.app.form"
+  >
 
-  <!-- This file is the equivalent of site.zcml and it is -->
-  <!-- used for functional testing setup -->
-
+  <include package="zope.browsermenu" file="meta.zcml" />
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.browserresource" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.i18n" file="meta.zcml" />
   <include package="zope.security" file="meta.zcml" />
+  <include package="zope.app.container.browser" file="meta.zcml" />
+  <include package="zope.app.publication" file="meta.zcml" />
 
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.form.browser.tests" file="i18n.zcml" />
+  <include package="zc.sourcefactory" />
+  <include package="zope.browsermenu" />
+  <include package="zope.container" />
+  <include package="zope.i18n" />
+  <include package="zope.principalregistry" />
+  <include package="zope.publisher" />
+  <include package="zope.security" />
+  <include package="zope.site" />
+  <include package="zope.traversing" />
 
-  <include package="zope.securitypolicy" file="meta.zcml" />
-  <include package="zope.app.authentication" />
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.app.appsetup" />
+  <include package="zope.app.basicskin" />
+  <include package="zope.app.publication" />
 
+  <configure package="zope.app.locales">
+    <i18n:registerTranslations directory="." />
+  </configure>
+
   <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+      component="zope.security.simplepolicies.PermissiveSecurityPolicy" />
 
-  <role id="zope.Anonymous" title="Everybody"
-                 description="All users have this role implicitly" />
-  <role id="zope.Manager" title="Site Manager" />
+  <browser:menu
+      id="zmi_actions"
+      title="Views"
+      description="Menu for displaying alternate representations of an object"
+      />
 
-  <!-- Replace the following directive if you don't want public access -->
-  <grant permission="zope.View"
-                  role="zope.Anonymous" />
+  <browser:menu
+      id="zmi_views"
+      title="Views"
+      description="Menu for displaying alternate representations of an object"
+      />
 
-  <grantAll role="zope.Manager" />
+  <browser:containerViews
+      for="zope.site.interfaces.IFolder"
+      contents="zope.ManageContent"
+      index="zope.View"
+      add="zope.ManageContent"
+      />
 
-  <include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
+  <include package="zope.app.form.browser" file="meta.zcml" />
+  <include package="zope.app.form.browser" />
+  <include package="zope.app.form.browser.tests" file="i18n.zcml" />
 
-  <!-- Principals -->
-
-  <unauthenticatedPrincipal
-      id="zope.anybody"
-      title="Unauthenticated User" />
-
-  <!-- Principal that tests generally run as -->
-  <principal
-      id="zope.mgr"
-      title="Manager"
-      login="mgr"
-      password="mgrpw" />
-
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
-      id="zope.globalmgr"
-      title="Manager"
-      login="globalmgr"
-      password="globalmgrpw" />
-
-    <grant role="zope.Manager" principal="zope.globalmgr" />
-
-    <include package="zc.sourcefactory" />
-
 </configure>