Skip to content

Z
Zope
Commit 373be380 authored by Evan Simpson's avatar Evan Simpson
Browse files
Options

Fixed up tests

parent bb15b098
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 32 deletions
lib/python/Products/PageTemplates/tests/output/TeeShop1.html
View file @ 373be380
<html metal:use-macro="container/laf/macros/page"> <html metal:use-macro="container/laf/macros/page">
<head> <head>
<title>Zope Stuff</title> <title>Zope Stuff</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<link rel="stylesheet" href="/common.css"> <link rel="stylesheet" href="/common.css"/>
</head> </head>
<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> <body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<td> <td>
<table width="200" border="0" cellspacing="0" cellpadding="0"> <table width="200" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="#FFFFFF"> <tr bgcolor="#FFFFFF">
<td><img src="/images/lside.gif" width="52" height="94"><img src="/images/swlogo.gif" width="150" height="89"><img src="/images/rside.gif" width="52" height="94"></td> <td><img src="/images/lside.gif" width="52" height="94"/><img src="/images/swlogo.gif" width="150" height="89"/><img src="/images/rside.gif" width="52" height="94"/></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br> <br/>
<table width="300" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="300" border="0" cellspacing="0" cellpadding="0" align="center">
<tr align="center"> <tr align="center">
<td width="25%" class="boldbodylist">apparel</td> <td width="25%" class="boldbodylist">apparel</td>
...@@ -26,32 +26,50 @@ ...@@ -26,32 +26,50 @@
<td width="25%" class="boldbodylist">misc</td> <td width="25%" class="boldbodylist">misc</td>
</tr> </tr>
</table> </table>
<br> <br/>
<br> <br/>
<div metal:fill-slot="body"> <div metal:fill-slot="body">
<table width="500" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="500" border="0" cellspacing="0" cellpadding="0" align="center">
<tr> <tr>
<td bgcolor="#0000CC"> <td bgcolor="#0000CC">
<table width="100%" border="0" cellspacing="1" cellpadding="3"> <table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr bgcolor="#FFFFFF" align="center"> <tr bgcolor="#FFFFFF" align="center">
<td><img src="/images/welcome.gif" width="293" height="28"></td> <td><img src="/images/welcome.gif" width="293" height="28"/></td>
</tr> </tr>
<tr bgcolor="#FFFFFF" align="center" valign="top" <tr bgcolor="#FFFFFF" align="center" valign="top" tal:repeat="product options/getProducts">
tal:repeat="product options/getProducts">
<td> <td>
<table width="100%" border="0" cellspacing="0" cellpadding="6"> <table width="100%" border="0" cellspacing="0" cellpadding="6">
<tr> <tr>
<td colspan="2" class="bodylist" height="200" valign="top"><b>Description: <td colspan="2" class="bodylist" height="200" valign="top"><b>Description:
</b><span tal:replace="product/description">This is the tee for those who LOVE Zope. Show your heart </b>This is the tee for those who LOVE Zope. Show your heart on your tee.</td>
on your tee.</span></td>
<td align="right" width="1%" rowspan="2"> <td align="right" width="1%" rowspan="2">
<p><img src="/images/smlatee.jpg" width="200" height="200" <p><img src="/images/smlatee.jpg"
tal:attributes="src string:/images/${product/image}"></p> width="200" height="200"
tal:attributes="src string:/images/${product/image}" /></p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bodylist"><img src="images/clear.gif" width="150" height="10"></td> <td class="bodylist"><img src="images/clear.gif" width="150" height="10"/></td>
<td class="bodylist"><b>Price</b>:<span tal:replace="product/price">12.99</span></td> <td class="bodylist"><b>Price</b>:12.99</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#FFFFFF" align="center" valign="top" tal:repeat="product options/getProducts">
<td>
<table width="100%" border="0" cellspacing="0" cellpadding="6">
<tr>
<td colspan="2" class="bodylist" height="200" valign="top"><b>Description:
</b>This is the tee for Jim Fulton. He's the Zope Pope!</td>
<td align="right" width="1%" rowspan="2">
<p><img src="/images/smpztee.jpg"
width="200" height="200"
tal:attributes="src string:/images/${product/image}" /></p>
</td>
</tr>
<tr>
<td class="bodylist"><img src="images/clear.gif" width="150" height="10"/></td>
<td class="bodylist"><b>Price</b>:11.99</td>
</tr> </tr>
</table> </table>
</td> </td>
...@@ -60,8 +78,8 @@ ...@@ -60,8 +78,8 @@
<td> <td>
<table width="100%" border="0" cellspacing="0" cellpadding="6"> <table width="100%" border="0" cellspacing="0" cellpadding="6">
<tr> <tr>
<td align="center"><img src="images/buttons/submit.gif" width="87" height="30"></td> <td align="center"><img src="images/buttons/submit.gif" width="87" height="30"/></td>
<td align="center"><img src="images/buttons/cancel.gif" width="87" height="30"></td> <td align="center"><img src="images/buttons/cancel.gif" width="87" height="30"/></td>
</tr> </tr>
</table> </table>
</td> </td>
...@@ -71,17 +89,20 @@ ...@@ -71,17 +89,20 @@
</tr> </tr>
</table> </table>
</div> </div>
<p>&nbsp;</p><table width="100%" border="0" cellspacing="1" cellpadding="3" align="center"> <br/><br/>
<tr > <table width="100%" border="0" cellspacing="1" cellpadding="3" align="center">
<td align="center" bgcolor="#FFFFFF" class="bodylist"> Copyright 2000 <a href="http://www.4-am.com">4AM <tr>
Productions, Inc.</a>. All rights reserved. <br> <td align="center" bgcolor="#FFFFFF" class="bodylist">
Questions or problems should be directed to <a href="mailto:webmaster@teamzonline.com"> Copyright &copy; 2000
the webmaster</a>, 254-412-0846. </td> <a href="http://www.4-am.com">4AM Productions, Inc.</a>.
All rights reserved. <br/>
Questions or problems should be directed to
<a href="mailto:webmaster@teamzonline.com">the webmaster</a>,
254-412-0846.</td>
</tr> </tr>
<tr> <tr>
<td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"></td> <td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"/></td>
</tr> </tr>
</table> </table>
<p>&nbsp;</p>
</body> </body>
</html> </html>
lib/python/Products/PageTemplates/tests/testHTMLTests.py
View file @ 373be380
...@@ -125,19 +125,21 @@ class HTMLTests(unittest.TestCase): ...@@ -125,19 +125,21 @@ class HTMLTests(unittest.TestCase):
self.folder.laf.write(open('input/TeeShopLAF.html').read()) self.folder.laf.write(open('input/TeeShopLAF.html').read())
t = self.folder.t t = self.folder.t
t.write(open('input/TeeShop1.html').read()) t.write(open('input/TeeShop2.html').read())
expect = open('output/TeeShop1.html').read() expect = open('output/TeeShop2.html').read()
util.check_html(expect, t(getProducts=self.getProducts)) out = t(getProducts=self.getProducts)
util.check_html(expect, out)
def check3(self): def check3(self):
self.folder.laf.write(open('input/TeeShopLAF.html').read()) self.folder.laf.write(open('input/TeeShopLAF.html').read())
t = self.folder.t t = self.folder.t
t.write(open('input/TeeShop2.html').read()) t.write(open('input/TeeShop1.html').read())
expect = open('output/TeeShop2.html').read() expect = open('output/TeeShop1.html').read()
util.check_html(expect, t(getProducts=self.getProducts)) out = t(getProducts=self.getProducts)
util.check_html(expect, out)
def test_suite(): def test_suite():
return unittest.makeSuite(HTMLTests, 'check') return unittest.makeSuite(HTMLTests, 'check')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7