[Checkins] SVN: z3ext.layout/trunk/ update tests

Nikolay Kim fafhrd at datacom.kz
Sat Nov 22 15:17:26 EST 2008


Log message for revision 93263:
  update tests

Changed:
  U   z3ext.layout/trunk/buildout.cfg
  U   z3ext.layout/trunk/setup.py
  U   z3ext.layout/trunk/src/z3ext/layout/README.txt
  U   z3ext.layout/trunk/src/z3ext/layout/pagelet.txt
  U   z3ext.layout/trunk/src/z3ext/layout/styles.css

-=-
Modified: z3ext.layout/trunk/buildout.cfg
===================================================================
--- z3ext.layout/trunk/buildout.cfg	2008-11-22 20:01:56 UTC (rev 93262)
+++ z3ext.layout/trunk/buildout.cfg	2008-11-22 20:17:26 UTC (rev 93263)
@@ -2,6 +2,9 @@
 develop = .
 parts = test coverage-test coverage-report
 
+[versions]
+z3c.zrtresource = 1.1.0
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = z3ext.layout [test]

Modified: z3ext.layout/trunk/setup.py
===================================================================
--- z3ext.layout/trunk/setup.py	2008-11-22 20:01:56 UTC (rev 93262)
+++ z3ext.layout/trunk/setup.py	2008-11-22 20:17:26 UTC (rev 93263)
@@ -21,7 +21,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version='1.5.8dev'
+version='1.5.8'
 
 
 setup(name='z3ext.layout',

Modified: z3ext.layout/trunk/src/z3ext/layout/README.txt
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/README.txt	2008-11-22 20:01:56 UTC (rev 93262)
+++ z3ext.layout/trunk/src/z3ext/layout/README.txt	2008-11-22 20:17:26 UTC (rev 93263)
@@ -95,10 +95,10 @@
 
   >>> print view()
   <html>
-     <body>
+  <body>
         <div id="portal">
           <div id="workspace">
-          <div id="content">root</div></div></div>
+          <div id="content">root</div>...
      </body>
   </html>
 
@@ -115,7 +115,7 @@
     <body>
       <div id="portal">
         <div id="workspace">
-        <div id="content">folder1</div></div></div>
+        <div id="content">folder1</div>...
     </body>
   </html>
 
@@ -132,7 +132,7 @@
     <body>
       <div id="portal">
         <div id="workspace">
-          <div id="content">folder1_1_1</div></div></div>
+          <div id="content">folder1_1_1</div>...
     </body>
   </html>
 
@@ -174,10 +174,10 @@
           <tr>
             <td id="column1">Column1</td>
             <td id="column2">
-              <div id="content">folder1</div></td>
+              <div id="content">folder1</div>...
             <td id="column3">Column3</td>
           </tr>
-        </table></div>
+        </table>...
     </body>
   </html>
 
@@ -191,10 +191,10 @@
           <tr>
             <td id="column1">Column1</td>
             <td id="column2">
-              <div id="content">folder1_1</div></td>
+              <div id="content">folder1_1</div>...
             <td id="column3">Column3</td>
           </tr>
-        </table></div>
+        </table>...
     </body>
   </html>
 
@@ -207,10 +207,10 @@
           <tr>
             <td id="column1">Column1</td>
             <td id="column2">
-              <div id="content">folder1_1_1</div></td>
+              <div id="content">folder1_1_1</div>...
             <td id="column3">Column3</td>
           </tr>
-        </table></div>
+        </table>...
     </body>
   </html>
 
@@ -247,10 +247,10 @@
                 <div id="content1_1">
                   <h1>Folder1_1</h1>
                   <div>folder1_1</div>
-                </div></div></td>
+                </div>...
             <td id="column3">Column3</td>
           </tr>
-        </table></div>
+        </table>...
      </body>
   </html>
 
@@ -289,11 +289,9 @@
                   <div>
                     <div id="content1_1_1">
                       <h1>Folder1_1_1</h1>
-                      <div>folder1_1_1</div>
-                    </div></div>
-                </div></div></td>
+                      <div>folder1_1_1</div>...
             <td id="column3">Column3</td>
           </tr>
-        </table></div>
+        </table>...
     </body>
   </html>

Modified: z3ext.layout/trunk/src/z3ext/layout/pagelet.txt
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/pagelet.txt	2008-11-22 20:01:56 UTC (rev 93262)
+++ z3ext.layout/trunk/src/z3ext/layout/pagelet.txt	2008-11-22 20:17:26 UTC (rev 93263)
@@ -172,7 +172,6 @@
 
   >>> print pagelet.render()
   <div>My pagelet</div>
-  <BLANKLINE>
 
 We should use page template as template for pagelet or we should
 provide IPageTemplate adapter for pagelet
@@ -194,7 +193,6 @@
 
   >>> print pagelet()
   <div>My pagelet</div>
-  <BLANKLINE>
 
 We can redirect during pagelet rendering, in this case render method
 doesn't call.
@@ -258,15 +256,15 @@
   
   >>> ITestPagelet.providedBy(pagelet)
   True
-  >>> pagelet.render()
-  u'<div>My pagelet</div>'
+  >>> print pagelet.render()
+  <div>My pagelet</div>
 
   >>> request = TestRequest()
   >>> pagelet = component.queryMultiAdapter((object(), request), IMyPagelet2)
   >>> IMyPagelet2.providedBy(pagelet)
   True
-  >>> pagelet.render()
-  u'<div>My pagelet2</div>'
+  >>> print pagelet.render()
+  <div>My pagelet2</div>
 
 
 Access nameless pagelet from view

Modified: z3ext.layout/trunk/src/z3ext/layout/styles.css
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/styles.css	2008-11-22 20:01:56 UTC (rev 93262)
+++ z3ext.layout/trunk/src/z3ext/layout/styles.css	2008-11-22 20:17:26 UTC (rev 93263)
@@ -95,7 +95,7 @@
     float: left;
     padding-top: 8px;
     padding-right: 0.5em;
-    height: 32px;
+    height: 1.5em;
   }
   
   ul.z-listing li a,



More information about the Checkins mailing list