- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 30 Jun 2006 03:59:47 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite
In directory hutz:/tmp/cvs-serv28025/test-suite
Modified Files:
test-suite-reports.xml test-suite.xml
test-suite-coverage-summary.xml wsdl-coverage.xsl
wsdl-xpaths.xml
Added Files:
build-test-coverage.xml
Log Message:
Added Echo-1G and Feature-1G to Test Suite. Refactored ant script to generate coverage report. Regenerated coverage report.
Index: test-suite-coverage-summary.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/test-suite-coverage-summary.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** test-suite-coverage-summary.xml 29 Jun 2006 04:16:08 -0000 1.6
--- test-suite-coverage-summary.xml 30 Jun 2006 03:59:45 -0000 1.7
***************
*** 3,18 ****
<coverage>
! <item xpath="/wsdl:description//wsdl:documentation" count="63"/>
<item xpath="/wsdl:description/wsdl:import" count="5"/>
<item xpath="/wsdl:description/wsdl:import/@location" count="5"/>
<item xpath="/wsdl:description/wsdl:include" count="3"/>
! <item xpath="/wsdl:description/wsdl:types" count="35"/>
! <item xpath="/wsdl:description/wsdl:types/xs:schema" count="28"/>
<item xpath="/wsdl:description/wsdl:types/xs:import" count="13"/>
! <item xpath="/wsdl:description/wsdl:interface" count="53"/>
<item xpath="/wsdl:description/wsdl:interface/@extends" count="5"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:fault" count="6"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:fault/@element" count="6"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation" count="54"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/@wsdlx:safe" count="3"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/@wrpc:signature" count="1"/>
--- 3,18 ----
<coverage>
! <item xpath="/wsdl:description//wsdl:documentation" count="65"/>
<item xpath="/wsdl:description/wsdl:import" count="5"/>
<item xpath="/wsdl:description/wsdl:import/@location" count="5"/>
<item xpath="/wsdl:description/wsdl:include" count="3"/>
! <item xpath="/wsdl:description/wsdl:types" count="36"/>
! <item xpath="/wsdl:description/wsdl:types/xs:schema" count="29"/>
<item xpath="/wsdl:description/wsdl:types/xs:import" count="13"/>
! <item xpath="/wsdl:description/wsdl:interface" count="55"/>
<item xpath="/wsdl:description/wsdl:interface/@extends" count="5"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:fault" count="6"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:fault/@element" count="6"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation" count="58"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/@wsdlx:safe" count="3"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/@wrpc:signature" count="1"/>
***************
*** 22,26 ****
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/in-only']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/robust-in-only']" count="0"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/in-out']" count="51"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/in-opt-out']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/out-only']" count="0"/>
--- 22,26 ----
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/in-only']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/robust-in-only']" count="0"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/in-out']" count="53"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/in-opt-out']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/out-only']" count="0"/>
***************
*** 28,40 ****
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/out-in']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/out-opt-in']" count="0"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input" count="55"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input/@messageLabel" count="23"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input/@element" count="55"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input[@element='#any']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input[@element='#none']" count="8"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input[@element='#other']" count="0"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output" count="56"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output/@messageLabel" count="23"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output/@element" count="56"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output[@element='#any']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output[@element='#none']" count="0"/>
--- 28,40 ----
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/out-in']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation[@pattern='http://www.w3.org/2006/01/wsdl/out-opt-in']" count="0"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input" count="57"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input/@messageLabel" count="25"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input/@element" count="57"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input[@element='#any']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input[@element='#none']" count="8"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:input[@element='#other']" count="0"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output" count="58"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output/@messageLabel" count="25"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output/@element" count="58"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output[@element='#any']" count="0"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:output[@element='#none']" count="0"/>
***************
*** 44,51 ****
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:outfault" count="11"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:outfault/@messageLabel" count="11"/>
! <item xpath="/wsdl:description/wsdl:binding" count="20"/>
! <item xpath="/wsdl:description/wsdl:binding/@interface" count="11"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:fault" count="9"/>
! <item xpath="/wsdl:description/wsdl:binding/wsdl:operation" count="17"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:input" count="0"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:input/@messageLabel" count="0"/>
--- 44,51 ----
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:outfault" count="11"/>
<item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:outfault/@messageLabel" count="11"/>
! <item xpath="/wsdl:description/wsdl:binding" count="22"/>
! <item xpath="/wsdl:description/wsdl:binding/@interface" count="12"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:fault" count="9"/>
! <item xpath="/wsdl:description/wsdl:binding/wsdl:operation" count="19"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:input" count="0"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:input/@messageLabel" count="0"/>
***************
*** 56,64 ****
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:outfault" count="0"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:outfault/@messageLabel" count="0"/>
! <item xpath="/wsdl:description/wsdl:service" count="15"/>
! <item xpath="/wsdl:description/wsdl:service/wsdl:endpoint" count="17"/>
! <item xpath="/wsdl:description/wsdl:service/wsdl:endpoint/@address" count="7"/>
! <item xpath="/wsdl:description//wsdl:feature" count="0"/>
! <item xpath="/wsdl:description//wsdl:feature/@required" count="0"/>
<item xpath="/wsdl:description//wsdl:property" count="0"/>
</coverage>
--- 56,67 ----
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:outfault" count="0"/>
<item xpath="/wsdl:description/wsdl:binding/wsdl:operation/wsdl:outfault/@messageLabel" count="0"/>
! <item xpath="/wsdl:description/wsdl:service" count="17"/>
! <item xpath="/wsdl:description/wsdl:service/wsdl:endpoint" count="19"/>
! <item xpath="/wsdl:description/wsdl:service/wsdl:endpoint/@address" count="8"/>
! <item xpath="/wsdl:description//wsdl:feature" count="5"/>
! <item xpath="/wsdl:description//wsdl:feature/@required" count="5"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:feature" count="1"/>
! <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:feature" count="2"/>
! <item xpath="/wsdl:description/wsdl:binding/wsdl:feature" count="2"/>
<item xpath="/wsdl:description//wsdl:property" count="0"/>
</coverage>
Index: test-suite-reports.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/test-suite-reports.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** test-suite-reports.xml 29 Jun 2006 04:16:08 -0000 1.2
--- test-suite-reports.xml 30 Jun 2006 03:59:45 -0000 1.3
***************
*** 22,25 ****
--- 22,27 ----
<report>reports/documents/good/Chameleon-4G/getBalance.xml</report>
<report>reports/documents/good/CreditCardFaults-1G/use-credit-card-faults.xml</report>
+ <report>reports/documents/good/Echo-1G/echo.xml</report>
+ <report>reports/documents/good/Feature-1G/bank.xml</report>
<report>reports/documents/good/GreatH-1G/primer-hotelReservationService.xml</report>
<report>reports/documents/good/GreatH-2G/primer-hotelReservationService.xml</report>
Index: wsdl-coverage.xsl
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/wsdl-coverage.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** wsdl-coverage.xsl 29 Jun 2006 04:16:08 -0000 1.4
--- wsdl-coverage.xsl 30 Jun 2006 03:59:45 -0000 1.5
***************
*** 182,185 ****
--- 182,194 ----
<item xpath="/wsdl:description//wsdl:feature/@required" count="{count(/wsdl:description//wsdl:feature/@required)}"/>
</xsl:if>
+ <xsl:if test="count(/wsdl:description/wsdl:interface/wsdl:feature) > 0">
+ <item xpath="/wsdl:description/wsdl:interface/wsdl:feature" count="{count(/wsdl:description/wsdl:interface/wsdl:feature)}"/>
+ </xsl:if>
+ <xsl:if test="count(/wsdl:description/wsdl:interface/wsdl:operation/wsdl:feature) > 0">
+ <item xpath="/wsdl:description/wsdl:interface/wsdl:operation/wsdl:feature" count="{count(/wsdl:description/wsdl:interface/wsdl:operation/wsdl:feature)}"/>
+ </xsl:if>
+ <xsl:if test="count(/wsdl:description/wsdl:binding/wsdl:feature) > 0">
+ <item xpath="/wsdl:description/wsdl:binding/wsdl:feature" count="{count(/wsdl:description/wsdl:binding/wsdl:feature)}"/>
+ </xsl:if>
<xsl:if test="count(/wsdl:description//wsdl:property) > 0">
<item xpath="/wsdl:description//wsdl:property" count="{count(/wsdl:description//wsdl:property)}"/>
--- NEW FILE: build-test-coverage.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
This Ant script generates the coverage reports for the W3C WSDL 2.0 Test Suite.
ChangeLog:
2005-11-11 Arthur Ryman ryman@ca.ibm.com
- Added test coverage summary reports.
-->
<project name="WSDL 2.0 Test Suite Coverage" default="test-suite-coverage-summary" basedir=".">
<target name="xpaths2coverage" description="Transforms the list of XPath expressions into the coverage report stylesheet.">
<xslt style="xpaths2coverage.xsl" in="wsdl-xpaths.xml" out="wsdl-coverage.xsl" />
</target>
<target name="reports" depends="xpaths2coverage" description="Generates coverage reports.">
<delete>
<fileset dir="reports/documents">
<include name="**/*.xml" />
</fileset>
</delete>
<xslt style="wsdl-coverage.xsl" basedir="documents" includes="**/*.wsdl" destdir="reports/documents" extension=".xml" force="yes" />
</target>
<target name="test-suite-reports" description="Generates the list of coverage reports.">
<xslt style="test-suite-reports.xsl" in="test-suite.xml" out="test-suite-reports.xml" force="yes" />
</target>
<target name="test-suite-coverage-summary" depends="reports, test-suite-reports" description="Generates summary of coverage reports.">
<xslt style="test-suite-coverage-summary.xsl" in="wsdl-xpaths.xml" out="test-suite-coverage-summary.xml" force="yes" />
</target>
</project>
Index: test-suite.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/test-suite.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** test-suite.xml 29 Jun 2006 04:16:08 -0000 1.7
--- test-suite.xml 30 Jun 2006 03:59:45 -0000 1.8
***************
*** 83,86 ****
--- 83,94 ----
<file>use-credit-card-faults.wsdl</file>
</test-case>
+ <test-case id="documents/good/Echo-1G">
+ <folder>Echo-1G</folder>
+ <file>echo.wsdl</file>
+ </test-case>
+ <test-case id="documents/good/Feature-1G">
+ <folder>Feature-1G</folder>
+ <file>bank.wsdl</file>
+ </test-case>
<test-case id="documents/good/GreatH-1G">
<folder>GreatH-1G</folder>
Index: wsdl-xpaths.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/wsdl-xpaths.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** wsdl-xpaths.xml 29 Jun 2006 04:16:08 -0000 1.2
--- wsdl-xpaths.xml 30 Jun 2006 03:59:45 -0000 1.3
***************
*** 158,161 ****
--- 158,166 ----
<xpath>/wsdl:description//wsdl:feature</xpath>
<xpath>/wsdl:description//wsdl:feature/@required</xpath>
+
+ <xpath>/wsdl:description/wsdl:interface/wsdl:feature</xpath>
+ <xpath>/wsdl:description/wsdl:interface/wsdl:operation/wsdl:feature</xpath>
+ <xpath>/wsdl:description/wsdl:binding/wsdl:feature</xpath>
+
<xpath>/wsdl:description//wsdl:property</xpath>
Received on Friday, 30 June 2006 03:59:54 UTC