- From: Philippe Le Hegaret via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 18 Nov 2006 11:39:34 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results-messages
In directory hutz:/tmp/cvs-serv3120
Modified Files:
generate-xpath-assertions.xslt
Log Message:
Added httpLocation
Index: generate-xpath-assertions.xslt
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results-messages/generate-xpath-assertions.xslt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** generate-xpath-assertions.xslt 18 Nov 2006 10:22:44 -0000 1.3
--- generate-xpath-assertions.xslt 18 Nov 2006 11:39:32 -0000 1.4
***************
*** 62,66 ****
</xsl:when>
<xsl:when test='m:operation/@mep="http://www.w3.org/2006/01/wsdl/in-out"'>
! <assertion><xsl:value-of select='$msg'/>/l:httpHeaders/l:StatusCode/@value='200'</assertion>
</xsl:when>
<xsl:when test='m:operation/@mep="http://www.w3.org/2006/01/wsdl/in-only"
--- 62,66 ----
</xsl:when>
<xsl:when test='m:operation/@mep="http://www.w3.org/2006/01/wsdl/in-out"'>
! <assertion><xsl:value-of select='$msg'/>/l:httpHeaders/l:StatusCode/@value='200'</assertion>
</xsl:when>
<xsl:when test='m:operation/@mep="http://www.w3.org/2006/01/wsdl/in-only"
***************
*** 81,84 ****
--- 81,96 ----
<assertion><xsl:value-of select='$msg'/>/l:httpHeaders/l:Content-Type[@type='application/soap+xml']/l:action="<xsl:value-of select='m:soapAction'/>"</assertion>
</xsl:if>
+ <xsl:if test='m:httpLocation'>
+ <xsl:choose>
+ <xsl:when test='contains(m:httpLocation, "{int}")'>
+ <assertion>contains(<xsl:value-of select='$msg'/>/l:httpHeaders/l:Method/@rawURI, "<xsl:value-of
+ select='substring-before(m:httpLocation, "{int}")'/>42<xsl:value-of
+ select='substring-after(m:httpLocation, "{int}")'/>")</assertion>
+ </xsl:when>
+ <xsl:otherwise>
+ <assertion>contains(<xsl:value-of select='$msg'/>/l:httpHeaders/l:Method/@rawURI, "<xsl:value-of select='m:httpLocation'/>")</assertion>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
<xsl:if test='m:fault'>
<assertion>count(<xsl:value-of select='$msg'/>/l:content/soap12:Envelope/soap12:Body/*)=1</assertion>
Received on Saturday, 18 November 2006 11:39:46 UTC