[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ - Fixed functional tests to use proper testbrowser.

[Daniel Blackburn]

Log message for revision 82189:
  
  -  Fixed functional tests to use proper testbrowser.
  
  -  Removed principals and roles from ftesting.zcml. all users from tests
     are now provided in the README.txt
  
  -  Removed deprecation warnings in views.py
  
  -  These comments are for the previous commit as well. 
  
  

Changed:
  U   z3c.securitytool/trunk/src/z3c/securitytool/README.txt
  U   z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
  U   z3c.securitytool/trunk/src/z3c/securitytool/ftesting.zcml

-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/README.txt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2007-12-07 16:08:23 UTC (rev 82188)
+++ z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2007-12-07 16:13:51 UTC (rev 82189)
@@ -216,7 +216,6 @@
     <BLANKLINE>
     <BLANKLINE>
 
-
 TODO: Make this a real test.
     >>> manager.open('http://localhost:8080/@@vum.html')
     >>> print manager.contents
@@ -228,7 +227,6 @@
     </html>
     <BLANKLINE>
 
-
 TODO: make this a valid test we are looking for permission
 settings provided in the test appear on the html page.
 

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py	2007-12-07 16:08:23 UTC (rev 82188)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py	2007-12-07 16:13:51 UTC (rev 82189)
@@ -1,5 +1,4 @@
 from zope.publisher.browser import BrowserView
-
 from zope.publisher.interfaces.browser import IBrowserRequest,IBrowserSkinType
 from zope.component import getGlobalSiteManager
 from zope.publisher.interfaces import IRequest
@@ -7,12 +6,12 @@
 import urllib
 
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from z3c.securitytool.securitytool import settingsForObject
 from zope.security.proxy import removeSecurityProxy
 from zope.interface import providedBy
 from zope.session.interfaces import ISession
 from zope.app import zapi
 
+from z3c.securitytool.securitytool import settingsForObject
 from z3c.securitytool.interfaces import ISecurityChecker
 
 SESSION_KEY = 'securitytool'

Modified: z3c.securitytool/trunk/src/z3c/securitytool/ftesting.zcml
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/ftesting.zcml	2007-12-07 16:08:23 UTC (rev 82188)
+++ z3c.securitytool/trunk/src/z3c/securitytool/ftesting.zcml	2007-12-07 16:13:51 UTC (rev 82189)
@@ -4,14 +4,6 @@
       i18n_domain="">
 
   <include package="zope.app.zcmlfiles" />
-
-  <include package="zope.viewlet" file="meta.zcml" />
-
-  <include package="z3c.macro" file="meta.zcml" />
-
-
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
-
   <include package="zope.app.authentication" />
   <include package="zope.app.securitypolicy" />
   <include package="zope.app.session" />
@@ -20,6 +12,11 @@
 
   <include package="z3c.securitytool" file="configure.zcml" />
 
+  <include package="zope.viewlet" file="meta.zcml" />
+  <include package="z3c.macro" file="meta.zcml" />
+  <include package="zope.app.securitypolicy" file="meta.zcml" />
+
+
   <securityPolicy
     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />