bodewig     2002/09/26 04:16:33

  Modified:    src/etc  Tag: ANT_15_BRANCH junit-frames.xsl
                        junit-noframes.xsl
  Log:
  Merge HTML tidying from CVS HEAD and untabify
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.1  +474 -476  jakarta-ant/src/etc/junit-frames.xsl
  
  Index: junit-frames.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/junit-frames.xsl,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- junit-frames.xsl  15 Mar 2002 05:56:14 -0000      1.10
  +++ junit-frames.xsl  26 Sep 2002 11:16:33 -0000      1.10.2.1
  @@ -1,7 +1,7 @@
  -<xsl:stylesheet      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
  -     xmlns:lxslt="http://xml.apache.org/xslt";
  -     xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
  -     extension-element-prefixes="redirect">
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0"
  +    xmlns:lxslt="http://xml.apache.org/xslt";
  +    xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
  +    extension-element-prefixes="redirect">
   <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
   <xsl:decimal-format decimal-separator="." grouping-separator=","/>
   <!--
  @@ -73,136 +73,136 @@
   
   
   <xsl:template match="testsuites">
  -     <!-- create the index.html -->
  -     <redirect:write file="{$output.dir}/index.html">
  -             <xsl:call-template name="index.html"/>
  -     </redirect:write>
  -
  -     <!-- create the stylesheet.css -->
  -     <redirect:write file="{$output.dir}/stylesheet.css">
  -             <xsl:call-template name="stylesheet.css"/>
  -     </redirect:write>
  -
  -     <!-- create the overview-packages.html at the root -->
  -     <redirect:write file="{$output.dir}/overview-summary.html">
  -             <xsl:apply-templates select="." mode="overview.packages"/>
  -     </redirect:write>
  -
  -     <!-- create the all-packages.html at the root -->
  -     <redirect:write file="{$output.dir}/overview-frame.html">
  -             <xsl:apply-templates select="." mode="all.packages"/>
  -     </redirect:write>
  -     
  -     <!-- create the all-classes.html at the root -->
  -     <redirect:write file="{$output.dir}/allclasses-frame.html">
  -             <xsl:apply-templates select="." mode="all.classes"/>
  -     </redirect:write>
  -     
  -     <!-- process all packages -->
  -     <xsl:for-each select="./testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  -             <xsl:call-template name="package">
  -                     <xsl:with-param name="name" select="@package"/>
  -             </xsl:call-template>
  -     </xsl:for-each>
  +    <!-- create the index.html -->
  +    <redirect:write file="{$output.dir}/index.html">
  +        <xsl:call-template name="index.html"/>
  +    </redirect:write>
  +
  +    <!-- create the stylesheet.css -->
  +    <redirect:write file="{$output.dir}/stylesheet.css">
  +        <xsl:call-template name="stylesheet.css"/>
  +    </redirect:write>
  +
  +    <!-- create the overview-packages.html at the root -->
  +    <redirect:write file="{$output.dir}/overview-summary.html">
  +        <xsl:apply-templates select="." mode="overview.packages"/>
  +    </redirect:write>
  +
  +    <!-- create the all-packages.html at the root -->
  +    <redirect:write file="{$output.dir}/overview-frame.html">
  +        <xsl:apply-templates select="." mode="all.packages"/>
  +    </redirect:write>
  +    
  +    <!-- create the all-classes.html at the root -->
  +    <redirect:write file="{$output.dir}/allclasses-frame.html">
  +        <xsl:apply-templates select="." mode="all.classes"/>
  +    </redirect:write>
  +    
  +    <!-- process all packages -->
  +    <xsl:for-each select="./testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  +        <xsl:call-template name="package">
  +            <xsl:with-param name="name" select="@package"/>
  +        </xsl:call-template>
  +    </xsl:for-each>
   </xsl:template>
   
   
   <xsl:template name="package">
  -     <xsl:param name="name"/>
  -     <xsl:variable name="package.dir">
  -             <xsl:if test="not($name = '')"><xsl:value-of 
select="translate($name,'.','/')"/></xsl:if>
  -             <xsl:if test="$name = ''">.</xsl:if>
  -     </xsl:variable> 
  -     <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of 
select="$output.dir"/> -->
  -     <!-- create a classes-list.html in the package directory -->
  -     <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
  -             <xsl:call-template name="classes.list">
  -                     <xsl:with-param name="name" select="$name"/>
  -             </xsl:call-template>
  -     </redirect:write>
  -     
  -     <!-- create a package-summary.html in the package directory -->
  -     <redirect:write 
file="{$output.dir}/{$package.dir}/package-summary.html">
  -             <xsl:call-template name="package.summary">
  -                     <xsl:with-param name="name" select="$name"/>
  -             </xsl:call-template>
  -     </redirect:write>
  -     
  -     <!-- for each class, creates a @name.html -->
  -     <!-- @bug there will be a problem with inner classes having the same 
name, it will be overwritten -->
  -     <xsl:for-each select="/testsuites/[EMAIL PROTECTED] = $name]">
  -             <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL 
PROTECTED]">
  -                     <xsl:apply-templates select="." mode="class.details"/>
  -             </redirect:write>
  -     </xsl:for-each>
  +    <xsl:param name="name"/>
  +    <xsl:variable name="package.dir">
  +        <xsl:if test="not($name = '')"><xsl:value-of 
select="translate($name,'.','/')"/></xsl:if>
  +        <xsl:if test="$name = ''">.</xsl:if>
  +    </xsl:variable> 
  +    <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of 
select="$output.dir"/> -->
  +    <!-- create a classes-list.html in the package directory -->
  +    <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
  +        <xsl:call-template name="classes.list">
  +            <xsl:with-param name="name" select="$name"/>
  +        </xsl:call-template>
  +    </redirect:write>
  +    
  +    <!-- create a package-summary.html in the package directory -->
  +    <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
  +        <xsl:call-template name="package.summary">
  +            <xsl:with-param name="name" select="$name"/>
  +        </xsl:call-template>
  +    </redirect:write>
  +    
  +    <!-- for each class, creates a @name.html -->
  +    <!-- @bug there will be a problem with inner classes having the same 
name, it will be overwritten -->
  +    <xsl:for-each select="/testsuites/[EMAIL PROTECTED] = $name]">
  +        <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL 
PROTECTED]">
  +            <xsl:apply-templates select="." mode="class.details"/>
  +        </redirect:write>
  +    </xsl:for-each>
   </xsl:template>
   
   <xsl:template name="index.html">
   <html>
  -     <head>
  -             <title>Unit Test Results.</title>
  -     </head>
  -     <frameset cols="20%,80%">
  -             <frameset rows="30%,70%">
  -                     <frame src="overview-frame.html" 
name="packageListFrame"/>
  -                     <frame src="allclasses-frame.html" 
name="classListFrame"/>
  -             </frameset>
  -             <frame src="overview-summary.html" name="classFrame"/>
  -     </frameset>
  -     <noframes>
  -             <h2>Frame Alert</h2>
  -             <p>
  -             This document is designed to be viewed using the frames 
feature. If you see this message, you are using a non-frame-capable web client.
  -             </p>
  -     </noframes>
  +    <head>
  +        <title>Unit Test Results.</title>
  +    </head>
  +    <frameset cols="20%,80%">
  +        <frameset rows="30%,70%">
  +            <frame src="overview-frame.html" name="packageListFrame"/>
  +            <frame src="allclasses-frame.html" name="classListFrame"/>
  +        </frameset>
  +        <frame src="overview-summary.html" name="classFrame"/>
  +        <noframes>
  +            <h2>Frame Alert</h2>
  +            <p>
  +                This document is designed to be viewed using the frames 
feature. If you see this message, you are using a non-frame-capable web client.
  +            </p>
  +        </noframes>
  +    </frameset>
   </html>
   </xsl:template>
   
   <!-- this is the stylesheet css to use for nearly everything -->
   <xsl:template name="stylesheet.css">
   body {
  -     font:normal 68% verdana,arial,helvetica;
  -     color:#000000;
  +    font:normal 68% verdana,arial,helvetica;
  +    color:#000000;
   }
   table tr td, table tr th {
       font-size: 68%;
   }
   table.details tr th{
  -     font-weight: bold;
  -     text-align:left;
  -     background:#a6caf0;
  +    font-weight: bold;
  +    text-align:left;
  +    background:#a6caf0;
   }
   table.details tr td{
  -     background:#eeeee0;
  +    background:#eeeee0;
   }
   
   p {
  -     line-height:1.5em;
  -     margin-top:0.5em; margin-bottom:1.0em;
  +    line-height:1.5em;
  +    margin-top:0.5em; margin-bottom:1.0em;
   }
   h1 {
  -     margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
  +    margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
   }
   h2 {
  -     margin-top: 1em; margin-bottom: 0.5em; font: bold 125% 
verdana,arial,helvetica
  +    margin-top: 1em; margin-bottom: 0.5em; font: bold 125% 
verdana,arial,helvetica
   }
   h3 {
  -     margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
  +    margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
   }
   h4 {
  -     margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
  +    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
   }
   h5 {
  -     margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
  +    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
   }
   h6 {
  -     margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
  +    margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
   }
   .Error {
  -     font-weight:bold; color:red;
  +    font-weight:bold; color:red;
   }
   .Failure {
  -     font-weight:bold; color:purple;
  +    font-weight:bold; color:purple;
   }
   .Properties {
     text-align:right;
  @@ -216,24 +216,26 @@
       testcase methods.
        ====================================================================== 
-->
   <xsl:template match="testsuite" mode="class.details">
  -     <xsl:variable name="package.name" select="@package"/>
  -     <html>
  -             <head>
  -                     <xsl:call-template name="create.stylesheet.link">
  -                             <xsl:with-param name="package.name" 
select="$package.name"/>
  -                     </xsl:call-template>
  -      <script language="JavaScript">
  +    <xsl:variable name="package.name" select="@package"/>
  +    <xsl:variable name="class.name"><xsl:if test="not($package.name = 
'')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of 
select="@name"/></xsl:variable>
  +    <html>
  +        <head>
  +          <title>Unit Test Results: <xsl:value-of 
