dmarston    2002/12/04 14:26:12

  Modified:    test/tests/conf/idkey idkey07.xsl idkey07.xml
  Log:
  Overhaul into a processor-independent test.
  
  Revision  Changes    Path
  1.3       +60 -9     xml-xalan/test/tests/conf/idkey/idkey07.xsl
  
  Index: idkey07.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/idkey07.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- idkey07.xsl       17 Jul 2001 18:36:29 -0000      1.2
  +++ idkey07.xsl       4 Dec 2002 22:26:12 -0000       1.3
  @@ -1,4 +1,4 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
   
     <!-- FileName: idkey07 -->
  @@ -6,17 +6,68 @@
     <!-- DocVersion: 19991116 -->
     <!-- Section: 12.4 Miscellaneous Additional Functions  -->
     <!-- Creator: David Marston -->
  -  <!-- Purpose: Test of 'generate-id()' -->
  -  <!-- Should see 2 IDs, blank, 2 more IDs, and all IDs should be different.
  -       Exact strings will vary by processor. -->
  +  <!-- Purpose: Test of generate-id() uniqueness. -->
  +  <!-- All IDs should be different. -->
  +
  +<xsl:output method="xml" encoding="UTF-8" indent="no"/>
   
   <xsl:template match="doc">
     <out>
  -    <xsl:value-of select="generate-id(c)"/><xsl:text>,</xsl:text>
  -    <xsl:value-of select="generate-id(b)"/><xsl:text>,</xsl:text>
  -    <xsl:value-of select="generate-id(d)"/><xsl:text>,</xsl:text>
  -    <xsl:value-of select="generate-id(a)"/><xsl:text>,</xsl:text>
  -    <xsl:value-of select="generate-id()"/><xsl:text></xsl:text>
  +    <xsl:choose>
  +      <xsl:when test="generate-id() = generate-id(a)">
  +        <xsl:text>FAIL on parent-child 'a' element: </xsl:text>
  +        <xsl:value-of select="generate-id()"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(a)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id() = generate-id(b)">
  +        <xsl:text>FAIL on parent-child 'b' element: </xsl:text>
  +        <xsl:value-of select="generate-id()"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(b)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id(a) = generate-id(b)">
  +        <xsl:text>FAIL on child 'a' to child 'b' element: </xsl:text>
  +        <xsl:value-of select="generate-id(a)"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(b)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id() = generate-id(./@att)">
  +        <xsl:text>FAIL on parent-attribute: </xsl:text>
  +        <xsl:value-of select="generate-id()"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(./@att)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id(./@att) = generate-id(a)">
  +        <xsl:text>FAIL on attribute-child 'a' element: </xsl:text>
  +        <xsl:value-of select="generate-id(./@att)"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(a)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id(./@att) = generate-id(b)">
  +        <xsl:text>FAIL on attribute-child 'b' element: </xsl:text>
  +        <xsl:value-of select="generate-id(./@att)"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(b)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id() = generate-id(./text()[1])">
  +        <xsl:text>FAIL on parent-text: </xsl:text>
  +        <xsl:value-of select="generate-id()"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(./text()[1])"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id(./text()[1]) = generate-id(a)">
  +        <xsl:text>FAIL on text-child 'a' element: </xsl:text>
  +        <xsl:value-of select="generate-id(./text()[1])"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(a)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id(./text()[1]) = generate-id(b)">
  +        <xsl:text>FAIL on text-child 'b' element: </xsl:text>
  +        <xsl:value-of select="generate-id(./text()[1])"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(b)"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:when test="generate-id(./@att) = generate-id(./text()[1])">
  +        <xsl:text>FAIL on attribute-text: </xsl:text>
  +        <xsl:value-of select="generate-id(./@att)"/><xsl:text>,  </xsl:text>
  +        <xsl:value-of select="generate-id(./text()[1])"/><xsl:text>&#10;</xsl:text>
  +      </xsl:when>
  +      <xsl:otherwise>
  +        <xsl:text>Success</xsl:text>
  +      </xsl:otherwise>
  +    </xsl:choose>
     </out>
   </xsl:template>
   
  
  
  
  1.2       +4 -6      xml-xalan/test/tests/conf/idkey/idkey07.xml
  
  Index: idkey07.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/idkey07.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- idkey07.xml       15 Dec 2000 19:34:33 -0000      1.1
  +++ idkey07.xml       4 Dec 2002 22:26:12 -0000       1.2
  @@ -1,7 +1,5 @@
  -<?xml version="1.0"?>
  -<doc>
  -<a/>
  -<a/>
  -<b/>
  -<c/>
  +<?xml version="1.0" encoding="UTF-8"?>
  +<doc att="gulp">text1
  +  <a/>
  +  <b/>
   </doc>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to