You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@locus.apache.org on 2000/12/07 21:42:41 UTC
cvs commit: xml-xalan/test/tests/api-gold Minitest-xalanj2.out MinitestParam.out
curcuru 00/12/07 12:42:40
Added: test/tests/api Minitest.xml Minitest.xsl MinitestParam.xml
MinitestParam.xsl
test/tests/api/impincl MinitestDocument.xml
MinitestImport.xsl MinitestInclude.xsl
test/tests/api-gold Minitest-xalanj2.out MinitestParam.out
Log:
New stylesheets and gold files for Xalan-J 2.x Minitest!
Revision Changes Path
1.1 xml-xalan/test/tests/api/Minitest.xml
Index: Minitest.xml
===================================================================
<?xml version="1.0"?>
<!-- Filename: Minitest.xml -->
<!-- Author: Paul_Dick@lotus.com -->
<!-- Author: Shane_Curcuru@lotus.com updated for Minitest use Dec-00 -->
<Family_Geneologies>
<Family Surname= "The Smith">
<Parents>
<Father First="Lewis" MI="R" Last="Smith">Lew Smith</Father>
<Mother First="Ruth" MI="C" Last="Smith">Ruth Smith</Mother>
<GrandKids>
<gkid>1</gkid>
<gkid>2</gkid>
<gkid>3</gkid>
<gkid>4</gkid>
<gkid>5</gkid>
<gkid>6</gkid>
<gkid>7</gkid>
<gkid>8</gkid>
<gkid>9</gkid>
</GrandKids>
</Parents>
<Children>
<Child>
<Basic_Information>
<Name First="Andy" MI="A" Last="Smith">Andy Smith</Name>
<Address Street="32 Stonefield Dr" Town="Princton" State="NJ" Zip="07642">Stonefield Dr</Address>
<Phone>
<Home>483-23-5432</Home>
<Work/>
<Fax/>
<Celluar/>
</Phone>
<Social_Security>012-23-1234</Social_Security>
</Basic_Information>
<Personal_Information>
<Sex>Male</Sex>
<Age>45</Age>
<Married Kids="2">Yes</Married>
<Family_Information>
<Wife>
<Name First="Suzie" MI="A" Last="Smith">Suzie</Name>
<Age>45</Age>
</Wife>
<Kids>
<Kid ID="1">
<Name First="Julie" MI="A" Last="Smith">Jules</Name>
<Age>9</Age></Kid>
<Kid ID="4">
<Name First="Daniel" MI="L" Last="Smith">Daniel</Name>
<Age>8</Age></Kid></Kids>
</Family_Information>
</Personal_Information>
<Education>
<PA What="Physican Assistant" From="Hannamen College" When="'84">PA</PA>
<BS What="Organic Chemistry" From="Ohio Weslyean University" When="'78">BS</BS>
</Education>
</Child>
<Child>
<Basic_Information>
<Name First="Thomas" MI="B" Last="Smith">Tom Smith</Name>
<Address Street="47 Pondside Lane" Town="Needham" State="MA" Zip="04532">Pondside Lane</Address>
<Phone>
<Home>508.257.2754</Home>
<Work/>
<Fax/>
<Celluar/>
</Phone>
<Social_Security>274-76-2971</Social_Security>
</Basic_Information>
<Personal_Information>
<Sex>Male</Sex>
<Age>30</Age>
<Married Kids="2">Yes</Married>
<Family_Information>
<Wife>
<Name First="Margaret" MI="A" Last="Young">Maggy</Name>
<Age>39</Age>
</Wife>
<Kids>
<Kid ID="3">
<Name First="Joshua" MI="R" Last="Smith">Joshua</Name>
<Age>7</Age></Kid>
<Kid ID="6">
<Name First="Lauren" MI="R" Last="Smith">Lauren</Name>
<Age>5</Age></Kid></Kids>
</Family_Information>
</Personal_Information>
<Education What="Finance" From="Boston University" When="'81">BA</Education>
</Child>
<Child>
<Basic_Information>
<Name First="Henry" MI="M" Last="Smith">Henry Smith</Name>
<Address Street="25 Lakeview" Town="Pittsfield" State="MA" Zip="98623">Lakeview</Address>
<Phone>
<Home>417.645.4954</Home>
<Work/>
<Fax/>
<Celluar/>
</Phone>
<Social_Security>231-45-3590</Social_Security>
</Basic_Information>
<Personal_Information>
<Sex>Male</Sex>
<Age>40</Age>
<Married Kids="2">Yes</Married>
<Family_Information>
<Wife>
<Name First="Elizbeth" MI="Q" Last="Smith">Beth</Name>
<Age>40</Age>
</Wife>
<Kids>
<Kid ID="2">
<Name First="Nathaniel" MI="Q" Last="Smith">Nate</Name>
<Age>8</Age></Kid>
<Kid ID="5">
<Name First="Samual" MI="Q" Last="Smith">Sam</Name>
<Age>7</Age></Kid></Kids>
</Family_Information>
</Personal_Information>
<Education>
<MBA In="Technology MBA" From="Northeastern University" When="'96">MBA</MBA>
<BA In="Applied Physics & Math" From="Mass Institute of Technology" When="'82">BA</BA>
</Education>
</Child>
<Child>
<Basic_Information>
<Name First="Bruce" MI="E" Last="Smith">Bruce Smith</Name>
<Address Street="36 Strawberry Lane" Town="North Attleboro" State="MA" Zip="73564">Strawberry Lane</Address>
<Phone>
<Work>617.432.5607</Work>
<Home>213.457.2190</Home>
<Fax/>
<Celluar/>
</Phone>
<Social_Security>675-00-4312</Social_Security>
</Basic_Information>
<Personal_Information>
<Sex>Male</Sex>
<Age>38</Age>
<Married Kids="1">Yes</Married>
<Family_Information>
<Wife>
<Name First="Betsy" MI="A" Last="Smith">Betsy</Name>
<Age>34</Age>
</Wife>
<Kids>
<Kid ID="7">
<Name First="Benjamin" MI="D" Last="Smith">Ben</Name>
<Age>5</Age></Kid>
<Kid ID="8">
<Name First="Lucy" MI="E" Last="Smith">Lucy</Name>
<Age>2</Age></Kid>
<Kid ID="9">
<Name First="Jake" MI="E" Last="Smith">Jake</Name>
<Age>1</Age></Kid></Kids>
</Family_Information>
</Personal_Information>
<Education What="Computer Science & Psychology" From="University of Maine" When="'84">BA</Education>
</Child>
<Child>
<Basic_Information>
<Name First="Joseph" MI="A" Last="Smith">Joe Smith</Name>
<Address Street="85 Green St." Town="Melrose" State="MA" Zip="02176">Green St.</Address>
<Phone>
<Home>781.665.0539</Home>
<Work/>
<Fax/>
<Celluar/>
</Phone>
<Social_Security>425-46-6982</Social_Security>
</Basic_Information>
<Personal_Information>
<Sex>Male</Sex>
<Age>34</Age>
<Married Kids="0">Yes</Married>
<Family_Information>
<Wife>
<Name First="Lilla" MI="A" Last="Smith">Lilla</Name>
<Age>38</Age>
</Wife>
</Family_Information>
</Personal_Information>
<Education>
<MA What="Education" From="Boston College" When="'92">MA</MA>
<BA What="Political Science" From="University of Maine" When="'89">BA</BA>
</Education>
</Child>
</Children>
</Family>
<Family Surname= "The Westons">
<Parents>
<Father First="Melvin" MI="O" Last="Weston">Melvin Weston</Father>
<Mother First="Elizabeth" MI="A" Last="Harris">Liz Harris</Mother>
<GrandKids>
<gkid>7</gkid>
<gkid>8</gkid>
<gkid>9</gkid>
</GrandKids>
</Parents>
<Children>
<Child>
<Basic_Information>
<Name First="Caroline" MI="A" Last="Weston">Caroline Weston</Name>
<Address Street="Finchly Road" Town="Hanover" State="NH" Zip="23765">Finchly Road</Address>
<Phone>
<Home>715.264.8205</Home>
<Work/>
<Fax/>
<Celluar/>
</Phone>
<Social_Security>09-46-8791</Social_Security>
</Basic_Information>
<Personal_Information>
<Sex>Female</Sex>
<Age>37</Age>
<Married >No</Married>
<Family_Information>
</Family_Information>
</Personal_Information>
<Education What="Administrator" From="Cathrine Gibbs" When="'80">Assoc</Education>
</Child>
<Child>
<Basic_Information>
<Name First="Betsy" MI="A" Last="Weston">Betsy Weston</Name>
<Address Street="36 Strawberry Lane" Town="North Attleboro" State="MA" Zip="73564">Strawberry Lane</Address>
<Phone>
<Work>617.432.5607</Work>
<Home>213.457.2190</Home>
<Celluar/>
</Phone>
<Social_Security>123-46-9876</Social_Security>
</Basic_Information>
<Personal_Information>
<Sex>Female</Sex>
<Age>34</Age>
<Married Kids="1">Yes</Married>
<Family_Information>
<Husband>
<Name First="Bruce" MI="E" Last="Smith">Bruce</Name>
<Age>38</Age>
</Husband>
<Kids>
<Kid ID="7">
<Name First="Benjamin" MI="D" Last="Smith">Ben</Name>
<Age>5</Age></Kid>
<Kid ID="8">
<Name First="Lucy" MI="E" Last="Smith">Lucy</Name>
<Age>2</Age></Kid>
<Kid ID="9">
<Name First="Jake" MI="E" Last="Smith">Jake</Name>
<Age>1</Age></Kid></Kids>
</Family_Information>
</Personal_Information>
<Education>
<MA What="Exercise Physiology" From="Indiania University" When="'89">MA</MA>
<BS What="Kinetics" From="Leeds Poloytechnical" When="'87">BS</BS>
</Education>
</Child>
</Children>
</Family>
</Family_Geneologies>
1.1 xml-xalan/test/tests/api/Minitest.xsl
Index: Minitest.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:smith="url://the.smith.family"
xmlns:weston="url://the.weston.family"
exclude-result-prefixes="smith weston">
<!-- Filename: Minitest.xsl -->
<!-- Author: Paul_Dick@lotus.com -->
<!-- Author: Shane_Curcuru@lotus.com updated for Minitest use Dec-00 -->
<xsl:import href="impincl/MinitestImport.xsl"/>
<xsl:include href="impincl/MinitestInclude.xsl"/>
<xsl:strip-space elements="Family_Geneologies Kids Males"/>
<xsl:output method="xml" indent="yes"/>
<xsl:variable name="root" select="'Families'"/>
<!-- Root xsl:template - start processing here -->
<xsl:key name="KidInfo" match="Kid" use="@ID"/>
<xsl:template match="Family_Geneologies">
<out>
<xsl:apply-templates select="Family"/>
</out>
</xsl:template>
<xsl:template match="Family">
<xsl:text> </xsl:text>
<xsl:call-template name="tree">
<xsl:with-param name="Surname" select="@Surname"/>
</xsl:call-template><xsl:text> </xsl:text>
<xsl:value-of select="@Surname" />
<xsl:apply-templates select="Parents">
<xsl:with-param name="Surname" select="@Surname"/>
</xsl:apply-templates>
<xsl:apply-templates select="Children/Child">
<xsl:sort select="Basic_Information/Name/@First"/>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="Child">
<xsl:text> </xsl:text>
<xsl:value-of select=".//Name"/>'s phone number is <xsl:value-of select=".//Phone/Home"/><xsl:text>.</xsl:text>
<xsl:if test='Personal_Information/Sex[.="Male"]' ><xsl:text/>
He is <xsl:value-of select="Personal_Information/Age"/><xsl:text>. </xsl:text>
</xsl:if>
<xsl:if test='Personal_Information/Sex[.="Female"]' >
She is <xsl:value-of select="Personal_Information/Age"/><xsl:text>. </xsl:text>
</xsl:if>
<xsl:apply-templates select="Personal_Information/Married"/>
</xsl:template>
<xsl:template match ="Personal_Information/Married">
<xsl:variable name="spouse" select="following-sibling::*/Wife/Name | following-sibling::*/child::Husband/child::Name"/>
<xsl:if test='.="Yes"' >
<xsl:value-of select="ancestor::Child/Basic_Information/Name/@First"/> is married to <xsl:value-of select="$spouse"/>
<xsl:text>.</xsl:text>
<xsl:choose>
<xsl:when test="./@Kids > 0">
Their children are <xsl:text/>
<xsl:for-each select="following-sibling::*/child::Kids/child::Kid">
<!--xsl:value-of select="."/-->
<xsl:choose>
<xsl:when test="(position()=last())">
<xsl:value-of select="Name"/>:<xsl:value-of select="Age"/></xsl:when>
<xsl:otherwise>
<xsl:value-of select="Name"/>:<xsl:value-of select="Age"/><xsl:text>, </xsl:text></xsl:otherwise>
</xsl:choose>
<xsl:if test="(position()=last()-1)">and </xsl:if>
</xsl:for-each>
</xsl:when>
<xsl:when test="./@Kids = 0">
They have no kids
</xsl:when>
</xsl:choose>
</xsl:if>
<xsl:if test='.="No"'>
<xsl:value-of select="ancestor::Child/child::Basic_Information/child::Name/@First"/> is not married.
<!-- The following is another way to print out the same message
<xsl:value-of select="../..//Basic_Information/Name/@First"/> is not married -->
</xsl:if>
</xsl:template>
<xsl:template match ="Parents">
<xsl:param name="Surname" select="'Default'"/>
The parents are: <xsl:value-of select="Father/@First"/> and <xsl:value-of select="Mother"/>
<xsl:choose>
<xsl:when test="contains($Surname,'Dicks')">
<xsl:apply-templates select="GrandKids" mode="document"/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="GrandKids" mode="orginal"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/api/MinitestParam.xml
Index: MinitestParam.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<doc>
<selector>
<item number="1">one</item>
<item value="two">2</item>
</selector>
</doc>
1.1 xml-xalan/test/tests/api/MinitestParam.xsl
Index: MinitestParam.xsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="text" />
<!-- Note: params must match various projects' Minitest.java tests -->
<!-- params with select=value -->
<xsl:param name="param1s" select="'default1s'"/>
<xsl:param name="param2s" select="'default2s'"/>
<xsl:param name="param3s" select="default3s"/>
<!-- params with node values -->
<xsl:param name="param1n">'default1n'</xsl:param>
<xsl:param name="param2n">'default2n'</xsl:param>
<xsl:param name="param3n">default3n</xsl:param>
<xsl:template match="doc">
<out>
<xsl:text> </xsl:text>
<xsl:text> :param1s: </xsl:text><xsl:value-of select="$param1s"/>
<xsl:text> :param2s: </xsl:text><xsl:value-of select="$param2s"/>
<xsl:text> :param3s: </xsl:text><xsl:value-of select="$param3s"/>
<xsl:text> </xsl:text>
<xsl:text> :param1n: </xsl:text><xsl:value-of select="$param1n"/>
<xsl:text> :param2n: </xsl:text><xsl:value-of select="$param2n"/>
<xsl:text> :param3n: </xsl:text><xsl:value-of select="$param3n"/>
<xsl:text> </xsl:text>
</out>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/api/impincl/MinitestDocument.xml
Index: MinitestDocument.xml
===================================================================
<?xml version="1.0"?>
<GrandKids>
<gkid>1</gkid>
<gkid>2</gkid>
<gkid>3</gkid>
<gkid>4</gkid>
<gkid>5</gkid>
<gkid>6</gkid>
<gkid>7</gkid>
<gkid>8</gkid>
<gkid>9</gkid>
</GrandKids>
1.1 xml-xalan/test/tests/api/impincl/MinitestImport.xsl
Index: MinitestImport.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- Filename: MinitestImport.xsl -->
<!-- Author: Paul_Dick@lotus.com -->
<xsl:template match="GrandKids" mode="orginal">
They have <xsl:value-of select="count(*)"/> grandchildren: <xsl:text/>
<xsl:for-each select="gkid">
<xsl:value-of select="key('KidInfo',(.))/Name/@First"/>
<xsl:if test="not(position()=last())">, </xsl:if>
<xsl:if test="(position()=last()-1)">and </xsl:if>
</xsl:for-each>
</xsl:template>
<xsl:template match="GrandKids" mode="document">
They should have <xsl:value-of select="count(document('MinitestDocument.xml')/GrandKids/gkid)"/> grandchildren: <xsl:text/>
<xsl:for-each select="gkid">
<xsl:value-of select="key('KidInfo',.)/Name/@First"/>
<xsl:if test="not(position()=last())">, </xsl:if>
<xsl:if test="(position()=last()-1)">and </xsl:if>
</xsl:for-each>
</xsl:template>
<xsl:template match="GrandKids" mode="doc">
They got <xsl:value-of select="count(document('MinitestDocument.xml')/GrandKids/gkid)"/> grandchildren: <xsl:text/>
<xsl:for-each select="document('MinitestDocument.xml')/GrandKids/gkid">
<xsl:value-of select="key('KidInfo',(.))/Name/@First"/>
<xsl:if test="not(position()=last())">, </xsl:if>
<xsl:if test="(position()=last()-1)">and </xsl:if>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/api/impincl/MinitestInclude.xsl
Index: MinitestInclude.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- Filename: MinitestInclude.xsl -->
<!-- Author: Paul_Dick@lotus.com -->
<xsl:template name="tree">
<xsl:param name="Surname" select="Default"/>
<xsl:comment> Create an simplified output tree for each family </xsl:comment><xsl:text> </xsl:text>
<xsl:element name="{$root}">
<xsl:element name="{substring-after($Surname,'The ')}">
<!-- Start with the Parents.-->
<xsl:element name="Parents">
<xsl:for-each select="Parents/Father | Parents/Mother">
<xsl:element name="{name(.)}">
<xsl:value-of select="."/>
</xsl:element>
</xsl:for-each>
</xsl:element>
<!-- Then the Children. -->
<xsl:element name="Children">
<xsl:attribute name="number">
<xsl:value-of select="count(Children/Child)"/>
</xsl:attribute>
<xsl:for-each select="Children/Child">
<xsl:element name="{Personal_Information/Sex}">
<xsl:attribute name="name">
<xsl:value-of select="Basic_Information/Name/@First"/>
</xsl:attribute>
<xsl:choose>
<xsl:when test="Personal_Information/Sex='Male'">
<xsl:attribute name="wife">
<xsl:value-of select="Personal_Information/Family_Information/Wife/Name/@First"/>
</xsl:attribute>
</xsl:when>
<xsl:when test="Personal_Information/Sex='Female'">
<xsl:attribute name="husband">
<xsl:value-of select="Personal_Information/Family_Information/Husband/Name/@First"/>
</xsl:attribute>
</xsl:when>
</xsl:choose>
<xsl:attribute name="kids">
<xsl:value-of select="count(Personal_Information/Family_Information/Kids/Kid)"/>
</xsl:attribute>
<xsl:if test="count(Personal_Information/Family_Information/Kids/Kid)">
<xsl:element name="Kids">
<xsl:for-each select="Personal_Information/Family_Information/Kids/Kid">
<xsl:element name="Grandkid"><xsl:value-of select="Name/@First"/></xsl:element>
</xsl:for-each>
</xsl:element>
</xsl:if>
<xsl:value-of select="Basic_Information/Name/@First"/>
</xsl:element>
</xsl:for-each>
</xsl:element>
</xsl:element>
</xsl:element>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/api-gold/Minitest-xalanj2.out
Index: Minitest-xalanj2.out
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<out>
<!-- Create an simplified output tree for each family -->
<Families>
<Smith>
<Parents>
<Father>Lew Smith</Father>
<Mother>Ruth Smith</Mother>
</Parents>
<Children number="5">
<Male name="Andy" wife="Suzie" kids="2">
<Kids>
<Grandkid>Julie</Grandkid>
<Grandkid>Daniel</Grandkid>
</Kids>Andy</Male>
<Male name="Thomas" wife="Margaret" kids="2">
<Kids>
<Grandkid>Joshua</Grandkid>
<Grandkid>Lauren</Grandkid>
</Kids>Thomas</Male>
<Male name="Henry" wife="Elizbeth" kids="2">
<Kids>
<Grandkid>Nathaniel</Grandkid>
<Grandkid>Samual</Grandkid>
</Kids>Henry</Male>
<Male name="Bruce" wife="Betsy" kids="3">
<Kids>
<Grandkid>Benjamin</Grandkid>
<Grandkid>Lucy</Grandkid>
<Grandkid>Jake</Grandkid>
</Kids>Bruce</Male>
<Male name="Joseph" wife="Lilla" kids="0">Joseph</Male>
</Children>
</Smith>
</Families>
The Smith
The parents are: Lewis and Ruth Smith
They have 9 grandchildren: Julie, Nathaniel, Joshua, Daniel, Samual, Lauren, Benjamin, Lucy, and Jake
Andy Smith's phone number is 483-23-5432.
He is 45. Andy is married to Suzie.
Their children are Jules:9, and Daniel:8
Bruce Smith's phone number is 213.457.2190.
He is 38. Bruce is married to Betsy.
Their children are Ben:5, Lucy:2, and Jake:1
Henry Smith's phone number is 417.645.4954.
He is 40. Henry is married to Beth.
Their children are Nate:8, and Sam:7
Joe Smith's phone number is 781.665.0539.
He is 34. Joseph is married to Lilla.
They have no kids
Tom Smith's phone number is 508.257.2754.
He is 30. Thomas is married to Maggy.
Their children are Joshua:7, and Lauren:5
<!-- Create an simplified output tree for each family -->
<Families>
<Westons>
<Parents>
<Father>Melvin Weston</Father>
<Mother>Liz Harris</Mother>
</Parents>
<Children number="2">
<Female name="Caroline" husband="" kids="0">Caroline</Female>
<Female name="Betsy" husband="Bruce" kids="3">
<Kids>
<Grandkid>Benjamin</Grandkid>
<Grandkid>Lucy</Grandkid>
<Grandkid>Jake</Grandkid>
</Kids>Betsy</Female>
</Children>
</Westons>
</Families>
The Westons
The parents are: Melvin and Liz Harris
They have 3 grandchildren: Benjamin, Lucy, and Jake
Betsy Weston's phone number is 213.457.2190.
She is 34. Betsy is married to Bruce.
Their children are Ben:5, Lucy:2, and Jake:1
Caroline Weston's phone number is 715.264.8205.
She is 37. Caroline is not married.
</out>
1.1 xml-xalan/test/tests/api-gold/MinitestParam.out
Index: MinitestParam.out
===================================================================
:param1s: 1234 :param2s: default2s :param3s:
:param1n: new-param1n-value :param2n: 'default2n' :param3n: default3n