Fixed up tests

373be380 · Evan Simpson · bb15b098 · 373be380 · 373be380
Commit 373be380 authored Mar 26, 2001 by Evan Simpson
2 changed files
--- a/lib/python/Products/PageTemplates/tests/output/TeeShop1.html
+++ b/lib/python/Products/PageTemplates/tests/output/TeeShop1.html
 <html metal:use-macro="container/laf/macros/page">
 <head>
 <title>Zope Stuff</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="/common.css">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+<link rel="stylesheet" href="/common.css"/>
 </head>

 <body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
@@ -11,13 +11,13 @@
    <td> 
      <table width="200" border="0" cellspacing="0" cellpadding="0">
        <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>
      </table>
    </td>
  </tr>
 </table>
-<br>
+<br/>
 <table width="300" border="0" cellspacing="0" cellpadding="0" align="center">
  <tr align="center"> 
    <td width="25%" class="boldbodylist">apparel</td>
@@ -26,32 +26,50 @@
    <td width="25%" class="boldbodylist">misc</td>
  </tr>
 </table>
-<br>
-<br>
+<br/>
+<br/>
 <div metal:fill-slot="body">
 <table width="500" border="0" cellspacing="0" cellpadding="0" align="center">
  <tr> 
    <td bgcolor="#0000CC">
      <table width="100%" border="0" cellspacing="1" cellpadding="3">
        <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 bgcolor="#FFFFFF" align="center" valign="top"
-		    tal:repeat="product options/getProducts"> 
+        <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><span tal:replace="product/description">This is the tee for those who LOVE Zope. Show your heart 
-                  on your tee.</span></td>
+                  </b>This is the tee for those who LOVE Zope. Show your heart on your tee.</td>
                <td align="right" width="1%" rowspan="2"> 
-                  <p><img src="/images/smlatee.jpg" width="200" height="200"
-				          tal:attributes="src string:/images/${product/image}"></p>
+                  <p><img src="/images/smlatee.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>:<span tal:replace="product/price">12.99</span></td>
+                <td class="bodylist"><img src="images/clear.gif" width="150" height="10"/></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>
            </table>
          </td>
@@ -60,8 +78,8 @@
          <td>
            <table width="100%" border="0" cellspacing="0" cellpadding="6">
              <tr> 
-                <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/submit.gif" width="87" height="30"/></td>
+                <td align="center"><img src="images/buttons/cancel.gif" width="87" height="30"/></td>
              </tr>
            </table>
          </td>
@@ -71,17 +89,20 @@
  </tr>
 </table>
 </div>
-<p>&nbsp;</p><table width="100%" border="0" cellspacing="1" cellpadding="3" align="center">
-  <tr > 
-    <td align="center" bgcolor="#FFFFFF" class="bodylist"> Copyright  2000 <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>
+<br/><br/>
+<table width="100%" border="0" cellspacing="1" cellpadding="3" align="center">
+  <tr> 
+    <td align="center" bgcolor="#FFFFFF" class="bodylist">
+      Copyright &copy; 2000 
+      <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> 
-    <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>
 </table>
-<p>&nbsp;</p>
 </body>
 </html>
--- a/lib/python/Products/PageTemplates/tests/testHTMLTests.py
+++ b/lib/python/Products/PageTemplates/tests/testHTMLTests.py
@@ -125,19 +125,21 @@ class HTMLTests(unittest.TestCase):
      self.folder.laf.write(open('input/TeeShopLAF.html').read())

      t = self.folder.t
-      t.write(open('input/TeeShop1.html').read())
-      expect = open('output/TeeShop1.html').read()
-      util.check_html(expect, t(getProducts=self.getProducts))      
+      t.write(open('input/TeeShop2.html').read())
+      expect = open('output/TeeShop2.html').read()
+      out = t(getProducts=self.getProducts)
+      util.check_html(expect, out)
      
+
   def check3(self):
      self.folder.laf.write(open('input/TeeShopLAF.html').read())

      t = self.folder.t
-      t.write(open('input/TeeShop2.html').read())
-      expect = open('output/TeeShop2.html').read()
-      util.check_html(expect, t(getProducts=self.getProducts))      
+      t.write(open('input/TeeShop1.html').read())
+      expect = open('output/TeeShop1.html').read()
+      out = t(getProducts=self.getProducts)
+      util.check_html(expect, out)
      
-
 def test_suite():
   return unittest.makeSuite(HTMLTests, 'check')