select="$class.name"/></title>
  +            <xsl:call-template name="create.stylesheet.link">
  +                <xsl:with-param name="package.name" select="$package.name"/>
  +            </xsl:call-template>
  +       <script type="text/javascript" language="JavaScript">
           var TestCases = new Array();
           var cur;
           <xsl:apply-templates select="properties"/>
          </script>
  -       <script language="JavaScript"><![CDATA[
  +       <script type="text/javascript" language="JavaScript"><![CDATA[
           function displayProperties (name) {
             var win = 
window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
             var doc = win.document.open();
             doc.write("<html><head><title>Properties of " + name + "</title>");
  -          doc.write("<style>")
  -          doc.write("body {font:normal 68% verdana,arial,helvetica;  
color:#000000; }");
  +          doc.write("<style type=\"text/css\">");
  +          doc.write("body {font:normal 68% verdana,arial,helvetica; 
color:#000000; }");
             doc.write("table tr td, table tr th { font-size: 68%; }");
             doc.write("table.properties { border-collapse:collapse; 
border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
             doc.write("table.properties th { text-align:left; 
border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; 
background-color:#eeeeee; }");
  @@ -255,41 +257,39 @@
           }
         ]]>  
         </script>
  -             </head>
  -             <body>
  -                     <xsl:call-template name="pageHeader"/>  
  -                     <h3>Class <xsl:if test="not($package.name = 
'')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of 
select="@name"/></h3>
  -
  -                     
  -                     <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  -                             <xsl:call-template 
name="testsuite.test.header"/>
  -                             <xsl:apply-templates select="." 
mode="print.test"/>
  -                     </table>
  -     
  -                     <h2>Tests</h2>
  -                     <p>
  -                     <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  +        </head>
  +        <body>
  +            <xsl:call-template name="pageHeader"/>  
  +            <h3>Class <xsl:value-of select="$class.name"/></h3>
  +
  +            
  +            <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  +                <xsl:call-template name="testsuite.test.header"/>
  +                <xsl:apply-templates select="." mode="print.test"/>
  +            </table>
  +    
  +            <h2>Tests</h2>
  +            <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
           <xsl:call-template name="testcase.test.header"/>
  -                       <!--
  -                       test can even not be started at all (failure to load 
the class)
  -                       so report the error directly
  -                       -->
  -                             <xsl:if test="./error">
  -                                     <tr class="Error">
  -                                             <td 
colspan="4"><xsl:apply-templates select="./error"/></td>
  -                                     </tr>
  -                             </xsl:if>
  -                             <xsl:apply-templates select="./testcase" 
mode="print.test"/>
  -                     </table>
  -                     </p>
  -      <div class="Properties">
  -        <a>
  -          <xsl:attribute 
name="href">javascript:displayProperties('<xsl:value-of 
select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
  -          Properties &#187;
  -        </a>
  -      </div>
  -             </body>
  -     </html>
  +              <!--
  +              test can even not be started at all (failure to load the class)
  +              so report the error directly
  +              -->
  +                <xsl:if test="./error">
  +                    <tr class="Error">
  +                        <td colspan="4"><xsl:apply-templates 
select="./error"/></td>
  +                    </tr>
  +                </xsl:if>
  +                <xsl:apply-templates select="./testcase" mode="print.test"/>
  +            </table>
  +            <div class="Properties">
  +                <a>
  +                    <xsl:attribute 
name="href">javascript:displayProperties('<xsl:value-of 
select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
  +                    Properties &#187;
  +                </a>
  +            </div>
  +        </body>
  +    </html>
   </xsl:template>
   
     <!--
  @@ -298,10 +298,10 @@
      -->
     <xsl:template match="properties">
       cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of 
select="../@name"/>'] = new Array();
  -     <xsl:for-each select="property">
  +    <xsl:for-each select="property">
       <xsl:sort select="@name"/>
           cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template 
name="JS-escape"><xsl:with-param name="string" 
select="@value"/></xsl:call-template>';
  -     </xsl:for-each>
  +    </xsl:for-each>
     </xsl:template>
   
   
  @@ -312,239 +312,237 @@
        ====================================================================== 
-->
   <!-- list of classes in a package -->
   <xsl:template name="classes.list">
  -     <xsl:param name="name"/>
  -     <html>
  -             <head>
  -                     <xsl:call-template name="create.stylesheet.link">
  -                             <xsl:with-param name="package.name" 
select="$name"/>
  -                     </xsl:call-template>
  -             </head>
  -             <body>
  -                     <table width="100%">
  -                             <tr>
  -                                     <td nowrap="nowrap">
  -                                             <h2><a 
href="package-summary.html" target="classFrame"><xsl:value-of 
select="$name"/></a></h2>
  -                                     </td>
  -                             </tr>
  -                     </table>
  -     
  -                     <h2>Classes</h2>
  -                     <p>
  -                     <table width="100%">
  -                             <xsl:for-each 
select="/testsuites/testsuite[./@package = $name]">
  -                                     <xsl:sort select="@name"/>
  -                                     <tr>
  -                                             <td nowrap="nowrap">
  -                                                     <a href="[EMAIL 
PROTECTED]" target="classFrame"><xsl:value-of select="@name"/></a>
  -                                             </td>
  -                                     </tr>
  -                             </xsl:for-each>
  -                     </table>
  -                     </p>
  -             </body>
  -     </html>
  +    <xsl:param name="name"/>
  +    <html>
  +        <head>
  +            <title>Unit Test Classes: <xsl:value-of select="$name"/></title>
  +            <xsl:call-template name="create.stylesheet.link">
  +                <xsl:with-param name="package.name" select="$name"/>
  +            </xsl:call-template>
  +        </head>
  +        <body>
  +            <table width="100%">
  +                <tr>
  +                    <td nowrap="nowrap">
  +                        <h2><a href="package-summary.html" 
target="classFrame"><xsl:value-of select="$name"/></a></h2>
  +                    </td>
  +                </tr>
  +            </table>
  +    
  +            <h2>Classes</h2>
  +            <table width="100%">
  +                <xsl:for-each select="/testsuites/testsuite[./@package = 
$name]">
  +                    <xsl:sort select="@name"/>
  +                    <tr>
  +                        <td nowrap="nowrap">
  +                            <a href="[EMAIL PROTECTED]" 
target="classFrame"><xsl:value-of select="@name"/></a>
  +                        </td>
  +                    </tr>
  +                </xsl:for-each>
  +            </table>
  +        </body>
  +    </html>
   </xsl:template>
   
   
   <!--
  -     Creates an all-classes.html file that contains a link to all 
package-summary.html
  -     on each class.
  +    Creates an all-classes.html file that contains a link to all 
package-summary.html
  +    on each class.
   -->
   <xsl:template match="testsuites" mode="all.classes">
  -     <html>
  -             <head>
  -                     <xsl:call-template name="create.stylesheet.link">
  -                             <xsl:with-param name="package.name"/>
  -                     </xsl:call-template>
  -             </head>
  -             <body>
  -                     <h2>Classes</h2>
  -                     <p>
  -                     <table width="100%">
  -                             <xsl:apply-templates select="testsuite" 
mode="all.classes">
  -                                     <xsl:sort select="@name"/>
  -                             </xsl:apply-templates>
  -                     </table>
  -                     </p>
  -             </body>
  -     </html>
  +    <html>
  +        <head>
  +            <title>All Unit Test Classes</title>
  +            <xsl:call-template name="create.stylesheet.link">
  +                <xsl:with-param name="package.name"/>
  +            </xsl:call-template>
  +        </head>
  +        <body>
  +            <h2>Classes</h2>
  +            <table width="100%">
  +                <xsl:apply-templates select="testsuite" mode="all.classes">
  +                    <xsl:sort select="@name"/>
  +                </xsl:apply-templates>
  +            </table>
  +        </body>
  +    </html>
   </xsl:template>
   
   <xsl:template match="testsuite" mode="all.classes">
  -     <xsl:variable name="package.name" select="@package"/>
  -     <tr>
  -             <td nowrap="nowrap">
  -                     <a target="classFrame">
  -                             <xsl:attribute name="href">
  -                                     <xsl:if test="not($package.name='')">
  -                                             <xsl:value-of 
select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
  -                                     </xsl:if><xsl:value-of 
select="@name"/><xsl:text>.html</xsl:text>
  -                             </xsl:attribute>
  -                             <xsl:value-of select="@name"/>
  -                     </a>
  -             </td>
  -     </tr>
  +    <xsl:variable name="package.name" select="@package"/>
  +    <tr>
  +        <td nowrap="nowrap">
  +            <a target="classFrame">
  +                <xsl:attribute name="href">
  +                    <xsl:if test="not($package.name='')">
  +                        <xsl:value-of 
select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
  +                    </xsl:if><xsl:value-of 
select="@name"/><xsl:text>.html</xsl:text>
  +                </xsl:attribute>
  +                <xsl:value-of select="@name"/>
  +            </a>
  +        </td>
  +    </tr>
   </xsl:template>
   
   
   <!--
  -     Creates an html file that contains a link to all package-summary.html 
files on
  -     each package existing on testsuites.
  -     @bug there will be a problem here, I don't know yet how to handle 
unnamed package :(
  +    Creates an html file that contains a link to all package-summary.html 
files on
  +    each package existing on testsuites.
  +    @bug there will be a problem here, I don't know yet how to handle 
unnamed package :(
   -->
   <xsl:template match="testsuites" mode="all.packages">
  -     <html>
  -             <head>
  -                     <xsl:call-template name="create.stylesheet.link">
  -                             <xsl:with-param name="package.name"/>
  -                     </xsl:call-template>
  -             </head>
  -             <body>
  -                     <h2><a href="overview-summary.html" 
target="classFrame">Home</a></h2>
  -                     <h2>Packages</h2>
  -                     <p>
  -                             <table width="100%">
  -                                     <xsl:apply-templates 
select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" 
mode="all.packages">
  -                                             <xsl:sort select="@package"/>
  -                                     </xsl:apply-templates>
  -                             </table>
  -                     </p>
  -             </body>
  -     </html>
  +    <html>
  +        <head>
  +            <title>All Unit Test Packages</title>
  +            <xsl:call-template name="create.stylesheet.link">
  +                <xsl:with-param name="package.name"/>
  +            </xsl:call-template>
  +        </head>
  +        <body>
  +            <h2><a href="overview-summary.html" 
target="classFrame">Home</a></h2>
  +            <h2>Packages</h2>
  +            <table width="100%">
  +                <xsl:apply-templates select="testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]" mode="all.packages">
  +                    <xsl:sort select="@package"/>
  +                </xsl:apply-templates>
  +            </table>
  +        </body>
  +    </html>
   </xsl:template>
   
   <xsl:template match="testsuite" mode="all.packages">
  -     <tr>
  -             <td nowrap="nowrap">
  -                     <a 
href="{translate(@package,'.','/')}/package-summary.html" target="classFrame">
  -                             <xsl:value-of select="@package"/>
  -                     </a>
  -             </td>
  -     </tr>
  +    <tr>
  +        <td nowrap="nowrap">
  +            <a href="{translate(@package,'.','/')}/package-summary.html" 
target="classFrame">
  +                <xsl:value-of select="@package"/>
  +            </a>
  +        </td>
  +    </tr>
   </xsl:template>
   
   
   <xsl:template match="testsuites" mode="overview.packages">
  -     <html>
  -             <head>
  -                     <xsl:call-template name="create.stylesheet.link">
  -                             <xsl:with-param name="package.name"/>
  -                     </xsl:call-template>
  -             </head>
  -             <body>
  -             <xsl:attribute 
name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
  -             <xsl:call-template name="pageHeader"/>
  -             <h2>Summary</h2>
  -             <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
  -             <xsl:variable name="errorCount" 
select="sum(testsuite/@errors)"/>
  -             <xsl:variable name="failureCount" 
select="sum(testsuite/@failures)"/>
  -             <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
  -             <xsl:variable name="successRate" select="($testCount - 
$failureCount - $errorCount) div $testCount"/>
  -             <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  -             <tr valign="top">
  -                     <th>Tests</th>
  -                     <th>Failures</th>
  -                     <th>Errors</th>
  -                     <th>Success rate</th>
  -                     <th>Time</th>
  -             </tr>
  -             <tr valign="top">
  -                     <xsl:attribute name="class">
  -                             <xsl:choose>
  -                                     <xsl:when test="$errorCount &gt; 
0">Error</xsl:when>
  -                                     <xsl:when test="$failureCount &gt; 
0">Failure</xsl:when>
  -                                     <xsl:otherwise>Pass</xsl:otherwise>
  -                             </xsl:choose>
  -                     </xsl:attribute>
  -                     <td><xsl:value-of select="$testCount"/></td>
  -                     <td><xsl:value-of select="$failureCount"/></td>
  -                     <td><xsl:value-of select="$errorCount"/></td>
  -                     <td>
  -                             <xsl:call-template name="display-percent">
  -                                     <xsl:with-param name="value" 
select="$successRate"/>
  -                             </xsl:call-template>
  -                     </td>
  -                     <td>
  -                             <xsl:call-template name="display-time">
  -                                     <xsl:with-param name="value" 
select="$timeCount"/>
  -                             </xsl:call-template>
  -                     </td>
  -
  -             </tr>
  -             </table>
  -             <table border="0" width="95%">
  -             <tr>
  -             <td     style="text-align: justify;">
  -             Note: <em>failures</em> are anticipated and checked for with 
assertions while <em>errors</em> are unanticipated.
  -             </td>
  -             </tr>
  -             </table>
  -             
  -             <h2>Packages</h2>
  -             <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  -                     <xsl:call-template name="testsuite.test.header"/>
  -                     <xsl:for-each select="testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  -                             <xsl:sort select="@package" order="ascending"/>
  -                             <!-- get the node set containing all testsuites 
that have the same package -->
  -                             <xsl:variable name="insamepackage" 
select="/testsuites/testsuite[./@package = current()/@package]"/>
  -                             <tr valign="top">
  -                                     <!-- display a failure if there is any 
failure/error in the package -->
  -                                     <xsl:attribute name="class">
  -                                             <xsl:choose>
  -                                                     <xsl:when 
test="sum($insamepackage/@errors) &gt; 0">Error</xsl:when>
  -                                                     <xsl:when 
test="sum($insamepackage/@failures) &gt; 0">Failure</xsl:when>
  -                                                     
<xsl:otherwise>Pass</xsl:otherwise>
  -                                             </xsl:choose>
  -                                     </xsl:attribute>
  -                                     <td><a 
href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of 
select="@package"/></a></td>
  -                                     <td><xsl:value-of 
select="sum($insamepackage/@tests)"/></td>
  -                                     <td><xsl:value-of 
select="sum($insamepackage/@errors)"/></td>
  -                                     <td><xsl:value-of 
select="sum($insamepackage/@failures)"/></td>
  -                                     <td>
  -                                     <xsl:call-template name="display-time">
  -                                             <xsl:with-param name="value" 
select="sum($insamepackage/@time)"/>
  -                                     </xsl:call-template>
  -                                     </td>
  -                             </tr>
  -                     </xsl:for-each>
  -             </table>
  -             </body>
  -             </html>
  +    <html>
  +        <head>
  +            <title>Unit Test Results: Summary</title>
  +            <xsl:call-template name="create.stylesheet.link">
  +                <xsl:with-param name="package.name"/>
  +            </xsl:call-template>
  +        </head>
  +        <body>
  +        <xsl:attribute 
name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
  +        <xsl:call-template name="pageHeader"/>
  +        <h2>Summary</h2>
  +        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
  +        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
  +        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
  +        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
  +        <xsl:variable name="successRate" select="($testCount - $failureCount 
- $errorCount) div $testCount"/>
  +        <table class="details" border="0" cellpadding="5" cellspacing="2" 
width="95%">
  +        <tr valign="top">
  +            <th>Tests</th>
  +            <th>Failures</th>
  +            <th>Errors</th>
  +            <th>Success rate</th>
  +            <th>Time</th>
  +        </tr>
  +        <tr valign="top">
  +            <xsl:attribute name="class">
  +                <xsl:choose>
  +                    <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
  +                    <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
  +                    <xsl:otherwise>Pass</xsl:otherwise>
  +                </xsl:choose>
  +            </xsl:attribute>
  +            <td><xsl:value-of select="$testCount"/></td>
  +            <td><xsl:value-of select="$failureCount"/></td>
  +            <td><xsl:value-of select="$errorCount"/></td>
  +            <td>
  +                <xsl:call-template name="display-percent">
  +                    <xsl:with-param name="value" select="$successRate"/>
  +                </xsl:call-template>
  +            </td>
  +            <td>
  +                <xsl:call-template name="display-time">
  +                    <xsl:with-param name="value" select="$timeCount"/>
  +                </xsl:call-template>
  +            </td>
  +
  +        </tr>
  +        </table>
  +        <table border="0" width="95%">
  +        <tr>
  +        <td style="text-align: justify;">
  +        Note: <em>failures</em> are anticipated and checked for with 
assertions while <em>errors</em> are unanticipated.
  +        </td>
  +        </tr>
  +        </table>
  +        
  +        <h2>Packages</h2>
  +        <table class="details" border="0" cellpadding="5" cellspacing="2" 
width="95%">
  +            <xsl:call-template name="testsuite.test.header"/>
  +            <xsl:for-each select="testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  +                <xsl:sort select="@package" order="ascending"/>
  +                <!-- get the node set containing all testsuites that have 
the same package -->
  +                <xsl:variable name="insamepackage" 
select="/testsuites/testsuite[./@package = current()/@package]"/>
  +                <tr valign="top">
  +                    <!-- display a failure if there is any failure/error in 
the package -->
  +                    <xsl:attribute name="class">
  +                        <xsl:choose>
  +                            <xsl:when test="sum($insamepackage/@errors) &gt; 
0">Error</xsl:when>
  +                            <xsl:when test="sum($insamepackage/@failures) 
&gt; 0">Failure</xsl:when>
  +                            <xsl:otherwise>Pass</xsl:otherwise>
  +                        </xsl:choose>
  +                    </xsl:attribute>
  +                    <td><a 
href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of 
select="@package"/></a></td>
  +                    <td><xsl:value-of 
select="sum($insamepackage/@tests)"/></td>
  +                    <td><xsl:value-of 
select="sum($insamepackage/@errors)"/></td>
  +                    <td><xsl:value-of 
select="sum($insamepackage/@failures)"/></td>
  +                    <td>
  +                    <xsl:call-template name="display-time">
  +                        <xsl:with-param name="value" 
select="sum($insamepackage/@time)"/>
  +                    </xsl:call-template>
  +                    </td>
  +                </tr>
  +            </xsl:for-each>
  +        </table>
  +        </body>
  +        </html>
   </xsl:template>
   
   
   <xsl:template name="package.summary">
  -     <xsl:param name="name"/>
  -     <html>
  -             <head>
  -                     <xsl:call-template name="create.stylesheet.link">
  -                             <xsl:with-param name="package.name" 
select="$name"/>
  -                     </xsl:call-template>
  -             </head>
  -             <body>
  -                     <xsl:attribute 
name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
  -                     <xsl:call-template name="pageHeader"/>
  -                     <h3>Package <xsl:value-of select="$name"/></h3>
  -                     
  -                     <!--table border="0" cellpadding="5" cellspacing="2" 
width="95%">
  -                             <xsl:call-template name="class.metrics.header"/>
  -                             <xsl:apply-templates select="." 
mode="print.metrics"/>
  -                     </table-->
  -                     
  -                     <xsl:variable name="insamepackage" 
select="/testsuites/testsuite[./@package = $name]"/>
  -                     <xsl:if test="count($insamepackage) &gt; 0">
  -                             <h2>Classes</h2>
  -                             <p>
  -                             <table class="details" border="0" 
cellpadding="5" cellspacing="2" width="95%">
  -                                     <xsl:call-template 
name="testsuite.test.header"/>
  -                                     <xsl:apply-templates 
select="$insamepackage" mode="print.test">
  -                                             <xsl:sort select="@name"/>
  -                                     </xsl:apply-templates>
  -                             </table>
  -                             </p>
  -                     </xsl:if>
  -             </body>
  -     </html>
  +    <xsl:param name="name"/>
  +    <html>
  +        <head>
  +            <xsl:call-template name="create.stylesheet.link">
  +                <xsl:with-param name="package.name" select="$name"/>
  +            </xsl:call-template>
  +        </head>
  +        <body>
  +            <xsl:attribute 
name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
  +            <xsl:call-template name="pageHeader"/>
  +            <h3>Package <xsl:value-of select="$name"/></h3>
  +            
  +            <!--table border="0" cellpadding="5" cellspacing="2" width="95%">
  +                <xsl:call-template name="class.metrics.header"/>
  +                <xsl:apply-templates select="." mode="print.metrics"/>
  +            </table-->
  +            
  +            <xsl:variable name="insamepackage" 
select="/testsuites/testsuite[./@package = $name]"/>
  +            <xsl:if test="count($insamepackage) &gt; 0">
  +                <h2>Classes</h2>
  +                <p>
  +                <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  +                    <xsl:call-template name="testsuite.test.header"/>
  +                    <xsl:apply-templates select="$insamepackage" 
mode="print.test">
  +                        <xsl:sort select="@name"/>
  +                    </xsl:apply-templates>
  +                </table>
  +                </p>
  +            </xsl:if>
  +        </body>
  +    </html>
   </xsl:template>
   
   
  @@ -553,110 +551,110 @@
       @param path the path to transform into a descending directory path
   -->
   <xsl:template name="path">
  -     <xsl:param name="path"/>
  -     <xsl:if test="contains($path,'.')">
  -             <xsl:text>../</xsl:text>        
  -             <xsl:call-template name="path">
  -                     <xsl:with-param name="path"><xsl:value-of 
select="substring-after($path,'.')"/></xsl:with-param>
  -             </xsl:call-template>    
  -     </xsl:if>
  -     <xsl:if test="not(contains($path,'.')) and not($path = '')">
  -             <xsl:text>../</xsl:text>        
  -     </xsl:if>
  +    <xsl:param name="path"/>
  +    <xsl:if test="contains($path,'.')">
  +        <xsl:text>../</xsl:text>    
  +        <xsl:call-template name="path">
  +            <xsl:with-param name="path"><xsl:value-of 
select="substring-after($path,'.')"/></xsl:with-param>
  +        </xsl:call-template>    
  +    </xsl:if>
  +    <xsl:if test="not(contains($path,'.')) and not($path = '')">
  +        <xsl:text>../</xsl:text>    
  +    </xsl:if>
   </xsl:template>
   
   
   <!-- create the link to the stylesheet based on the package name -->
   <xsl:template name="create.stylesheet.link">
  -     <xsl:param name="package.name"/>
  -     <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute 
name="href"><xsl:if test="not($package.name = 'unnamed 
package')"><xsl:call-template name="path"><xsl:with-param name="path" 
select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
  +    <xsl:param name="package.name"/>
  +    <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute 
name="href"><xsl:if test="not($package.name = 'unnamed 
package')"><xsl:call-template name="path"><xsl:with-param name="path" 
select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
   </xsl:template>
   
   
   <!-- Page HEADER -->
   <xsl:template name="pageHeader">
  -     <h1>Unit Test Results</h1>
  -     <table width="100%">
  -     <tr>
  -             <td align="left"></td>
  -             <td align="right">Designed for use with <a 
href='http://www.junit.org'>JUnit</a> and <a 
href='http://jakarta.apache.org'>Ant</a>.</td>
  -     </tr>
  -     </table>
  -     <hr size="1"/>
  +    <h1>Unit Test Results</h1>
  +    <table width="100%">
  +    <tr>
  +        <td align="left"></td>
  +        <td align="right">Designed for use with <a 
href="http://www.junit.org/";>JUnit</a> and <a 
href="http://jakarta.apache.org/";>Ant</a>.</td>
  +    </tr>
  +    </table>
  +    <hr size="1"/>
   </xsl:template>
   
   <!-- class header -->
   <xsl:template name="testsuite.test.header">
  -     <tr valign="top">
  -             <th width="80%">Name</th>
  -             <th>Tests</th>
  -             <th>Errors</th>
  -             <th>Failures</th>
  -             <th nowrap="nowrap">Time(s)</th>
  -     </tr>
  +    <tr valign="top">
  +        <th width="80%">Name</th>
  +        <th>Tests</th>
  +        <th>Errors</th>
  +        <th>Failures</th>
  +        <th nowrap="nowrap">Time(s)</th>
  +    </tr>
   </xsl:template>
   
   <!-- method header -->
   <xsl:template name="testcase.test.header">
  -     <tr valign="top">
  -             <th>Name</th>
  -             <th>Status</th>
  -             <th width="80%">Type</th>
  -             <th nowrap="nowrap">Time(s)</th>
  -     </tr>
  +    <tr valign="top">
  +        <th>Name</th>
  +        <th>Status</th>
  +        <th width="80%">Type</th>
  +        <th nowrap="nowrap">Time(s)</th>
  +    </tr>
   </xsl:template>
   
   
   <!-- class information -->
   <xsl:template match="testsuite" mode="print.test">
  -     <tr valign="top">               
  -             <xsl:attribute name="class">
  -                     <xsl:choose>
  -                             <xsl:when test="@errors[.&gt; 
0]">Error</xsl:when>
  -                             <xsl:when test="@failures[.&gt; 
0]">Failure</xsl:when>
  -                             <xsl:otherwise>Pass</xsl:otherwise>
  -                     </xsl:choose>
  -             </xsl:attribute>
  -             <td><a href="[EMAIL PROTECTED]"><xsl:value-of 
select="@name"/></a></td>
  -             <td><xsl:apply-templates select="@tests"/></td>
  -             <td><xsl:apply-templates select="@errors"/></td>
  -             <td><xsl:apply-templates select="@failures"/></td>
  -             <td><xsl:call-template name="display-time">
  -                             <xsl:with-param name="value" select="@time"/>
  -                     </xsl:call-template>
  +    <tr valign="top">       
  +        <xsl:attribute name="class">
  +            <xsl:choose>
  +                <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
  +                <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
  +                <xsl:otherwise>Pass</xsl:otherwise>
  +            </xsl:choose>
  +        </xsl:attribute>
  +        <td><a href="[EMAIL PROTECTED]"><xsl:value-of 
select="@name"/></a></td>
  +        <td><xsl:apply-templates select="@tests"/></td>
  +        <td><xsl:apply-templates select="@errors"/></td>
  +        <td><xsl:apply-templates select="@failures"/></td>
  +        <td><xsl:call-template name="display-time">
  +                <xsl:with-param name="value" select="@time"/>
  +            </xsl:call-template>
           </td>
  -     </tr>
  +    </tr>
   </xsl:template>
   
   <xsl:template match="testcase" mode="print.test">
  -     <tr valign="top">
  -         <xsl:attribute name="class">
  -                     <xsl:choose>
  -                             <xsl:when test="error">Error</xsl:when>
  -                             <xsl:when test="failure">Failure</xsl:when>
  -                             <xsl:otherwise>TableRowColor</xsl:otherwise>
  -                     </xsl:choose>
  -             </xsl:attribute>
  -             <td><xsl:value-of select="@name"/></td>
  -             <xsl:choose>
  -                     <xsl:when test="failure">
  -                             <td>Failure</td>
  -                             <td><xsl:apply-templates select="failure"/></td>
  -                     </xsl:when>
  -                     <xsl:when test="error">
  -                             <td>Error</td>
  -                             <td><xsl:apply-templates select="error"/></td>
  -                     </xsl:when>
  -                     <xsl:otherwise>
  -                             <td>Success</td>
  -                             <td></td>
  -                     </xsl:otherwise>
  -             </xsl:choose>
  -             <td>
  -                 <xsl:call-template name="display-time">
  +    <tr valign="top">
  +        <xsl:attribute name="class">
  +            <xsl:choose>
  +                <xsl:when test="error">Error</xsl:when>
  +                <xsl:when test="failure">Failure</xsl:when>
  +                <xsl:otherwise>TableRowColor</xsl:otherwise>
  +            </xsl:choose>
  +        </xsl:attribute>
  +        <td><xsl:value-of select="@name"/></td>
  +        <xsl:choose>
  +            <xsl:when test="failure">
  +                <td>Failure</td>
  +                <td><xsl:apply-templates select="failure"/></td>
  +            </xsl:when>
  +            <xsl:when test="error">
  +                <td>Error</td>
  +                <td><xsl:apply-templates select="error"/></td>
  +            </xsl:when>
  +            <xsl:otherwise>
  +                <td>Success</td>
  +                <td></td>
  +            </xsl:otherwise>
  +        </xsl:choose>
  +        <td>
  +            <xsl:call-template name="display-time">
                   <xsl:with-param name="value" select="@time"/>
  -                 </xsl:call-template>
  -             </td>
  +            </xsl:call-template>
  +        </td>
       </tr>
   </xsl:template>
   
  @@ -664,80 +662,80 @@
   <!-- Note : the below template error and failure are the same style
               so just call the same style store in the toolkit template -->
   <xsl:template match="failure">
  -     <xsl:call-template name="display-failures"/>
  +    <xsl:call-template name="display-failures"/>
   </xsl:template>
   
   <xsl:template match="error">
  -     <xsl:call-template name="display-failures"/>
  +    <xsl:call-template name="display-failures"/>
   </xsl:template>
   
   <!-- Style for the error and failure in the testcase template -->
   <xsl:template name="display-failures">
  -     <xsl:choose>
  -             <xsl:when test="not(@message)">N/A</xsl:when>
  -             <xsl:otherwise>
  -                     <xsl:value-of select="@message"/>
  -             </xsl:otherwise>
  -     </xsl:choose>
  -     <!-- display the stacktrace -->
  -     <code>
  -             <p/>
  -             <xsl:call-template name="br-replace">
  -                     <xsl:with-param name="word" select="."/>
  -             </xsl:call-template>
  -     </code>
  -     <!-- the latter is better but might be problematic for non-21" 
monitors... -->
  -     <!--pre><xsl:value-of select="."/></pre-->
  +    <xsl:choose>
  +        <xsl:when test="not(@message)">N/A</xsl:when>
  +        <xsl:otherwise>
  +            <xsl:value-of select="@message"/>
  +        </xsl:otherwise>
  +    </xsl:choose>
  +    <!-- display the stacktrace -->
  +    <br/><br/>
  +    <code>
  +        <xsl:call-template name="br-replace">
  +            <xsl:with-param name="word" select="."/>
  +        </xsl:call-template>
  +    </code>
  +    <!-- the latter is better but might be problematic for non-21" 
monitors... -->
  +    <!--pre><xsl:value-of select="."/></pre-->
   </xsl:template>
   
   <xsl:template name="JS-escape">
  -     <xsl:param name="string"/>
  -     <xsl:choose>
  -             <xsl:when test="contains($string,&quot;'&quot;)">
  -                     <xsl:value-of 
select="substring-before($string,&quot;'&quot;)"/>\&apos;<xsl:call-template 
name="JS-escape">
  -                             <xsl:with-param name="string" 
select="substring-after($string,&quot;'&quot;)"/>
  -                     </xsl:call-template>
  -             </xsl:when> 
  -             <xsl:when test="contains($string,'\')">
  -                     <xsl:value-of 
select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
  -                             <xsl:with-param name="string" 
select="substring-after($string,'\')"/>
  -                     </xsl:call-template>
  -             </xsl:when>
  -             <xsl:otherwise>
  -                     <xsl:value-of select="$string"/>
  -             </xsl:otherwise>
  -     </xsl:choose>
  +    <xsl:param name="string"/>
  +    <xsl:choose>
  +        <xsl:when test="contains($string,&quot;'&quot;)">
  +            <xsl:value-of 
select="substring-before($string,&quot;'&quot;)"/>\&apos;<xsl:call-template 
name="JS-escape">
  +                <xsl:with-param name="string" 
select="substring-after($string,&quot;'&quot;)"/>
  +            </xsl:call-template>
  +        </xsl:when> 
  +        <xsl:when test="contains($string,'\')">
  +            <xsl:value-of 
select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
  +                <xsl:with-param name="string" 
select="substring-after($string,'\')"/>
  +            </xsl:call-template>
  +        </xsl:when>
  +        <xsl:otherwise>
  +            <xsl:value-of select="$string"/>
  +        </xsl:otherwise>
  +    </xsl:choose>
   </xsl:template>
   
   
   <!--
  -     template that will convert a carriage return into a br tag
  -     @param word the text from which to convert CR to BR tag
  +    template that will convert a carriage return into a br tag
  +    @param word the text from which to convert CR to BR tag
   -->
   <xsl:template name="br-replace">
  -     <xsl:param name="word"/>
  -     <xsl:choose>
  -             <xsl:when test="contains($word,'&#xA;')">
  -                     <xsl:value-of select="substring-before($word,'&#xA;')"/>
  -                     <br/>
  -                     <xsl:call-template name="br-replace">
  -                             <xsl:with-param name="word" 
select="substring-after($word,'&#xA;')"/>
  -                     </xsl:call-template>
  -             </xsl:when>
  -             <xsl:otherwise>
  -                     <xsl:value-of select="$word"/>
  -             </xsl:otherwise>
  -     </xsl:choose>
  +    <xsl:param name="word"/>
  +    <xsl:choose>
  +        <xsl:when test="contains($word,'&#xA;')">
  +            <xsl:value-of select="substring-before($word,'&#xA;')"/>
  +            <br/>
  +            <xsl:call-template name="br-replace">
  +                <xsl:with-param name="word" 
select="substring-after($word,'&#xA;')"/>
  +            </xsl:call-template>
  +        </xsl:when>
  +        <xsl:otherwise>
  +            <xsl:value-of select="$word"/>
  +        </xsl:otherwise>
  +    </xsl:choose>
   </xsl:template>
   
   <xsl:template name="display-time">
  -     <xsl:param name="value"/>
  -     <xsl:value-of select="format-number($value,'0.000')"/>
  +    <xsl:param name="value"/>
  +    <xsl:value-of select="format-number($value,'0.000')"/>
   </xsl:template>
   
   <xsl:template name="display-percent">
  -     <xsl:param name="value"/>
  -     <xsl:value-of select="format-number($value,'0.00%')"/>
  +    <xsl:param name="value"/>
  +    <xsl:value-of select="format-number($value,'0.00%')"/>
   </xsl:template>
   </xsl:stylesheet>
  -     
  +
  
  
  
  1.7.2.1   +324 -322  jakarta-ant/src/etc/junit-noframes.xsl
  
  Index: junit-noframes.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/junit-noframes.xsl,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- junit-noframes.xsl        15 Mar 2002 05:56:14 -0000      1.7
  +++ junit-noframes.xsl        26 Sep 2002 11:16:33 -0000      1.7.2.1
  @@ -1,5 +1,6 @@
  -<xsl:stylesheet      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0">
  -<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
version="1.0">
  +<xsl:output method="html" indent="yes" encoding="US-ASCII"
  +  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
   <xsl:decimal-format decimal-separator="." grouping-separator="," />
   <!--
    The Apache Software License, Version 1.1
  @@ -67,58 +68,59 @@
    
   -->
   <xsl:template match="testsuites">
  -     <HTML>
  -             <HEAD>
  +    <html>
  +        <head>
  +            <title>Unit Test Results</title>
       <style type="text/css">
         body {
  -             font:normal 68% verdana,arial,helvetica;
  -             color:#000000;
  +        font:normal 68% verdana,arial,helvetica;
  +        color:#000000;
         }
         table tr td, table tr th {
             font-size: 68%;
         }
         table.details tr th{
  -             font-weight: bold;
  -             text-align:left;
  -             background:#a6caf0;
  +        font-weight: bold;
  +        text-align:left;
  +        background:#a6caf0;
         }
         table.details tr td{
  -             background:#eeeee0;
  +        background:#eeeee0;
         }
         
         p {
  -             line-height:1.5em;
  -             margin-top:0.5em; margin-bottom:1.0em;
  +        line-height:1.5em;
  +        margin-top:0.5em; margin-bottom:1.0em;
         }
         h1 {
  -             margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
  +        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
         }
         h2 {
  -             margin-top: 1em; margin-bottom: 0.5em; font: bold 125% 
verdana,arial,helvetica
  +        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% 
verdana,arial,helvetica
         }
         h3 {
  -             margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
  +        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
         }
         h4 {
  -             margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
  +        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
         }
         h5 {
  -             margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
  +        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
         }
         h6 {
  -             margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
  +        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
         }
         .Error {
  -             font-weight:bold; color:red;
  +        font-weight:bold; color:red;
         }
         .Failure {
  -             font-weight:bold; color:purple;
  +        font-weight:bold; color:purple;
         }
         .Properties {
  -             text-align:right;
  +        text-align:right;
         }
         </style>
  -      <script language="JavaScript">
  +      <script type="text/javascript" language="JavaScript">
           var TestCases = new Array();
           var cur;
           <xsl:for-each select="./testsuite">      
  @@ -126,13 +128,13 @@
           </xsl:for-each>
   
          </script>
  -       <script language="JavaScript"><![CDATA[
  +       <script type="text/javascript" language="JavaScript"><![CDATA[
           function displayProperties (name) {
             var win = 
window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
             var doc = win.document.open();
             doc.write("<html><head><title>Properties of " + name + "</title>");
             doc.write("<style>")
  -          doc.write("body {font:normal 68% verdana,arial,helvetica;  
color:#000000; }");
  +          doc.write("body {font:normal 68% verdana,arial,helvetica; 
color:#000000; }");
             doc.write("table tr td, table tr th { font-size: 68%; }");
             doc.write("table.properties { border-collapse:collapse; 
border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
             doc.write("table.properties th { text-align:left; 
border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; 
background-color:#eeeeee; }");
  @@ -154,363 +156,363 @@
           }
         ]]>  
         </script>
  -             </HEAD>
  -             <body>
  -                     <a name="top"></a>
  -                     <xsl:call-template name="pageHeader"/>  
  -                     
  -                     <!-- Summary part -->
  -                     <xsl:call-template name="summary"/>
  -                     <hr size="1" width="95%" align="left"/>
  -                     
  -                     <!-- Package List part -->
  -                     <xsl:call-template name="packagelist"/>
  -                     <hr size="1" width="95%" align="left"/>
  -                     
  -                     <!-- For each package create its part -->
  -                     <xsl:call-template name="packages"/>
  -                     <hr size="1" width="95%" align="left"/>
  -                     
  -                     <!-- For each class create the  part -->
  -                     <xsl:call-template name="classes"/>
  -                     
  -             </body>
  -     </HTML>
  -</xsl:template>
  -     
  -     
  -     
  -     <!-- ================================================================== 
-->
  -     <!-- Write a list of all packages with an hyperlink to the anchor of    
-->
  -     <!-- of the package name.                                               
-->
  -     <!-- ================================================================== 
-->
  -     <xsl:template name="packagelist">       
  -             <h2>Packages</h2>
  -             Note: package statistics are not computed recursively, they 
only sum up all of its testsuites numbers.
  -             <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  -                     <xsl:call-template name="testsuite.test.header"/>
  -                     <!-- list all packages recursively -->
  -                     <xsl:for-each select="./testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  -                             <xsl:sort select="@package"/>
  -                             <xsl:variable name="testsuites-in-package" 
select="/testsuites/testsuite[./@package = current()/@package]"/>
  -                             <xsl:variable name="testCount" 
select="sum($testsuites-in-package/@tests)"/>
  -                             <xsl:variable name="errorCount" 
select="sum($testsuites-in-package/@errors)"/>
  -                             <xsl:variable name="failureCount" 
select="sum($testsuites-in-package/@failures)"/>
  -                             <xsl:variable name="timeCount" 
select="sum($testsuites-in-package/@time)"/>
  -                             
  -                             <!-- write a summary for the package -->
  -                             <tr valign="top">
  -                                     <!-- set a nice color depending if 
there is an error/failure -->
  -                                     <xsl:attribute name="class">
  -                                             <xsl:choose>
  -                                                     <xsl:when 
test="$failureCount &gt; 0">Failure</xsl:when>
  -                                                     <xsl:when 
test="$errorCount &gt; 0">Error</xsl:when>
  -                                             </xsl:choose>
  -                                     </xsl:attribute>
  -                                     <td><a href="[EMAIL 
PROTECTED]"><xsl:value-of select="@package"/></a></td>
  -                                     <td><xsl:value-of 
select="$testCount"/></td>
  -                                     <td><xsl:value-of 
select="$errorCount"/></td>
  -                                     <td><xsl:value-of 
select="$failureCount"/></td>
  -                                     <td>
  -                                     <xsl:call-template name="display-time">
  -                                             <xsl:with-param name="value" 
select="$timeCount"/>
  -                                     </xsl:call-template>
  -                                     </td>
  -                             </tr>
  -                     </xsl:for-each>
  -             </table>                
  -     </xsl:template>
  -     
  -     
  -     <!-- ================================================================== 
-->
  -     <!-- Write a package level report                                       
-->
  -     <!-- It creates a table with values from the document:                  
-->
  -     <!-- Name | Tests | Errors | Failures | Time                            
-->
  -     <!-- ================================================================== 
-->
  -     <xsl:template name="packages">
  -             <!-- create an anchor to this package name -->
  -             <xsl:for-each select="/testsuites/testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  -                     <xsl:sort select="@package"/>
  -                             <a name="[EMAIL PROTECTED]"></a>
  -                             <h3>Package <xsl:value-of 
select="@package"/></h3>
  -                             
  -                             <table class="details" border="0" 
cellpadding="5" cellspacing="2" width="95%">
  -                                     <xsl:call-template 
name="testsuite.test.header"/>
  -                     
  -                                     <!-- match the testsuites of this 
package -->
  -                                     <xsl:apply-templates 
select="/testsuites/testsuite[./@package = current()/@package]" 
mode="print.test"/>
  -                             </table>
  -                             <a href="#top">Back to top</a>
  -                             <p/>
  -                             <p/>
  -             </xsl:for-each>
  -     </xsl:template>
  -     
  -     <xsl:template name="classes">
  -             <xsl:for-each select="testsuite">
  -                     <xsl:sort select="@name"/>
  -                     <!-- create an anchor to this class name -->
  -                     <a name="[EMAIL PROTECTED]"></a>
  -                     <h3>TestCase <xsl:value-of select="@name"/></h3>
  -                     
  -                     <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  -                       <xsl:call-template name="testcase.test.header"/>
  -                       <!--
  -                       test can even not be started at all (failure to load 
the class)
  -                       so report the error directly
  -                       -->
  -                             <xsl:if test="./error">
  -                                     <tr class="Error">
  -                                             <td 
colspan="4"><xsl:apply-templates select="./error"/></td>
  -                                     </tr>
  -                             </xsl:if>
  -                             <xsl:apply-templates select="./testcase" 
mode="print.test"/>
  -                     </table>
  +        </head>
  +        <body>
  +            <a name="top"></a>
  +            <xsl:call-template name="pageHeader"/>  
  +            
  +            <!-- Summary part -->
  +            <xsl:call-template name="summary"/>
  +            <hr size="1" width="95%" align="left"/>
  +            
  +            <!-- Package List part -->
  +            <xsl:call-template name="packagelist"/>
  +            <hr size="1" width="95%" align="left"/>
  +            
  +            <!-- For each package create its part -->
  +            <xsl:call-template name="packages"/>
  +            <hr size="1" width="95%" align="left"/>
  +            
  +            <!-- For each class create the  part -->
  +            <xsl:call-template name="classes"/>
  +            
  +        </body>
  +    </html>
  +</xsl:template>
  +    
  +    
  +    
  +    <!-- ================================================================== 
-->
  +    <!-- Write a list of all packages with an hyperlink to the anchor of    
-->
  +    <!-- of the package name.                                               
-->
  +    <!-- ================================================================== 
-->
  +    <xsl:template name="packagelist">   
  +        <h2>Packages</h2>
  +        Note: package statistics are not computed recursively, they only sum 
up all of its testsuites numbers.
  +        <table class="details" border="0" cellpadding="5" cellspacing="2" 
width="95%">
  +            <xsl:call-template name="testsuite.test.header"/>
  +            <!-- list all packages recursively -->
  +            <xsl:for-each select="./testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  +                <xsl:sort select="@package"/>
  +                <xsl:variable name="testsuites-in-package" 
select="/testsuites/testsuite[./@package = current()/@package]"/>
  +                <xsl:variable name="testCount" 
select="sum($testsuites-in-package/@tests)"/>
  +                <xsl:variable name="errorCount" 
select="sum($testsuites-in-package/@errors)"/>
  +                <xsl:variable name="failureCount" 
select="sum($testsuites-in-package/@failures)"/>
  +                <xsl:variable name="timeCount" 
select="sum($testsuites-in-package/@time)"/>
  +                
  +                <!-- write a summary for the package -->
  +                <tr valign="top">
  +                    <!-- set a nice color depending if there is an 
error/failure -->
  +                    <xsl:attribute name="class">
  +                        <xsl:choose>
  +                            <xsl:when test="$failureCount &gt; 
0">Failure</xsl:when>
  +                            <xsl:when test="$errorCount &gt; 
0">Error</xsl:when>
  +                        </xsl:choose>
  +                    </xsl:attribute>
  +                    <td><a href="[EMAIL PROTECTED]"><xsl:value-of 
select="@package"/></a></td>
  +                    <td><xsl:value-of select="$testCount"/></td>
  +                    <td><xsl:value-of select="$errorCount"/></td>
  +                    <td><xsl:value-of select="$failureCount"/></td>
  +                    <td>
  +                    <xsl:call-template name="display-time">
  +                        <xsl:with-param name="value" select="$timeCount"/>
  +                    </xsl:call-template>
  +                    </td>
  +                </tr>
  +            </xsl:for-each>
  +        </table>        
  +    </xsl:template>
  +    
  +    
  +    <!-- ================================================================== 
-->
  +    <!-- Write a package level report                                       
-->
  +    <!-- It creates a table with values from the document:                  
-->
  +    <!-- Name | Tests | Errors | Failures | Time                            
-->
  +    <!-- ================================================================== 
-->
  +    <xsl:template name="packages">
  +        <!-- create an anchor to this package name -->
  +        <xsl:for-each select="/testsuites/testsuite[not(./@package = 
preceding-sibling::testsuite/@package)]">
  +            <xsl:sort select="@package"/>
  +                <a name="[EMAIL PROTECTED]"></a>
  +                <h3>Package <xsl:value-of select="@package"/></h3>
  +                
  +                <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  +                    <xsl:call-template name="testsuite.test.header"/>
  +            
  +                    <!-- match the testsuites of this package -->
  +                    <xsl:apply-templates 
select="/testsuites/testsuite[./@package = current()/@package]" 
mode="print.test"/>
  +                </table>
  +                <a href="#top">Back to top</a>
  +                <p/>
  +                <p/>
  +        </xsl:for-each>
  +    </xsl:template>
  +    
  +    <xsl:template name="classes">
  +        <xsl:for-each select="testsuite">
  +            <xsl:sort select="@name"/>
  +            <!-- create an anchor to this class name -->
  +            <a name="[EMAIL PROTECTED]"></a>
  +            <h3>TestCase <xsl:value-of select="@name"/></h3>
  +            
  +            <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  +              <xsl:call-template name="testcase.test.header"/>
  +              <!--
  +              test can even not be started at all (failure to load the class)
  +              so report the error directly
  +              -->
  +                <xsl:if test="./error">
  +                    <tr class="Error">
  +                        <td colspan="4"><xsl:apply-templates 
select="./error"/></td>
  +                    </tr>
  +                </xsl:if>
  +                <xsl:apply-templates select="./testcase" mode="print.test"/>
  +            </table>
               <div class="Properties">
                   <a>
  -                             <xsl:attribute 
name="href">javascript:displayProperties('<xsl:value-of 
select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
  -                             Properties &#187;
  -                         </a>
  +                    <xsl:attribute 
name="href">javascript:displayProperties('<xsl:value-of 
select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
  +                    Properties &#187;
  +                </a>
               </div>
  -                     <p/>
  -                     
  -                     <a href="#top">Back to top</a>
  -             </xsl:for-each>
  -     </xsl:template>
  -     
  -     <xsl:template name="summary">
  -             <h2>Summary</h2>
  -             <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
  -             <xsl:variable name="errorCount" 
select="sum(testsuite/@errors)"/>
  -             <xsl:variable name="failureCount" 
select="sum(testsuite/@failures)"/>
  -             <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
  -             <xsl:variable name="successRate" select="($testCount - 
$failureCount - $errorCount) div $testCount"/>
  -             <table class="details" border="0" cellpadding="5" 
cellspacing="2" width="95%">
  -             <tr valign="top">
  -                     <th>Tests</th>
  -                     <th>Failures</th>
  -                     <th>Errors</th>
  -                     <th>Success rate</th>
  -                     <th>Time</th>
  -             </tr>
  -             <tr valign="top">
  -                     <xsl:attribute name="class">
  -                             <xsl:choose>
  -                                     <xsl:when test="$failureCount &gt; 
0">Failure</xsl:when>
  -                                     <xsl:when test="$errorCount &gt; 
0">Error</xsl:when>
  -                             </xsl:choose>
  -                     </xsl:attribute>
  -                     <td><xsl:value-of select="$testCount"/></td>
  -                     <td><xsl:value-of select="$failureCount"/></td>
  -                     <td><xsl:value-of select="$errorCount"/></td>
  -                     <td>
  -                             <xsl:call-template name="display-percent">
  -                                     <xsl:with-param name="value" 
select="$successRate"/>
  -                             </xsl:call-template>
  -                     </td>
  -                     <td>
  -                             <xsl:call-template name="display-time">
  -                                     <xsl:with-param name="value" 
select="$timeCount"/>
  -                             </xsl:call-template>
  -                     </td>
  -
  -             </tr>
  -             </table>
  -             <table border="0" width="95%">
  -             <tr>
  -             <td     style="text-align: justify;">
  -             Note: <i>failures</i> are anticipated and checked for with 
assertions while <i>errors</i> are unanticipated.
  -             </td>
  -             </tr>
  -             </table>
  -     </xsl:template>
  -     
  +            <p/>
  +            
  +            <a href="#top">Back to top</a>
  +        </xsl:for-each>
  +    </xsl:template>
  +    
  +    <xsl:template name="summary">
  +        <h2>Summary</h2>
  +        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
  +        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
  +        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
  +        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
  +        <xsl:variable name="successRate" select="($testCount - $failureCount 
- $errorCount) div $testCount"/>
  +        <table class="details" border="0" cellpadding="5" cellspacing="2" 
width="95%">
  +        <tr valign="top">
  +            <th>Tests</th>
  +            <th>Failures</th>
  +            <th>Errors</th>
  +            <th>Success rate</th>
  +            <th>Time</th>
  +        </tr>
  +        <tr valign="top">
  +            <xsl:attribute name="class">
  +                <xsl:choose>
  +                    <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
  +                    <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
  +                </xsl:choose>
  +            </xsl:attribute>
  +            <td><xsl:value-of select="$testCount"/></td>
  +            <td><xsl:value-of select="$failureCount"/></td>
  +            <td><xsl:value-of select="$errorCount"/></td>
  +            <td>
  +                <xsl:call-template name="display-percent">
  +                    <xsl:with-param name="value" select="$successRate"/>
  +                </xsl:call-template>
  +            </td>
  +            <td>
  +                <xsl:call-template name="display-time">
  +                    <xsl:with-param name="value" select="$timeCount"/>
  +                </xsl:call-template>
  +            </td>
  +
  +        </tr>
  +        </table>
  +        <table border="0" width="95%">
  +        <tr>
  +        <td style="text-align: justify;">
  +        Note: <i>failures</i> are anticipated and checked for with 
assertions while <i>errors</i> are unanticipated.
  +        </td>
  +        </tr>
  +        </table>
  +    </xsl:template>
  +    
     <!--
      Write properties into a JavaScript data structure.
      This is based on the original idea by Erik Hatcher ([EMAIL PROTECTED])
      -->
     <xsl:template match="properties">
       cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of 
select="../@name"/>'] = new Array();
  -     <xsl:for-each select="property">
  +    <xsl:for-each select="property">
       <xsl:sort select="@name"/>
           cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template 
name="JS-escape"><xsl:with-param name="string" 
select="@value"/></xsl:call-template>';
  -     </xsl:for-each>
  +    </xsl:for-each>
     </xsl:template>
  -     
  +    
   <!-- Page HEADER -->
   <xsl:template name="pageHeader">
  -     <h1>Unit Test Results</h1>
  -     <table width="100%">
  -     <tr>
  -             <td align="left"></td>
  -             <td align="right">Designed for use with <a 
href='http://www.junit.org'>JUnit</a> and <a 
href='http://jakarta.apache.org/ant'>Ant</a>.</td>
  -     </tr>
  -     </table>
  -     <hr size="1"/>
  +    <h1>Unit Test Results</h1>
  +    <table width="100%">
  +    <tr>
  +        <td align="left"></td>
  +        <td align="right">Designed for use with <a 
href='http://www.junit.org'>JUnit</a> and <a 
href='http://jakarta.apache.org/ant'>Ant</a>.</td>
  +    </tr>
  +    </table>
  +    <hr size="1"/>
   </xsl:template>
   
   <xsl:template match="testsuite" mode="header">
  -     <tr valign="top">
  -             <th width="80%">Name</th>
  -             <th>Tests</th>
  -             <th>Errors</th>
  -             <th>Failures</th>
  -             <th nowrap="nowrap">Time(s)</th>
  -     </tr>
  +    <tr valign="top">
  +        <th width="80%">Name</th>
  +        <th>Tests</th>
  +        <th>Errors</th>
  +        <th>Failures</th>
  +        <th nowrap="nowrap">Time(s)</th>
  +    </tr>
   </xsl:template>
   
   <!-- class header -->
   <xsl:template name="testsuite.test.header">
  -     <tr valign="top">
  -             <th width="80%">Name</th>
  -             <th>Tests</th>
  -             <th>Errors</th>
  -             <th>Failures</th>
  -             <th nowrap="nowrap">Time(s)</th>
  -     </tr>
  +    <tr valign="top">
  +        <th width="80%">Name</th>
  +        <th>Tests</th>
  +        <th>Errors</th>
  +        <th>Failures</th>
  +        <th nowrap="nowrap">Time(s)</th>
  +    </tr>
   </xsl:template>
   
   <!-- method header -->
   <xsl:template name="testcase.test.header">
  -     <tr valign="top">
  -             <th>Name</th>
  -             <th>Status</th>
  -             <th width="80%">Type</th>
  -             <th nowrap="nowrap">Time(s)</th>
  -     </tr>
  +    <tr valign="top">
  +        <th>Name</th>
  +        <th>Status</th>
  +        <th width="80%">Type</th>
  +        <th nowrap="nowrap">Time(s)</th>
  +    </tr>
   </xsl:template>
   
   
   <!-- class information -->
   <xsl:template match="testsuite" mode="print.test">
  -     <tr valign="top">
  -             <!-- set a nice color depending if there is an error/failure -->
  -             <xsl:attribute name="class">
  -                     <xsl:choose>
  -                             <xsl:when test="@failures[.&gt; 
0]">Failure</xsl:when>
  -                             <xsl:when test="@errors[.&gt; 
0]">Error</xsl:when>
  -                     </xsl:choose>
  -             </xsl:attribute>
  -     
  -             <!-- print testsuite information -->
  -             <td><a href="[EMAIL PROTECTED]"><xsl:value-of 
select="@name"/></a></td>
  -             <td><xsl:value-of select="@tests"/></td>
  -             <td><xsl:value-of select="@errors"/></td>
  -             <td><xsl:value-of select="@failures"/></td>
  -             <td>
  -                     <xsl:call-template name="display-time">
  -                             <xsl:with-param name="value" select="@time"/>
  -                     </xsl:call-template>
  -             </td>
  -     </tr>
  +    <tr valign="top">
  +        <!-- set a nice color depending if there is an error/failure -->
  +        <xsl:attribute name="class">
  +            <xsl:choose>
  +                <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
  +                <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
  +            </xsl:choose>
  +        </xsl:attribute>
  +    
  +        <!-- print testsuite information -->
  +        <td><a href="[EMAIL PROTECTED]"><xsl:value-of 
select="@name"/></a></td>
  +        <td><xsl:value-of select="@tests"/></td>
  +        <td><xsl:value-of select="@errors"/></td>
  +        <td><xsl:value-of select="@failures"/></td>
  +        <td>
  +            <xsl:call-template name="display-time">
  +                <xsl:with-param name="value" select="@time"/>
  +            </xsl:call-template>
  +        </td>
  +    </tr>
   </xsl:template>
   
   <xsl:template match="testcase" mode="print.test">
  -     <tr valign="top">
  -             <xsl:attribute name="class">
  -                     <xsl:choose>
  -                             <xsl:when test="failure | 
error">Error</xsl:when>
  -                     </xsl:choose>
  -             </xsl:attribute>
  -             <td><xsl:value-of select="@name"/></td>
  -             <xsl:choose>
  -                     <xsl:when test="failure">
  -                             <td>Failure</td>
  -                             <td><xsl:apply-templates select="failure"/></td>
  -                     </xsl:when>
  -                     <xsl:when test="error">
  -                             <td>Error</td>
  -                             <td><xsl:apply-templates select="error"/></td>
  -                     </xsl:when>
  -                     <xsl:otherwise>
  -                             <td>Success</td>
  -                             <td></td>
  -                     </xsl:otherwise>
  -             </xsl:choose>
  -             <td>
  -                     <xsl:call-template name="display-time">
  -                             <xsl:with-param name="value" select="@time"/>
  -                     </xsl:call-template>
  -             </td>
  -     </tr>
  +    <tr valign="top">
  +        <xsl:attribute name="class">
  +            <xsl:choose>
  +                <xsl:when test="failure | error">Error</xsl:when>
  +            </xsl:choose>
  +        </xsl:attribute>
  +        <td><xsl:value-of select="@name"/></td>
  +        <xsl:choose>
  +            <xsl:when test="failure">
  +                <td>Failure</td>
  +                <td><xsl:apply-templates select="failure"/></td>
  +            </xsl:when>
  +            <xsl:when test="error">
  +                <td>Error</td>
  +                <td><xsl:apply-templates select="error"/></td>
  +            </xsl:when>
  +            <xsl:otherwise>
  +                <td>Success</td>
  +                <td></td>
  +            </xsl:otherwise>
  +        </xsl:choose>
  +        <td>
  +            <xsl:call-template name="display-time">
  +                <xsl:with-param name="value" select="@time"/>
  +            </xsl:call-template>
  +        </td>
  +    </tr>
   </xsl:template>
   
   
   <xsl:template match="failure">
  -     <xsl:call-template name="display-failures"/>
  +    <xsl:call-template name="display-failures"/>
   </xsl:template>
   
   <xsl:template match="error">
  -     <xsl:call-template name="display-failures"/>
  +    <xsl:call-template name="display-failures"/>
   </xsl:template>
   
   <!-- Style for the error and failure in the tescase template -->
   <xsl:template name="display-failures">
  -     <xsl:choose>
  -             <xsl:when test="not(@message)">N/A</xsl:when>
  -             <xsl:otherwise>
  -                     <xsl:value-of select="@message"/>
  -             </xsl:otherwise>
  -     </xsl:choose>
  -     <!-- display the stacktrace -->
  -     <code>
  -             <p/>
  -             <xsl:call-template name="br-replace">
  -                     <xsl:with-param name="word" select="."/>
  -             </xsl:call-template>
  -     </code>
  -     <!-- the later is better but might be problematic for non-21" 
monitors... -->
  -     <!--pre><xsl:value-of select="."/></pre-->
  +    <xsl:choose>
  +        <xsl:when test="not(@message)">N/A</xsl:when>
  +        <xsl:otherwise>
  +            <xsl:value-of select="@message"/>
  +        </xsl:otherwise>
  +    </xsl:choose>
  +    <!-- display the stacktrace -->
  +    <code>
  +        <br/><br/>
  +        <xsl:call-template name="br-replace">
  +            <xsl:with-param name="word" select="."/>
  +        </xsl:call-template>
  +    </code>
  +    <!-- the later is better but might be problematic for non-21" 
monitors... -->
  +    <!--pre><xsl:value-of select="."/></pre-->
   </xsl:template>
   
   <xsl:template name="JS-escape">
  -     <xsl:param name="string"/>
  -     <xsl:choose>
  -             <xsl:when test="contains($string,&quot;'&quot;)">
  -                     <xsl:value-of 
select="substring-before($string,&quot;'&quot;)"/>\&apos;<xsl:call-template 
name="JS-escape">
  -                             <xsl:with-param name="string" 
select="substring-after($string,&quot;'&quot;)"/>
  -                     </xsl:call-template>
  -             </xsl:when> 
  -             <xsl:when test="contains($string,'\')">
  -                     <xsl:value-of 
select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
  -                             <xsl:with-param name="string" 
select="substring-after($string,'\')"/>
  -                     </xsl:call-template>
  -             </xsl:when>
  -             <xsl:otherwise>
  -                     <xsl:value-of select="$string"/>
  -             </xsl:otherwise>
  -     </xsl:choose>
  +    <xsl:param name="string"/>
  +    <xsl:choose>
  +        <xsl:when test="contains($string,&quot;'&quot;)">
  +            <xsl:value-of 
select="substring-before($string,&quot;'&quot;)"/>\&apos;<xsl:call-template 
name="JS-escape">
  +                <xsl:with-param name="string" 
select="substring-after($string,&quot;'&quot;)"/>
  +            </xsl:call-template>
  +        </xsl:when> 
  +        <xsl:when test="contains($string,'\')">
  +            <xsl:value-of 
select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
  +                <xsl:with-param name="string" 
select="substring-after($string,'\')"/>
  +            </xsl:call-template>
  +        </xsl:when>
  +        <xsl:otherwise>
  +            <xsl:value-of select="$string"/>
  +        </xsl:otherwise>
  +    </xsl:choose>
   </xsl:template>
   
   
   <!--
  -     template that will convert a carriage return into a br tag
  -     @param word the text from which to convert CR to BR tag
  +    template that will convert a carriage return into a br tag
  +    @param word the text from which to convert CR to BR tag
   -->
   <xsl:template name="br-replace">
  -     <xsl:param name="word"/>
  -     <xsl:choose>
  -             <xsl:when test="contains($word,'&#xA;')">
  -                     <xsl:value-of select="substring-before($word,'&#xA;')"/>
  -                     <br/>
  -                     <xsl:call-template name="br-replace">
  -                             <xsl:with-param name="word" 
select="substring-after($word,'&#xA;')"/>
  -                     </xsl:call-template>
  -             </xsl:when>
  -             <xsl:otherwise>
  -                     <xsl:value-of select="$word"/>
  -             </xsl:otherwise>
  -     </xsl:choose>
  +    <xsl:param name="word"/>
  +    <xsl:choose>
  +        <xsl:when test="contains($word,'&#xA;')">
  +            <xsl:value-of select="substring-before($word,'&#xA;')"/>
  +            <br/>
  +            <xsl:call-template name="br-replace">
  +                <xsl:with-param name="word" 
select="substring-after($word,'&#xA;')"/>
  +            </xsl:call-template>
  +        </xsl:when>
  +        <xsl:otherwise>
  +            <xsl:value-of select="$word"/>
  +        </xsl:otherwise>
  +    </xsl:choose>
   </xsl:template>
   
   <xsl:template name="display-time">
  -     <xsl:param name="value"/>
  -     <xsl:value-of select="format-number($value,'0.000')"/>
  +    <xsl:param name="value"/>
  +    <xsl:value-of select="format-number($value,'0.000')"/>
   </xsl:template>
   
   <xsl:template name="display-percent">
  -     <xsl:param name="value"/>
  -     <xsl:value-of select="format-number($value,'0.00%')"/>
  +    <xsl:param name="value"/>
  +    <xsl:value-of select="format-number($value,'0.00%')"/>
   </xsl:template>
   
   </xsl:stylesheet>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to