cmlenz      2003/06/30 09:56:41

  Modified:    documentation/docs/xdocs/integration index.xml
                        howto_tomcat.xml
               documentation/docs/xdocs sitemap.xml
  Added:       documentation/docs/xdocs/misc cactus-report.xsl
  Removed:     documentation/docs/xdocs/misc junit-noframes.xsl
  Log:
  Replaced the junit-noframes.xsl with cactus-report.xsl
  
  Revision  Changes    Path
  1.1                  jakarta-cactus/documentation/docs/xdocs/misc/cactus-report.xsl
  
  Index: cactus-report.xsl
  ===================================================================
  <?xml version="1.0"?>
  <!--
   The Apache Software License, Version 1.1
  
   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
   reserved.
  
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
  
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
  
   3. The end-user documentation included with the redistribution, if
      any, must include the following acknowlegement:
         "This product includes software developed by the
          Apache Software Foundation (http://www.apache.org/)."
      Alternately, this acknowlegement may appear in the software itself,
      if and wherever such third-party acknowlegements normally appear.
  
   4. The names "The Jakarta Project", "Cactus", and "Apache Software
      Foundation" must not be used to endorse or promote products derived
      from this software without prior written permission. For written
      permission, please contact [EMAIL PROTECTED]
  
   5. Products derived from this software may not be called "Apache"
      nor may "Apache" appear in their names without prior written
      permission of the Apache Group.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
   ====================================================================
  
   This software consists of voluntary contributions made by many
   individuals on behalf of the Apache Software Foundation.  For more
   information on the Apache Software Foundation, please see
   <http://www.apache.org/>.
   -->
   
  <!--
   
   Sample stylesheet to be used with the Cactus ServletTestRunner output.
   Based on the file junit-noframes.xsl from Apache Ant 1.5.
   
   @author Stephane Bailliez <a href="mailto:[EMAIL PROTECTED]"/>
   @author Erik Hatcher <a href="mailto:[EMAIL PROTECTED]"/>
   @author Christopher Lenz <a href="mailto:[EMAIL PROTECTED]"/>
   
  -->
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
    <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
    <xsl:decimal-format decimal-separator="." grouping-separator="," />
    <xsl:template match="testsuites">
      <html>
        <head>
          <style type="text/css">
            body {
              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;
            }
            table.details tr td{
              background:#eeeee0;
            }
            
            p {
              line-height:1.5em;
              margin-top:0.5em; margin-bottom:1.0em;
            }
            h1 {
              margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
            }
            h2 {
              margin-top: 1em; margin-bottom: 0.5em; font: bold 125% 
verdana,arial,helvetica
            }
            h3 {
              margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
            }
            h4 {
              margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
            }
            h5 {
              margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
            }
            h6 {
              margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
            }
            .Error {
              font-weight:bold; color:red;
            }
            .Failure {
              font-weight:bold; color:purple;
            }
          </style>
        </head>
        <body>
          <a name="top"></a>
          <xsl:call-template name="header"/>  
          <xsl:call-template name="summary"/>
          <hr size="1" width="95%" align="left"/>
          <xsl:call-template name="classes"/>
        </body>
      </html>
    </xsl:template>
    
    <xsl:template name="header">
      <h1>Unit Test Results</h1>
      <table width="100%">
      <tr>
        <td align="left"></td>
        <td align="right">
          Designed for use with 
          <a href='http://jakarta.apache.org/cactus/'>Cactus</a>.
        </td>
      </tr>
      </table>
      <hr size="1"/>
    </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>
    
    <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>
        <p/>
        <a href="#top">Back to top</a>
      </xsl:for-each>
    </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>
    </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>
    </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>
    </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>
    </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>
    </xsl:template>
    
    <xsl:template match="failure">
      <xsl:call-template name="display-failures"/>
    </xsl:template>
    
    <xsl:template match="error">
      <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>
    </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
    -->
    <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:template>
    
    <xsl:template name="display-time">
      <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:template>
    
  </xsl:stylesheet>
  
  
  
  
  1.2       +5 -4      jakarta-cactus/documentation/docs/xdocs/integration/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml 6 May 2003 16:11:58 -0000       1.1
  +++ index.xml 30 Jun 2003 16:56:41 -0000      1.2
  @@ -161,11 +161,12 @@
           <p>
             Ok, that's nice ... But what if I want HTML instead of XML? Don't
             worry there is a solution. Grab the following
  -          <link href="site:code_junit_noframes">stylesheet</link>
  -          used to format JUnitReport Ant task results and drop it in your
  -          webapp and name it <code>junit-noframes.xsl</code> (in the root
  +          <link href="site:cactus_report_xsl">XSLT stylesheet</link>
  +          (based on the stylesheet used by the
  +          <strong>&lt;junitreport&gt;</strong> Ant task), drop it in your
  +          webapp and name it <code>cactus-report.xsl</code> (in the root
             directory for example). Then, open a browser and type
  -          
<code>http://server:port/mywebapp/ServletTestRunner?suite=mytestcase&amp;xsl=junit-noframes.xsl</code>.
  +          
<code>http://server:port/mywebapp/ServletTestRunner?suite=mytestcase&amp;xsl=cactus-report.xsl</code>.
             You should see the following:
           </p>
   
  
  
  
  1.2       +3 -2      
jakarta-cactus/documentation/docs/xdocs/integration/howto_tomcat.xml
  
  Index: howto_tomcat.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/howto_tomcat.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- howto_tomcat.xml  6 May 2003 16:10:46 -0000       1.1
  +++ howto_tomcat.xml  30 Jun 2003 16:56:41 -0000      1.2
  @@ -249,8 +249,9 @@
         <p>
           Ok, that's nice ... But what if I want HTML instead of XML? Don't
           worry there is a solution. Grab the following
  -        <link href="site:code_junit_noframes">junit-noframes.xsl</link>
  -        stylesheet used to format JUnitReport Ant task results and drop it in
  +        <link href="site:cactus_report_xsl">XSLT stylesheet</link>
  +        (based on the stylesheet used by the
  +        <strong>&lt;junitreport&gt;</strong> Ant task) and drop it in
           <code>[tomcat-root]/webapps/test</code>. Then, open a browser and type
           
<code>http://localhost:8080/test/ServletTestRunner?suite=TestSampleServlet&amp;xsl=junit-noframes.xsl</code>.
           You should now see the following:
  
  
  
  1.47      +1 -1      jakarta-cactus/documentation/docs/xdocs/sitemap.xml
  
  Index: sitemap.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/sitemap.xml,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- sitemap.xml       29 Jun 2003 10:49:11 -0000      1.46
  +++ sitemap.xml       30 Jun 2003 16:56:41 -0000      1.47
  @@ -361,7 +361,7 @@
   
     <resource id="code_sample_servlet" target="misc/SampleServlet.class"/>
     <resource id="code_test_sample_servlet" target="misc/TestSampleServlet.class"/>
  -  <resource id="code_junit_noframes" target="misc/junit-noframes.xsl"/>
  +  <resource id="cactus_report_xsl" target="misc/cactus-report.xsl"/>
   
     <resource id="javadoc_integration_ant" check="false" 
target="api/integration/ant/index.html"/>
     <resource id="javadoc_framework_12" check="false" 
target="api/framework-12/index.html"/>
  
  
  

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

Reply via email to