summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2005-02-12 20:20:53 +0000
committerJeremias Maerki <jeremias@apache.org>2005-02-12 20:20:53 +0000
commit42cc3d4164154da2e0b03f19f49d4acf3f73471d (patch)
tree9986be8f1e0b0287c1db7d88f7f6eef6c2ba6b14
parent7f9899203326e461413ae6b2f9d2614f0b9eb8d9 (diff)
downloadxmlgraphics-fop-42cc3d4164154da2e0b03f19f49d4acf3f73471d.tar.gz
xmlgraphics-fop-42cc3d4164154da2e0b03f19f49d4acf3f73471d.zip
Simpler and more robust XPath statements.
Suggested by: Simon Pepping git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198427 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--test/layoutengine/testcases/breaks1.xml26
-rw-r--r--test/layoutengine/testcases/breaks2.xml26
2 files changed, 26 insertions, 26 deletions
diff --git a/test/layoutengine/testcases/breaks1.xml b/test/layoutengine/testcases/breaks1.xml
index 758a2b1bb..d0a5d8734 100644
--- a/test/layoutengine/testcases/breaks1.xml
+++ b/test/layoutengine/testcases/breaks1.xml
@@ -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>
diff --git a/test/layoutengine/testcases/breaks2.xml b/test/layoutengine/testcases/breaks2.xml
index 9a259df9b..943152afd 100644
--- a/test/layoutengine/testcases/breaks2.xml
+++ b/test/layoutengine/testcases/breaks2.xml
@@ -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>