- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 06 Jul 2006 20:50:58 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results
In directory hutz:/tmp/cvs-serv19351/test-suite/results
Modified Files:
Overview.html results.xsl combine.xslt implementations.xml
Added Files:
validation-results.xsl
Log Message:
Simplified test-suite.xml format. Updated stylesheets dependent upon this format.
Updated TestMetadata.xsd to allow multiple <Input> elements within an <Inputs>, and a role attribute.
Updated all TestMetadata.xml files to match the above schema change.
Rebuilt some dependent reports.
Index: combine.xslt
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/combine.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** combine.xslt 19 May 2006 01:09:13 -0000 1.2
--- combine.xslt 6 Jul 2006 20:50:56 -0000 1.3
***************
*** 1,5 ****
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="combine.xslt"?>
! <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
--- 1,5 ----
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="combine.xslt"?>
! <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:tm="http://www.w3.org/2006/02/wsdl/TestMetadata">
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
***************
*** 23,58 ****
<table>
<tr>
! <td>Testcase</td>
! <td>WSDL</td>
<xsl:for-each select="$implementations//implementation">
! <td><xsl:value-of select="@name"/> failures</td>
</xsl:for-each>
</tr>
! <xsl:for-each select="$test-suite/test-suite/test-case[contains(@id, 'good')]/file">
! <xsl:variable name="testcase" select="."/>
! <tr>
! <td><xsl:value-of select="../@id"/></td>
! <td><xsl:value-of select="."/></td>
! <xsl:for-each select="$implementations//implementation">
! <xsl:variable name="results" select="document(concat(@results-folder,'/',$testcase/../folder,'/',substring-before($testcase,'.wsdl'),'-results.xml'))"/>
! <xsl:choose>
! <xsl:when test="$results">
! <xsl:variable name="failures" select="count($results/comparing/failure)"/>
! <td>
<xsl:choose>
! <xsl:when test="$failures = 0"><xsl:attribute name="class">passed</xsl:attribute></xsl:when>
! <xsl:when test="$failures < 6"><xsl:attribute name="class">failed</xsl:attribute></xsl:when>
! <xsl:otherwise><xsl:attribute name="class">disaster</xsl:attribute></xsl:otherwise>
</xsl:choose>
! <xsl:value-of select="$failures"/>
! [<a href="{@results-folder}/{$testcase/../folder}/{substring-before($testcase,'.wsdl')}-results.xml">log</a>]
! </td>
! </xsl:when>
! <xsl:otherwise>
! <td>n/a</td>
! </xsl:otherwise>
! </xsl:choose>
</xsl:for-each>
! </tr>
</xsl:for-each>
</table>
--- 23,65 ----
<table>
<tr>
! <td><strong>Testcase</strong></td>
! <td><strong>WSDL</strong></td>
<xsl:for-each select="$implementations//implementation">
! <td><strong><xsl:value-of select="@name"/> failures</strong></td>
</xsl:for-each>
</tr>
! <xsl:for-each select="document('../test-suite.xml')">
! <xsl:for-each select="test-suite/test-case">
! <xsl:variable name="name" select="@id"/>
! <xsl:for-each select="document(@href)">
! <xsl:for-each select="tm:TestMetadata[tm:ExpectedResults/tm:Successful[.='true']]/tm:Inputs/tm:Input">
! <xsl:variable name="testcase" select="."/>
! <tr>
! <td><xsl:value-of select="$name"/></td>
! <td><xsl:value-of select="."/></td>
! <xsl:for-each select="$implementations//implementation">
! <xsl:variable name="results" select="document(concat(@results-folder,'/',$name,'/',substring-before($testcase,'.wsdl'),'-results.xml'))"/>
<xsl:choose>
! <xsl:when test="$results">
! <xsl:variable name="failures" select="count($results/comparing/failure)"/>
! <td>
! <xsl:choose>
! <xsl:when test="$failures = 0"><xsl:attribute name="class">passed</xsl:attribute></xsl:when>
! <xsl:when test="$failures < 6"><xsl:attribute name="class">failed</xsl:attribute></xsl:when>
! <xsl:otherwise><xsl:attribute name="class">disaster</xsl:attribute></xsl:otherwise>
! </xsl:choose>
! <xsl:value-of select="$failures"/>
! [<a href="{@results-folder}/{$testcase/../folder}/{substring-before($testcase,'.wsdl')}-results.xml">log</a>]
! </td>
! </xsl:when>
! <xsl:otherwise>
! <td>n/a</td>
! </xsl:otherwise>
</xsl:choose>
! </xsl:for-each>
! </tr>
! </xsl:for-each>
</xsl:for-each>
! </xsl:for-each>
</xsl:for-each>
</table>
Index: Overview.html
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/Overview.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** Overview.html 20 Jun 2006 19:48:25 -0000 1.15
--- Overview.html 6 Jul 2006 20:50:56 -0000 1.16
***************
*** 1,4 ****
<?xml version="1.0" encoding="UTF-8"?>
! <html>
<head>
<title>Results</title>
--- 1,4 ----
<?xml version="1.0" encoding="UTF-8"?>
! <html xmlns:tm="http://www.w3.org/2006/02/wsdl/TestMetadata">
<head>
<title>Results</title>
***************
[...1012 lines suppressed...]
! [<a href="wsdl-xslt//reservationDetails-results.xml">log</a>]
! </td>
<td class="failed">5
! [<a href="Canon//reservationDetails-results.xml">log</a>]
! </td>
</tr>
<tr>
! <td>XsImport-3G</td>
<td>reservationItems.wsdl</td>
<td class="passed">0
! [<a href="Woden//reservationItems-results.xml">log</a>]
! </td>
<td class="passed">0
! [<a href="wsdl-xslt//reservationItems-results.xml">log</a>]
! </td>
<td class="failed">4
! [<a href="Canon//reservationItems-results.xml">log</a>]
! </td>
</tr>
</table>
--- NEW FILE: validation-results.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:report="http://www.w3.org/2006/06/wsdl/ValidationReport">
<xsl:output method="html"/>
<xsl:variable name="validating-implementations" select="implementations/implementation[@validation-results]"/>
<xsl:template match="/">
<html>
<head>
<title>Validation Results</title>
</head>
<body>
<h3>Validation Results</h3>
<table>
<thead>
<tr>
<td><strong>testcase</strong></td>
<xsl:for-each select="$validating-implementations">
<td><strong><xsl:value-of select="@name"/></strong></td>
</xsl:for-each>
</tr>
</thead>
<tbody>
<xsl:apply-templates select="implementations"/>
</tbody>
</table>
</body>
</html>
</xsl:template>
<xsl:template match="implementations">
<xsl:variable name="report" select="document($validating-implementations/@validation-results)/report:report"/>
<xsl:variable name="test" select="document('../test-suite.xml')"/>
<xsl:for-each select="$test/test-suite/test-case/file">
<tr>
<td><xsl:value-of select="folder"/>/<xsl:value-of select="file"/></td>
<td>
<xsl:for-each select="$report/report:wsdl[substring-after(report:uri,'/documents/bad/')=concat(current()/folder,'/',current()/file)]">
<xsl:value-of select="report:success"/>
</xsl:for-each>
</td>
</tr>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
Index: results.xsl
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/results.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** results.xsl 29 May 2006 15:58:33 -0000 1.4
--- results.xsl 6 Jul 2006 20:50:56 -0000 1.5
***************
*** 4,8 ****
<xsl:variable name="implementations" select="document('../desc/test-suite/results/implementations.xml')"/>
- <xsl:variable name="test-suite" select="document('../desc/test-suite/test-suite.xml')"/>
<xsl:template match="comparing">
--- 4,7 ----
Index: implementations.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/implementations.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** implementations.xml 4 May 2006 03:19:38 -0000 1.1
--- implementations.xml 6 Jul 2006 20:50:56 -0000 1.2
***************
*** 1,5 ****
<?xml-stylesheet type="text/xsl" href="combine.xslt"?>
<implementations>
! <implementation name="Woden" results-folder="Woden"/>
<implementation name="WSDL XSLT" results-folder="wsdl-xslt"/>
<implementation name="Canon" results-folder="Canon"/>
--- 1,6 ----
+ <?xml-stylesheet type="text/xsl" href="validation-results.xsl"?>
<?xml-stylesheet type="text/xsl" href="combine.xslt"?>
<implementations>
! <implementation name="Woden" results-folder="Woden" validation-results="Woden/validation-results.xml"/>
<implementation name="WSDL XSLT" results-folder="wsdl-xslt"/>
<implementation name="Canon" results-folder="Canon"/>
Received on Thursday, 6 July 2006 20:51:36 UTC