curcuru 2002/07/25 07:41:36
Modified: test BaseScanner.xsl FailScanner.xsl PerfScanner.xsl
Log:
Minor update for pathing to Base/FailScanner;
Update PerfScanner to use Base (very simplistic; you should
probably use pdick's perf comparison scanner instead)
Revision Changes Path
1.2 +1 -1 xml-xalan/test/BaseScanner.xsl
Index: BaseScanner.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/BaseScanner.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseScanner.xsl 23 Jul 2002 20:13:43 -0000 1.1
+++ BaseScanner.xsl 25 Jul 2002 14:41:36 -0000 1.2
@@ -55,7 +55,7 @@
<xsl:template name="printScannerName">
<xsl:element name="a">
- <xsl:attribute
name="href"><xsl:text>src/xsl/BaseScanner.xsl</xsl:text></xsl:attribute>
+ <xsl:attribute
name="href"><xsl:text>BaseScanner.xsl</xsl:text></xsl:attribute>
<xsl:text>BaseScanner</xsl:text>
</xsl:element>
</xsl:template>
1.6 +1 -1 xml-xalan/test/FailScanner.xsl
Index: FailScanner.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/FailScanner.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FailScanner.xsl 23 Jul 2002 20:13:43 -0000 1.5
+++ FailScanner.xsl 25 Jul 2002 14:41:36 -0000 1.6
@@ -26,7 +26,7 @@
<xsl:template name="printScannerName">
<xsl:element name="a">
- <xsl:attribute
name="href"><xsl:text>src/xsl/FailScanner.xsl</xsl:text></xsl:attribute>
+ <xsl:attribute
name="href"><xsl:text>FailScanner.xsl</xsl:text></xsl:attribute>
<xsl:text>FailScanner</xsl:text>
</xsl:element>
</xsl:template>
1.2 +44 -108 xml-xalan/test/PerfScanner.xsl
Index: PerfScanner.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/PerfScanner.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PerfScanner.xsl 17 Jan 2002 20:36:23 -0000 1.1
+++ PerfScanner.xsl 25 Jul 2002 14:41:36 -0000 1.2
@@ -1,129 +1,65 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:lxslt="http://xml.apache.org/xslt";
+ xmlns:redirect="org.apache.xalan.lib.Redirect"
+ extension-element-prefixes="redirect"
version="1.0">
-<xsl:output method="html"
- doctype-public="-//W3C//DTD HTML 4.0 Transitional"/>
-<!-- FileName: FailScanner.xsl -->
+<!-- FileName: PerfScanner.xsl -->
<!-- Author: [EMAIL PROTECTED] -->
-<!-- Purpose: Simple viewer for org.apache.qetest.XMLFileLogger
- logFile failing-only results put into simple HTML pages -->
+<!-- Purpose: Stylesheet for org.apache.qetest.XMLFileLogger
+ logFiles that only prints out simple performance stats.
+ Note that pdick is working on much more interesting
+ stylesheets that compare the perf results from one
+ test run to the previous one in a chart.
+-->
-<!-- Include constant definitions for results file elements,
- attributes, and values, copied from relevant Java code -->
-<xsl:include href="resultsConstants.xsl"/>
+<!-- Import the BaseScanner for most duties; note this must be first in file
-->
+<xsl:import href="BaseScanner.xsl"/>
-<!-- ================================== -->
-<!-- Main template-standalone: output an HTML page -->
-<xsl:template match="resultsfile">
- <html xmlns="http://www.w3.org/1999/xhtml";>
- <head>
- <title><xsl:text>Test Results file: </xsl:text><xsl:value-of
select="@logFile"/></title>
- </head>
- <body>
- <xsl:apply-templates/>
- </body>
- </html>
-</xsl:template>
+<xsl:output method="html"
+ doctype-public="-//W3C//DTD HTML 4.0 Transitional"/>
-<!-- Output each whole testfile as a table; a small summary then individual
results -->
-<!-- This is selected in ResultScanner.xsl directly -->
-<xsl:template match="testfile">
+<lxslt:component prefix="redirect" elements="write open close" functions="">
+ <lxslt:script lang="javaclass" src="org.apache.xalan.lib.Redirect"/>
+</lxslt:component>
+
+<!-- Name of file for mini-fails redirected output -->
+<xsl:param name="redirectFilename">PerfScannerMini.html</xsl:param>
+
+<xsl:template name="printScannerName">
+ <xsl:element name="a">
+ <xsl:attribute
name="href"><xsl:text>PerfScanner.xsl</xsl:text></xsl:attribute>
+ <xsl:text>PerfScanner</xsl:text>
+ </xsl:element>
+</xsl:template>
+<!-- ================================== -->
+<!-- Element templates: output basic data for each of the common
+ test elements, like messages, checks, etc.
+-->
+<xsl:template match="testcase">
<table frame="box" border="1" rules="groups"
cellspacing="2" cellpadding="2"
bgcolor="#FFFFEE">
<caption>
- <b><xsl:value-of select="@filename"/><xsl:text>:
</xsl:text></b><xsl:value-of select="@desc"/>
+ <b><xsl:text>Testcase # </xsl:text></b>
+ <!-- This creates the anchor as well as printing the @desc -->
+ <xsl:call-template name="create-testcase-anchor">
+ <xsl:with-param name="testcase" select="."/>
+ </xsl:call-template>
</caption>
- <!-- establish row widths here in our mini-summary -->
+ <!-- establish row widths here -->
<tr>
- <td width="7%"><xsl:text>Overall</xsl:text></td>
- <td>
- <xsl:text>Pass: </xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'passCount[CASES]']/longval"/><xsl:text>/</xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'passCount[CHECKS]']/longval"/><xsl:text>, </xsl:text>
- <xsl:text>Fail: </xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'failCount[CASES]']/longval"/><xsl:text>/</xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'failCount[CHECKS]']/longval"/><xsl:text>, </xsl:text>
- <xsl:text>Errr: </xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'errrCount[CASES]']/longval"/><xsl:text>/</xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'errrCount[CHECKS]']/longval"/><xsl:text>, </xsl:text>
- <xsl:text>Ambg: </xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'ambgCount[CASES]']/longval"/><xsl:text>/</xsl:text>
- <xsl:value-of select="[EMAIL
PROTECTED]'ambgCount[CHECKS]']/longval"/><xsl:text>, </xsl:text>
- <xsl:text>Incp: </xsl:text>
- <xsl:value-of select="[EMAIL PROTECTED]'incpCount[CASES]']/longval"/>
- </td>
+ <td width="20"></td>
+ <td></td>
</tr>
-
- <!-- Search on all subelements; don't bother restricting -->
- <xsl:apply-templates />
- </table>
-</xsl:template>
-
-<!-- Output all testcases with minimal info in them -->
-<xsl:template match="testcase">
+ <!-- Only select results and perf items -->
+ <xsl:apply-templates select="checkresult | perf" mode="table"/>
<tr>
<td><br/><hr/></td>
- <td><xsl:text>Testcase #</xsl:text><xsl:value-of
select="@desc"/><xsl:text> is </xsl:text><xsl:value-of
select="caseresult/@result"/></td>
+ <td><xsl:value-of select="caseresult/@result"/>:<xsl:text>Testcase
#</xsl:text><xsl:value-of select="@desc"/></td>
</tr>
- <!-- Only select results; we only have matches later for failed results
-->
- <xsl:apply-templates select="checkresult | perf | fileCheck" />
-</xsl:template>
-
-<!-- Printout basic pass/fail for each test -->
-<xsl:template match="checkresult">
- <tr>
- <td><xsl:value-of select="@result"/></td>
- <td>
- <xsl:if test="@id">
- <xsl:text>[</xsl:text><xsl:value-of select="@id"/><xsl:text>]
</xsl:text>
- </xsl:if>
- <xsl:value-of select="@desc"/>
- </td>
- </tr>
-</xsl:template>
-
-<!-- Print out simple block of perf info -->
-<xsl:template match="perf">
- <tr>
- <td><b><xsl:value-of select="@idref"/></b></td>
- <td>
- <xsl:value-of select="@processor"/><br/>
- <xsl:if test="@avgparsexsl"><xsl:text> avgparsexsl =
</xsl:text><xsl:value-of select="@avgparsexsl"/></xsl:if>
- <xsl:if test="@singletransform"><xsl:text> singletransform =
</xsl:text><xsl:value-of select="@singletransform"/></xsl:if>
- <xsl:if test="@iterations"><xsl:text> iterations =
</xsl:text><xsl:value-of select="@iterations"/></xsl:if>
- <xsl:if test="@unparsedxml"><xsl:text> unparsedxml =
</xsl:text><xsl:value-of select="@unparsedxml"/></xsl:if>
- <xsl:if test="@parsexsl"><xsl:text> parsexsl = </xsl:text><xsl:value-of
select="@parsexsl"/></xsl:if>
- <xsl:if test="@avgetoe"><xsl:text> avgetoe = </xsl:text><xsl:value-of
select="@avgetoe"/></xsl:if>
- <xsl:if test="@avgunparsedxml"><xsl:text> avgunparsedxml =
</xsl:text><xsl:value-of select="@avgunparsedxml"/></xsl:if>
- <xsl:if test="@etoe"><xsl:text> etoe = </xsl:text><xsl:value-of
select="@etoe"/></xsl:if>
- <xsl:if test="@OVERALL"><xsl:text> OVERALL = </xsl:text><xsl:value-of
select="@OVERALL"/></xsl:if>
- <xsl:if test="@XSLREAD"><xsl:text> XSLREAD = </xsl:text><xsl:value-of
select="@XSLREAD"/></xsl:if>
- <xsl:if test="@XSLBUILD"><xsl:text> XSLBUILD = </xsl:text><xsl:value-of
select="@XSLBUILD"/></xsl:if>
- <xsl:if test="@XMLREAD"><xsl:text> XMLREAD = </xsl:text><xsl:value-of
select="@XMLREAD"/></xsl:if>
- <xsl:if test="@XMLBUILD"><xsl:text> XMLBUILD = </xsl:text><xsl:value-of
select="@XMLBUILD"/></xsl:if>
- <xsl:if test="@TRANSFORM"><xsl:text> TRANSFORM =
</xsl:text><xsl:value-of select="@TRANSFORM"/></xsl:if>
- <xsl:if test="@RESULTWRITE"><xsl:text> RESULTWRITE =
</xsl:text><xsl:value-of select="@RESULTWRITE"/></xsl:if>
- <xsl:if test="@FIRSTLATENCY"><xsl:text> FIRSTLATENCY =
</xsl:text><xsl:value-of select="@FIRSTLATENCY"/></xsl:if>
- </td>
- </tr>
-</xsl:template>
-
-<!-- Only selected from previous checkresult apply-templates -->
-<xsl:template match="fileCheck">
- <tr>
- <td><font size="-1">fileCheck</font></td>
- <td>
- <xsl:text>Actual file: </xsl:text><xsl:value-of select="@actual"/><br/>
- <pre><font size="-1"><xsl:value-of select="."/></font></pre>
- </td>
- </tr>
+ </table>
</xsl:template>
-
-<!-- We implicitly skip all passes and non-related messages, etc. -->
-
-<!-- Override default text node processing, so statistics, arbitrary
messages, and other stuff is skipped -->
-<xsl:template match="text()"/>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
