jeremias 2005/02/12 12:20:53
Modified: test/layoutengine/testcases breaks2.xml breaks1.xml
Log:
Simpler and more robust XPath statements.
Suggested by: Simon Pepping
Revision Changes Path
1.2 +14 -14 xml-fop/test/layoutengine/testcases/breaks2.xml
Index: breaks2.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/breaks2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- breaks2.xml 31 Jan 2005 13:17:12 -0000 1.1
+++ breaks2.xml 12 Feb 2005 20:20:53 -0000 1.2
@@ -48,18 +48,18 @@
</fo:root>
</fo>
<checks>
- <eval expected="1" xpath="//text[. =
'line1']/../../../../../../../../../@nr"/>
- <eval expected="2" xpath="//text[. =
'line2']/../../../../../../../../../@nr"/>
- <eval expected="2" xpath="//text[. =
'line3']/../../../../../../../../../@nr"/>
- <eval expected="3" xpath="//text[. =
'line4']/../../../../../../../../../@nr"/>
- <eval expected="3" xpath="//text[. =
'line5']/../../../../../../../../../@nr"/>
- <eval expected="4" xpath="//text[. =
'line6']/../../../../../../../../../@nr"/>
- <eval expected="4" xpath="//text[. =
'line7']/../../../../../../../../../@nr"/>
- <eval expected="6" xpath="//text[. =
'line8']/../../../../../../../../../@nr"/>
- <eval expected="6" xpath="//text[. =
'line9']/../../../../../../../../../@nr"/>
- <eval expected="7" xpath="//text[. =
'line10']/../../../../../../../../../@nr"/>
- <eval expected="7" xpath="//text[. =
'line11']/../../../../../../../../../@nr"/>
- <eval expected="9" xpath="//text[. =
'line12']/../../../../../../../../../@nr"/>
- <eval expected="9" xpath="//text[. =
'line13']/../../../../../../../../../@nr"/>
+ <eval expected="1" xpath="//lineArea[. =
'line1']/ancestor::pageViewport/@nr"/>
+ <eval expected="2" xpath="//lineArea[. =
'line2']/ancestor::pageViewport/@nr"/>
+ <eval expected="2" xpath="//lineArea[. =
'line3']/ancestor::pageViewport/@nr"/>
+ <eval expected="3" xpath="//lineArea[. =
'line4']/ancestor::pageViewport/@nr"/>
+ <eval expected="3" xpath="//lineArea[. =
'line5']/ancestor::pageViewport/@nr"/>
+ <eval expected="4" xpath="//lineArea[. =
'line6']/ancestor::pageViewport/@nr"/>
+ <eval expected="4" xpath="//lineArea[. =
'line7']/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[. =
'line8']/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[. =
'line9']/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[. =
'line10']/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[. =
'line11']/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[. =
'line12']/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[. =
'line13']/ancestor::pageViewport/@nr"/>
</checks>
</testcase>
1.2 +14 -14 xml-fop/test/layoutengine/testcases/breaks1.xml
Index: breaks1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/breaks1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- breaks1.xml 31 Jan 2005 13:17:12 -0000 1.1
+++ breaks1.xml 12 Feb 2005 20:20:53 -0000 1.2
@@ -48,18 +48,18 @@
</fo:root>
</fo>
<checks>
- <eval expected="1" xpath="//text[. =
'line1']/../../../../../../../../../@nr"/>
- <eval expected="2" xpath="//text[. =
'line2']/../../../../../../../../../@nr"/>
- <eval expected="2" xpath="//text[. =
'line3']/../../../../../../../../../@nr"/>
- <eval expected="3" xpath="//text[. =
'line4']/../../../../../../../../../@nr"/>
- <eval expected="3" xpath="//text[. =
'line5']/../../../../../../../../../@nr"/>
- <eval expected="4" xpath="//text[. =
'line6']/../../../../../../../../../@nr"/>
- <eval expected="4" xpath="//text[. =
'line7']/../../../../../../../../../@nr"/>
- <eval expected="6" xpath="//text[. =
'line8']/../../../../../../../../../@nr"/>
- <eval expected="6" xpath="//text[. =
'line9']/../../../../../../../../../@nr"/>
- <eval expected="7" xpath="//text[. =
'line10']/../../../../../../../../../@nr"/>
- <eval expected="7" xpath="//text[. =
'line11']/../../../../../../../../../@nr"/>
- <eval expected="9" xpath="//text[. =
'line12']/../../../../../../../../../@nr"/>
- <eval expected="9" xpath="//text[. =
'line13']/../../../../../../../../../@nr"/>
+ <eval expected="1" xpath="//lineArea[. =
'line1']/ancestor::pageViewport/@nr"/>
+ <eval expected="2" xpath="//lineArea[. =
'line2']/ancestor::pageViewport/@nr"/>
+ <eval expected="2" xpath="//lineArea[. =
'line3']/ancestor::pageViewport/@nr"/>
+ <eval expected="3" xpath="//lineArea[. =
'line4']/ancestor::pageViewport/@nr"/>
+ <eval expected="3" xpath="//lineArea[. =
'line5']/ancestor::pageViewport/@nr"/>
+ <eval expected="4" xpath="//lineArea[. =
'line6']/ancestor::pageViewport/@nr"/>
+ <eval expected="4" xpath="//lineArea[. =
'line7']/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[. =
'line8']/ancestor::pageViewport/@nr"/>
+ <eval expected="6" xpath="//lineArea[. =
'line9']/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[. =
'line10']/ancestor::pageViewport/@nr"/>
+ <eval expected="7" xpath="//lineArea[. =
'line11']/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[. =
'line12']/ancestor::pageViewport/@nr"/>
+ <eval expected="9" xpath="//lineArea[. =
'line13']/ancestor::pageViewport/@nr"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
