2002/ws/desc/test-suite/results results.xsl,1.5,1.6 wsdlcm-compare.xsl,1.2,1.3

Update of /sources/public/2002/ws/desc/test-suite/results
In directory hutz:/tmp/cvs-serv20614/test-suite/results

Modified Files:
	results.xsl wsdlcm-compare.xsl 
Log Message:
Added indication of the closest xml:id value to help locate problems more quickly.

Index: wsdlcm-compare.xsl
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdlcm-compare.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** wsdlcm-compare.xsl	18 Nov 2006 10:43:52 -0000	1.2
--- wsdlcm-compare.xsl	28 Nov 2006 03:31:27 -0000	1.3
***************
*** 34,38 ****
  				<xsl:when test="count($asp) = 0">
  					<failure>
! 						<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$arc"/></xsl:attribute>
  						<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$arc"/></xsl:attribute>
  						<p>Missing element "<xsl:value-of select="local-name($arc)"/>" in namespace "<xsl:value-of select="namespace-uri($arc)"/>".</p>
--- 34,38 ----
  				<xsl:when test="count($asp) = 0">
  					<failure>
! 						<xsl:call-template name="nearest-id"/>
  						<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$arc"/></xsl:attribute>
  						<p>Missing element "<xsl:value-of select="local-name($arc)"/>" in namespace "<xsl:value-of select="namespace-uri($arc)"/>".</p>
***************
*** 41,44 ****
--- 41,45 ----
  				<xsl:when test="local-name($asp) != local-name($arc) or namespace-uri($asp) != namespace-uri($arc)">
  					<failure>
+ 						<xsl:call-template name="nearest-id"/>
  						<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$asp"/></xsl:attribute>
  						<p>Expected element "<xsl:value-of select="local-name($arc)"/>" in namespace "<xsl:value-of select="namespace-uri($arc)"/>", found element "<xsl:value-of select="local-name($asp)"/>" in namespace "<xsl:value-of select="namespace-uri($asp)"/>".</p>
***************
*** 49,52 ****
--- 50,54 ----
  					<xsl:if test="count($asp/@*) != count($arc/@*)">
  						<failure>
+ 							<xsl:call-template name="nearest-id"/>
  							<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$asp"/></xsl:attribute>
  							<p>Different number of attributes (Expected <xsl:value-of select="count($arc/@*)"/> found <xsl:value-of select="count($asp/@*)"/>).</p>
***************
*** 57,60 ****
--- 59,63 ----
  						<xsl:if test="not($asp-att)">
  							<failure>
+ 								<xsl:call-template name="nearest-id"/>
  								<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$asp"/></xsl:attribute>
  								<p>Attribute "<xsl:value-of select="name(.)"/>" not found.
***************
*** 64,67 ****
--- 67,71 ----
  						<xsl:if test=". != $asp-att">
  							<failure>
+ 								<xsl:call-template name="nearest-id"/>
  								<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$asp"/></xsl:attribute>
  								<p>Attribute "<xsl:value-of select="name(.)"/>" value mismatch (found "<xsl:value-of select="$asp-att"/>", expected "<xsl:value-of select="."/>").
***************
*** 74,77 ****
--- 78,82 ----
  						<xsl:if test="$asp/text() != $arc/text()">
  							<failure>
+ 								<xsl:call-template name="nearest-id"/>
  								<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$asp"/></xsl:attribute>
  								<p>Element "<xsl:value-of select="name(.)"/>" value mismatch (found "<xsl:value-of select="$asp/text()"/>", expected "<xsl:value-of select="$arc/text()"/>").</p>
***************
*** 82,85 ****
--- 87,91 ----
  					<xsl:if test="count($asp/*) != count($arc/*)">
  						<failure>
+ 							<xsl:call-template name="nearest-id"/>
  							<xsl:attribute name="xpath"><xsl:apply-templates mode="xpath" select="$asp"/></xsl:attribute>
  							<p>Different number of children (Expected <xsl:value-of select="count($arc/*)"/> found <xsl:value-of select="count($asp/*)"/>).</p>
***************
*** 103,105 ****
--- 109,116 ----
  		<xsl:apply-templates select="parent::*" mode="xpath"/>/@<xsl:value-of select="name(.)"/>
  	</xsl:template>
+ 	<xsl:template name="nearest-id">
+ 		<xsl:attribute name="nearest-id">
+ 	 		<xsl:value-of select="ancestor-or-self::*[@xml:id][1]/@xml:id"/>
+ 		</xsl:attribute>
+ 	</xsl:template>
  </xsl:stylesheet>

Index: results.xsl
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/results.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** results.xsl	6 Jul 2006 20:50:56 -0000	1.5
--- results.xsl	28 Nov 2006 03:31:27 -0000	1.6
***************
*** 9,12 ****
--- 9,14 ----
  			<head>
  				<title>Test Pass Results</title>
+ 				<link rel="stylesheet" type="text/css"
+ 					href="http://www.w3.org/StyleSheets/TR/base.css"/>
  			</head>
  			<body>
***************
*** 15,19 ****
  				<xsl:for-each select="failure">
  					<dl>
! 						<dt>xpath: <xsl:value-of select="@xpath"/></dt>
  						<dd><xsl:copy-of select="node()"/></dd>
  					</dl>
--- 17,21 ----
  				<xsl:for-each select="failure">
  					<dl>
! 						<dt>xpath: <xsl:value-of select="@xpath"/> (near xml:id="<xsl:value-of select="@nearest-id"/>")</dt>
  						<dd><xsl:copy-of select="node()"/></dd>
  					</dl>

Received on Tuesday, 28 November 2006 03:33:13 UTC