[Checkins] SVN: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/ Reorganize testing, renamed test skin and title in test layout template.

Roger Ineichen roger at projekt01.ch
Sat Dec 29 09:23:23 EST 2007


Log message for revision 82548:
  Reorganize testing, renamed test skin and title in test layout template. 
  Because we need this info in other layer and skin package tests too.

Changed:
  U   z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt
  U   z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py
  U   z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
  U   z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/template.pt

-=-
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt	2007-12-29 11:18:38 UTC (rev 82547)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/README.txt	2007-12-29 14:23:22 UTC (rev 82548)
@@ -52,16 +52,16 @@
 
   >>> manager = Browser()
   >>> manager.addHeader('Authorization', 'Basic mgr:mgrpw')
-  >>> skinURL = 'http://localhost/++skin++TestSkin'
+  >>> skinURL = 'http://localhost/++skin++PageletTestSkin'
   >>> manager.open(skinURL + '/page.html')
   >>> manager.url
-  'http://localhost/++skin++TestSkin/page.html'
+  'http://localhost/++skin++PageletTestSkin/page.html'
 
   >>> print manager.contents
   <!DOCTYPE...
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-  <title>TestSkin</title>
+  <title>PageletTestLayout</title>
   </head>
   <body>
     test page
@@ -82,7 +82,7 @@
   <!DOCTYPE...
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-  <title>TestSkin</title>
+  <title>PageletTestLayout</title>
   </head>
   <body>
     <div>
@@ -120,7 +120,7 @@
   <!DOCTYPE ...
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-  <title>TestSkin</title>
+  <title>PageletTestLayout</title>
   </head>
   <body>
     <div>
@@ -139,7 +139,7 @@
   <!DOCTYPE...
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-  <title>TestSkin</title>
+  <title>PageletTestLayout</title>
   </head>
   <body>
     <div>
@@ -170,7 +170,7 @@
   <!DOCTYPE ...
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-  <title>TestSkin</title>
+  <title>PageletTestLayout</title>
   </head>
   <body>
     <div>

Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py	2007-12-29 11:18:38 UTC (rev 82547)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py	2007-12-29 14:23:22 UTC (rev 82548)
@@ -25,8 +25,8 @@
 import z3c.layer.pagelet
 
 
-class IPageletBrowserTestingSkin(z3c.layer.pagelet.IPageletBrowserLayer):
-    """The pagelet layer testing skin."""
+class IPageletBrowserTestSkin(z3c.layer.pagelet.IPageletBrowserLayer):
+    """The pagelet layer test skin."""
 
 
 class TestPage(browser.BrowserPagelet):
@@ -34,7 +34,7 @@
 
 
 class UnauthorizedPage(BrowserPage):
-    """Unauthorized view."""
+    """Raise Unauthorized."""
 
     def __call__(self):
         raise Unauthorized('not authorized')
@@ -42,7 +42,7 @@
 
 
 class UserErrorPage(BrowserPage):
-    """Unauthorized view."""
+    """Raise UserError."""
 
     def __call__(self):
         raise UserError('simply user error')
@@ -50,7 +50,7 @@
 
 
 class SystemErrorPage(BrowserPage):
-    """Unauthorized view."""
+    """Raise SystemError."""
 
     def __call__(self):
         raise Exception('simply system error')

Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml	2007-12-29 11:18:38 UTC (rev 82547)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml	2007-12-29 14:23:22 UTC (rev 82548)
@@ -42,6 +42,7 @@
   <include package="z3c.pagelet" file="meta.zcml" />
   <include package="z3c.template" file="meta.zcml" />
 
+
   <!-- zope core component -->
   <include package="zope.annotation" />
   <include package="zope.app.appsetup" />
@@ -65,37 +66,18 @@
   <include package="zope.traversing.browser" />
   <include package="zope.viewlet" />
 
-  <!-- security policy -->
-  <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
-      />
 
-  <role id="zope.Manager" title="Manager" />
-  <grantAll role="zope.Manager" />
-  <grantAll role="zope.Anonymous" />
-
-  <principal
-      id="zope.manager"
-      title="Manager"
-      login="Manager"
-      password="password"
-      />
-
-  <grant
-      role="zope.Manager"
-      principal="zope.manager"
-      />
-
   <!-- z3c component -->
   <include package="z3c.pagelet" />
   <include package="z3c.layer.pagelet" />
 
+
   <!-- test skin -->
   <configure package="z3c.layer.pagelet.tests">
     <interface
-        interface="z3c.layer.pagelet.tests.IPageletBrowserTestingSkin"
+        interface="z3c.layer.pagelet.tests.IPageletBrowserTestSkin"
         type="zope.publisher.interfaces.browser.IBrowserSkinType"
-        name="TestSkin"
+        name="PageletTestSkin"
         />
 
     <z3c:layout
@@ -143,4 +125,30 @@
         />
   </configure>
 
+
+  <!-- security policy -->
+  <securityPolicy
+      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+      />
+
+  <role
+      id="zope.Manager"
+      title="Manager"
+      />
+
+  <principal
+      id="zope.manager"
+      title="Manager"
+      login="Manager"
+      password="password"
+      />
+
+  <grant
+      role="zope.Manager"
+      principal="zope.manager"
+      />
+
+  <grantAll role="zope.Manager" />
+  <grantAll role="zope.Anonymous" />
+
 </configure>

Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/template.pt
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/template.pt	2007-12-29 11:18:38 UTC (rev 82547)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/template.pt	2007-12-29 14:23:22 UTC (rev 82548)
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<title>TestSkin</title>
+<title>PageletTestLayout</title>
 </head>
 <body>
   <tal:block replace="structure provider:pagelet" />



More information about the Checkins mailing list