amiro 01/06/15 13:57:35
Added: test/tests/conf/predicate predicate48.xml predicate48.xsl
predicate49.xml predicate49.xsl predicate50.xml
predicate50.xsl predicate51.xml predicate51.xsl
predicate52.xml predicate52.xsl predicate53.xml
predicate53.xsl predicate54.xml predicate54.xsl
predicate55.xml predicate55.xsl predicate56.xml
predicate56.xsl
Log:
Obtained from: Morten Jorgensen
Submitted by: Tom Amiro
Reviewed by: Dave Marston
Set of new tests from Morten for testing various combinations of logical
ands and ors within predicate expressions
Revision Changes Path
1.1 xml-xalan/test/tests/conf/predicate/predicate48.xml
Index: predicate48.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate48.xsl
Index: predicate48.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate48 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test (a and b) combination of logical expressions in a
predicate. -->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: (a and b)
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="[EMAIL PROTECTED]'1' and @b='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate49.xml
Index: predicate49.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate49.xsl
Index: predicate49.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate49 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test ((a or b) and c) combination of logical expressions in a
predicate -->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: ((a or b) and c)
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="bar[(@a='1' or @b='1') and @c='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate50.xml
Index: predicate50.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate50.xsl
Index: predicate50.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate50 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test (a and (b or c) and d) combination of logical
expressions in a predicate -->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: (a and (b or c) and d):
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="[EMAIL PROTECTED]'1' and (@b='1' or @c='1') and
@d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate51.xml
Index: predicate51.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate51.xsl
Index: predicate51.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate51 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test (a and b or c and d) combination of logical expressions
in a predicate -->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: (a and b or c and d):
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="[EMAIL PROTECTED]'1' and @b='1' or @c='1' and
@d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate52.xml
Index: predicate52.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate52.xsl
Index: predicate52.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate52 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test ((a and b) or (c and d)) combination of logical
expressions in a predicate -->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: ((a and b) or (c and d)):
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="bar[(@a='1' and @b='1') or (@c='1' and @d='1')]">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate53.xml
Index: predicate53.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate53.xsl
Index: predicate53.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate53 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test (a or (b and c) or d) combination of logical expressions
in a predicate-->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: (a or (b and c) or d):
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="[EMAIL PROTECTED]'1' or (@b='1' and @c='1') or
@d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate54.xml
Index: predicate54.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate54.xsl
Index: predicate54.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate54 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test ((a or b) and (c or d)) combination of logical
expressions in a predicate-->
<xsl:template match="foo">
<xsl:text>Test: ((a or b) and (c or d)):
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="bar[(@a='1' or @b='1') and (@c='1' or @d='1')]">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate55.xml
Index: predicate55.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate55.xsl
Index: predicate55.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate55 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test (a or b and c or d) combination of logical expressions
in a predicate-->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: (a or b and c or d):
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="[EMAIL PROTECTED]'1' or @b='1' and @c='1' or @d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/predicate/predicate56.xml
Index: predicate56.xml
===================================================================
<?xml version="1.0"?>
<foo>
<bar a="0" b="0" c="0" d="0" seq="0"/>
<bar a="0" b="0" c="0" d="1" seq="1"/>
<bar a="0" b="0" c="1" d="0" seq="2"/>
<bar a="0" b="0" c="1" d="1" seq="3"/>
<bar a="0" b="1" c="0" d="0" seq="4"/>
<bar a="0" b="1" c="0" d="1" seq="5"/>
<bar a="0" b="1" c="1" d="0" seq="6"/>
<bar a="0" b="1" c="1" d="1" seq="7"/>
<bar a="1" b="0" c="0" d="0" seq="8"/>
<bar a="1" b="0" c="0" d="1" seq="9"/>
<bar a="1" b="0" c="1" d="0" seq="a"/>
<bar a="1" b="0" c="1" d="1" seq="b"/>
<bar a="1" b="1" c="0" d="0" seq="c"/>
<bar a="1" b="1" c="0" d="1" seq="d"/>
<bar a="1" b="1" c="1" d="0" seq="e"/>
<bar a="1" b="1" c="1" d="1" seq="f"/>
</foo>
1.1 xml-xalan/test/tests/conf/predicate/predicate56.xsl
Index: predicate56.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- FileName: predicate56 -->
<!-- Document: http://www.w3.org/TR/xpath -->
<!-- DocVersion: 19991116 -->
<!-- Section: 3.4 -->
<!-- Purpose: Test (a or b or c) combination of logical expressions in a
predicate-->
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
<xsl:text>Test: (a or b or c):
</xsl:text>
<xsl:text>Match: </xsl:text>
<xsl:for-each select="[EMAIL PROTECTED]'1' or @b='1' or @c='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
