Better XPath statements for certain parser/XSLT combinations.

Suggested by: Simon Pepping

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198408 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/layoutengine/testcases/block-container6.xml b/test/layoutengine/testcases/block-container6.xml
index 98365e15d67982cb3bdf7ef8d2373b48ab35ce6c..bc6afe0523b3fa08823d12adcdaad412a156c035 100644 (file)
--- a/test/layoutengine/testcases/block-container6.xml
+++ b/test/layoutengine/testcases/block-container6.xml
@@ -52,14 +52,14 @@
     </fo:root>
   </fo>
   <checks>
-    <true xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text, 'block1')"/>
-    <eval expected="outside block-container" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
-    <true xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea/text, 'block2')"/>
+    <true xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea, 'block1')"/>
+    <eval expected="outside block-container" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+    <true xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea, 'block2')"/>
 
-    <true xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text, 'block3')"/>
-    <true xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea/text, 'block4')"/>
-    <eval expected="outside block-container" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
+    <true xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea, 'block3')"/>
+    <true xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea, 'block4')"/>
+    <eval expected="outside block-container" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
 
-    <true xpath="starts-with(//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text, 'block5')"/>
+    <true xpath="starts-with(//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea, 'block5')"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/line-layout1.xml b/test/layoutengine/testcases/line-layout1.xml
index 4586df8df62e20a22a45a6dd43d2a79ebb133a03..c249bcea3b369b1c1433747c31051b318dff0e84 100644 (file)
--- a/test/layoutengine/testcases/line-layout1.xml
+++ b/test/layoutengine/testcases/line-layout1.xml
@@ -50,19 +50,19 @@ line3
     </fo:root>
   </fo>
   <checks>
-    <eval expected="word1 word2 word3" xpath="//flow/block[1]/lineArea[1]/text"/>
-    <eval expected="word1 word2 word3" xpath="//flow/block[2]/lineArea[1]/text"/>
+    <eval expected="word1 word2 word3" xpath="//flow/block[1]/lineArea[1]"/>
+    <eval expected="word1 word2 word3" xpath="//flow/block[2]/lineArea[1]"/>
     
-    <eval expected="line1" xpath="//flow/block[3]/lineArea[1]/text"/>
-    <eval expected="line2" xpath="//flow/block[3]/lineArea[2]/text"/>
-    <eval expected="line3" xpath="//flow/block[3]/lineArea[3]/text"/>
+    <eval expected="line1" xpath="//flow/block[3]/lineArea[1]"/>
+    <eval expected="line2" xpath="//flow/block[3]/lineArea[2]"/>
+    <eval expected="line3" xpath="//flow/block[3]/lineArea[3]"/>
     
     <true xpath="boolean(//flow/block[4]/lineArea[1])"/>
     <true xpath="not(boolean(//flow/block[4]/lineArea[1]/text))"/>
-    <eval expected="line1" xpath="//flow/block[4]/lineArea[2]/text"/>
-    <eval expected="line2" xpath="//flow/block[4]/lineArea[3]/text"/>
+    <eval expected="line1" xpath="//flow/block[4]/lineArea[2]"/>
+    <eval expected="line2" xpath="//flow/block[4]/lineArea[3]"/>
     <true xpath="boolean(//flow/block[4]/lineArea[4])"/>
     <true xpath="not(boolean(//flow/block[4]/lineArea[4]/text))"/>
-    <eval expected="line3" xpath="//flow/block[4]/lineArea[5]/text"/>
+    <eval expected="line3" xpath="//flow/block[4]/lineArea[5]"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/markers1.xml b/test/layoutengine/testcases/markers1.xml
index fe56f24199e5c37362da3709ede9ca6c506f9e71..757e0859b2e449348bfe70e385f8143959a1ae80 100644 (file)
--- a/test/layoutengine/testcases/markers1.xml
+++ b/test/layoutengine/testcases/markers1.xml
@@ -82,24 +82,24 @@
   </fo>
   <checks>
     <!-- First check that the page breaking is correct -->
-    <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text"/>
-    <eval expected="block2" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea/text"/>
-    <eval expected="block3" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea/text"/>
-    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[4]/block/block[1]/lineArea/text"/>
+    <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
+    <eval expected="block2" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea"/>
+    <eval expected="block3" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea"/>
+    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[4]/block/block[1]/lineArea"/>
 
-    <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text"/>
-    <eval expected="block6" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea/text"/>
-    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea/text"/>
+    <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
+    <eval expected="block6" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea"/>
+    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea"/>
 
     <!-- Now we can check the markers -->
     <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[1]/lineArea/text[2]"/> <!-- page number -->
-    <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text"/>
-    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea/text"/>
-    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[2]/lineArea/text"/>
+    <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
+    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
 
     <eval expected="2" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[1]/lineArea/text[2]"/> <!-- page number -->
-    <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text"/>
-    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea/text"/>
-    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[2]/lineArea/text"/>
+    <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
+    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/markers2.xml b/test/layoutengine/testcases/markers2.xml
index dde720df4dfee569446ae0a9f52726c972e49cb7..b430e570925fc5f4b68ae596b125d7dab15d9cad 100644 (file)
--- a/test/layoutengine/testcases/markers2.xml
+++ b/test/layoutengine/testcases/markers2.xml
@@ -97,17 +97,17 @@
   </fo>
   <checks>
     <!-- First check that the page breaking is correct -->
-    <eval expected="Part 1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea/text"/>
-    <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[2]/lineArea/text"/>
-    <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[3]/lineArea/text"/>
+    <eval expected="Part 1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
+    <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[2]/lineArea"/>
+    <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[3]/lineArea"/>
     <!-- etc... -->
-    <eval expected="text1" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea/text"/>
-    <eval expected="Part 2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[1]/lineArea/text"/>
-    <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[2]/lineArea/text"/>
-    <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[3]/lineArea/text"/>
+    <eval expected="text1" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
+    <eval expected="Part 2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[1]/lineArea"/>
+    <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[2]/lineArea"/>
+    <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[3]/lineArea"/>
     <!-- etc... -->
-    <eval expected="Part 3" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block[1]/lineArea/text"/>
-    <eval expected="text3" xpath="//pageViewport[3]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea/text"/>
+    <eval expected="Part 3" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block[1]/lineArea"/>
+    <eval expected="text3" xpath="//pageViewport[3]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
 
     <!-- Now we can check the markers -->
     <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[2]/regionEnd/block[1]/descendant::lineArea/text"/> 

diff --git a/test/layoutengine/testcases/normal-breaking1.xml b/test/layoutengine/testcases/normal-breaking1.xml
index c3813b8917be18804475881033b6a842a50492a6..5b494ed9a966d3038b7fdc1af85d56ab25960649 100644 (file)
--- a/test/layoutengine/testcases/normal-breaking1.xml
+++ b/test/layoutengine/testcases/normal-breaking1.xml
@@ -59,29 +59,29 @@
     </fo:root>
   </fo>
   <checks>
-    <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
-    <eval expected="block2" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
-    <eval expected="block3" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
-    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text"/>
+    <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+    <eval expected="block2" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+    <eval expected="block3" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+    <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
 
-    <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
-    <eval expected="block6" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
-    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
-    <eval expected="block8" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text"/>
+    <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+    <eval expected="block6" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+    <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+    <eval expected="block8" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
 
-    <eval expected="block9" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
+    <eval expected="block9" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
 
     <!-- second page sequence uses a plain block-container -->
-    <eval expected="block1" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[1]/lineArea/text"/>
-    <eval expected="block2" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[2]/lineArea/text"/>
-    <eval expected="block3" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[3]/lineArea/text"/>
-    <eval expected="block4" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[4]/lineArea/text"/>
+    <eval expected="block1" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[1]/lineArea"/>
+    <eval expected="block2" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[2]/lineArea"/>
+    <eval expected="block3" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[3]/lineArea"/>
+    <eval expected="block4" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[4]/lineArea"/>
 
-    <eval expected="block5" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text"/>
-    <eval expected="block6" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
-    <eval expected="block7" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
-    <eval expected="block8" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text"/>
+    <eval expected="block5" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
+    <eval expected="block6" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+    <eval expected="block7" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+    <eval expected="block8" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
 
-    <eval expected="block9" xpath="//pageViewport[6]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
+    <eval expected="block9" xpath="//pageViewport[6]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/normal-breaking3.xml b/test/layoutengine/testcases/normal-breaking3.xml
index b8dc2fc55768614e5c828e6fa8a9ed90230b31ae..00f6eb9903218661f82927e2cf347574aa270b62 100644 (file)
--- a/test/layoutengine/testcases/normal-breaking3.xml
+++ b/test/layoutengine/testcases/normal-breaking3.xml
@@ -48,9 +48,9 @@ line3
     <!-- contents must be broken to the next page to show the bug. -->
     <eval expected="2" xpath="count(//pageViewport)"/>
     
-    <eval expected="" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]/text"/>
-    <eval expected="line1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[2]/text"/>
-    <eval expected="line2" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]/text"/>
-    <eval expected="line3" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[2]/text"/>
+    <eval expected="" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]"/>
+    <eval expected="line1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[2]"/>
+    <eval expected="line2" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]"/>
+    <eval expected="line3" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[2]"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/table-column1.xml b/test/layoutengine/testcases/table-column1.xml
index f78bb5949ca2db55dfc2509f4e6652a2971a6b64..615181994917ee9ddeb0c1fe6b189b6095a6452a 100644 (file)
--- a/test/layoutengine/testcases/table-column1.xml
+++ b/test/layoutengine/testcases/table-column1.xml
@@ -64,31 +64,31 @@
   <checks>
     
     <!-- cell 1 -->
-    <eval expected="cell1" xpath="//flow/block[1]/block[1]/block[1]/lineArea/text"/>
+    <eval expected="cell1" xpath="//flow/block[1]/block[1]/block[1]/lineArea"/>
     <eval expected="144000" xpath="//flow/block[1]/block[1]/@ipd"/>
 
     <!-- cell 2 -->
-    <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea/text"/>
+    <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
     <eval expected="36000" xpath="//flow/block[1]/block[2]/@ipd"/>
     <eval expected="144000" xpath="//flow/block[1]/block[2]/@left-offset"/>
 
     <!-- cell 3 -->
-    <eval expected="cell3" xpath="//flow/block[1]/block[3]/block[1]/lineArea/text"/>
+    <eval expected="cell3" xpath="//flow/block[1]/block[3]/block[1]/lineArea"/>
     <eval expected="36000" xpath="//flow/block[1]/block[3]/@ipd"/>
     <eval expected="180000" xpath="//flow/block[1]/block[3]/@left-offset"/>
 
     <!-- cell 4 -->
-    <eval expected="cell4" xpath="//flow/block[1]/block[4]/block[1]/lineArea/text"/>
+    <eval expected="cell4" xpath="//flow/block[1]/block[4]/block[1]/lineArea"/>
     <eval expected="36000" xpath="//flow/block[1]/block[4]/@ipd"/>
     <eval expected="216000" xpath="//flow/block[1]/block[4]/@left-offset"/>
 
     <!-- cell 5 -->
-    <eval expected="cell5" xpath="//flow/block[1]/block[5]/block[1]/lineArea/text"/>
+    <eval expected="cell5" xpath="//flow/block[1]/block[5]/block[1]/lineArea"/>
     <eval expected="36000" xpath="//flow/block[1]/block[5]/@ipd"/>
     <eval expected="252000" xpath="//flow/block[1]/block[5]/@left-offset"/>
 
     <!-- cell 6 -->
-    <eval expected="cell6" xpath="//flow/block[1]/block[6]/block[1]/lineArea/text"/>
+    <eval expected="cell6" xpath="//flow/block[1]/block[6]/block[1]/lineArea"/>
     <eval expected="72000" xpath="//flow/block[1]/block[6]/@ipd"/>
     <eval expected="288000" xpath="//flow/block[1]/block[6]/@left-offset"/>
   </checks>

diff --git a/test/layoutengine/testcases/table-column3.xml b/test/layoutengine/testcases/table-column3.xml
index d00fba9526812be61c0811c0153dca50ee237cd9..47eb649723ee8d25f11122e838e13bfad71f7f85 100644 (file)
--- a/test/layoutengine/testcases/table-column3.xml
+++ b/test/layoutengine/testcases/table-column3.xml
@@ -72,27 +72,27 @@
   </fo>
   <checks>
     <!-- cell 1 -->
-    <eval expected="cell1" xpath="//flow/block[1]/block[1]/block[1]/lineArea/text"/>
+    <eval expected="cell1" xpath="//flow/block[1]/block[1]/block[1]/lineArea"/>
     <eval expected="90000" xpath="//flow/block[1]/block[1]/@ipd"/>
 
     <!-- cell 2 -->
-    <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea/text"/>
+    <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
     <eval expected="90000" xpath="//flow/block[1]/block[2]/@ipd"/>
 
     <!-- cell 3 -->
-    <eval expected="cell3" xpath="//flow/block[1]/block[3]/block[1]/lineArea/text"/>
+    <eval expected="cell3" xpath="//flow/block[1]/block[3]/block[1]/lineArea"/>
     <eval expected="180000" xpath="//flow/block[1]/block[3]/@ipd"/>
 
     <!-- cell 4 -->
-    <eval expected="cell4" xpath="//flow/block[2]/block[1]/block[1]/lineArea/text"/>
+    <eval expected="cell4" xpath="//flow/block[2]/block[1]/block[1]/lineArea"/>
     <eval expected="90000" xpath="//flow/block[2]/block[1]/@ipd"/>
 
     <!-- cell 5 -->
-    <eval expected="cell5" xpath="//flow/block[2]/block[2]/block[1]/lineArea/text"/>
+    <eval expected="cell5" xpath="//flow/block[2]/block[2]/block[1]/lineArea"/>
     <eval expected="90000" xpath="//flow/block[2]/block[2]/@ipd"/>
 
     <!-- cell 6 -->
-    <eval expected="cell6" xpath="//flow/block[2]/block[3]/block[1]/lineArea/text"/>
+    <eval expected="cell6" xpath="//flow/block[2]/block[3]/block[1]/lineArea"/>
     <eval expected="180000" xpath="//flow/block[2]/block[3]/@ipd"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/table1.xml b/test/layoutengine/testcases/table1.xml
index afed4748d0dc2b5ca9526367cda52d09f34b5f93..a508e7be1fcc151995f1dee271ec7ca10efc756c 100644 (file)
--- a/test/layoutengine/testcases/table1.xml
+++ b/test/layoutengine/testcases/table1.xml
@@ -69,7 +69,7 @@
     <eval expected="14400" xpath="//flow/block[1]/block[1]/@bpd"/>
     <eval expected="144000" xpath="//flow/block[1]/block[1]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@bpd"/>
-    <eval expected="cell1" xpath="//flow/block[1]/block[1]/block[1]/lineArea/text"/>
+    <eval expected="cell1" xpath="//flow/block[1]/block[1]/block[1]/lineArea"/>
 
     <!-- cell 2 -->
     <true xpath="//flow/block[1]/block[2]/@is-reference-area"/>
@@ -79,7 +79,7 @@
     <eval expected="14400" xpath="//flow/block[1]/block[2]/@bpd"/>
     <eval expected="216000" xpath="//flow/block[1]/block[2]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/>
-    <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea/text"/>
+    <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
     <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[2]/@background"/>
 
     <!-- cell 3 -->
@@ -90,7 +90,7 @@
     <eval expected="14400" xpath="//flow/block[1]/block[3]/@bpd"/>
     <eval expected="144000" xpath="//flow/block[1]/block[3]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[1]/block[3]/block[1]/@bpd"/>
-    <eval expected="cell3" xpath="//flow/block[1]/block[3]/block[1]/lineArea/text"/>
+    <eval expected="cell3" xpath="//flow/block[1]/block[3]/block[1]/lineArea"/>
     <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[3]/@background"/>
 
     <!-- cell 4 -->
@@ -101,6 +101,6 @@
     <eval expected="14400" xpath="//flow/block[1]/block[4]/@bpd"/>
     <eval expected="216000" xpath="//flow/block[1]/block[4]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[1]/block[4]/block[1]/@bpd"/>
-    <eval expected="cell4" xpath="//flow/block[1]/block[4]/block[1]/lineArea/text"/>
+    <eval expected="cell4" xpath="//flow/block[1]/block[4]/block[1]/lineArea"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/table2.xml b/test/layoutengine/testcases/table2.xml
index 12d68ffc7e79748000946e543a49b9c3f984da6e..ff9be4501ce6c7415ef714599554713e7965f0f7 100644 (file)
--- a/test/layoutengine/testcases/table2.xml
+++ b/test/layoutengine/testcases/table2.xml
@@ -80,7 +80,7 @@
     <eval expected="14400" xpath="//flow/block[3]/block[1]/@bpd"/>
     <eval expected="144000" xpath="//flow/block[3]/block[1]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[3]/block[1]/block[1]/@bpd"/>
-    <eval expected="cell1" xpath="//flow/block[3]/block[1]/block[1]/lineArea/text"/>
+    <eval expected="cell1" xpath="//flow/block[3]/block[1]/block[1]/lineArea"/>
 
     <!-- cell 2 -->
     <true xpath="//flow/block[3]/block[2]/@is-reference-area"/>
@@ -90,7 +90,7 @@
     <eval expected="14400" xpath="//flow/block[3]/block[2]/@bpd"/>
     <eval expected="144000" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[3]/block[2]/block[1]/@bpd"/>
-    <eval expected="cell2" xpath="//flow/block[3]/block[2]/block[1]/lineArea/text"/>
+    <eval expected="cell2" xpath="//flow/block[3]/block[2]/block[1]/lineArea"/>
     <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[3]/block[2]/@background"/>
 
     <!-- cell 3 -->
@@ -101,7 +101,7 @@
     <eval expected="14400" xpath="//flow/block[3]/block[3]/@bpd"/>
     <eval expected="144000" xpath="//flow/block[3]/block[3]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[3]/block[3]/block[1]/@bpd"/>
-    <eval expected="cell3" xpath="//flow/block[3]/block[3]/block[1]/lineArea/text"/>
+    <eval expected="cell3" xpath="//flow/block[3]/block[3]/block[1]/lineArea"/>
     <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[3]/block[3]/@background"/>
 
     <!-- cell 4 -->
@@ -112,6 +112,6 @@
     <eval expected="14400" xpath="//flow/block[3]/block[4]/@bpd"/>
     <eval expected="144000" xpath="//flow/block[3]/block[4]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[3]/block[4]/block[1]/@bpd"/>
-    <eval expected="cell4" xpath="//flow/block[3]/block[4]/block[1]/lineArea/text"/>
+    <eval expected="cell4" xpath="//flow/block[3]/block[4]/block[1]/lineArea"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/text-decoration1.xml b/test/layoutengine/testcases/text-decoration1.xml
index 4a11206e8c9758116229963dcb24352314b6802d..74c6240bf51b271f13ceec4f6c4f46d2ed70355a 100644 (file)
--- a/test/layoutengine/testcases/text-decoration1.xml
+++ b/test/layoutengine/testcases/text-decoration1.xml
@@ -55,15 +55,15 @@
     <true xpath="not(//flow/block[1]/lineArea/inlineparent[1]/text/@through-score)"/>
     <true xpath="not(//flow/block[1]/lineArea/inlineparent[1]/text/@through-score-color)"/>
     <eval expected="#000000" xpath="//flow/block[1]/lineArea/inlineparent[1]/text/@underline-score-color"/>
-    <eval expected="underline" xpath="//flow/block[1]/lineArea/inlineparent[1]/text"/>
+    <eval expected="underline" xpath="//flow/block[1]/lineArea/inlineparent[1]"/>
     
     <true xpath="//flow/block[2]/lineArea/inlineparent[1]/text/@overline-score"/>
     <eval expected="#000000" xpath="//flow/block[2]/lineArea/inlineparent[1]/text/@overline-score-color"/>
-    <eval expected="overline" xpath="//flow/block[2]/lineArea/inlineparent[1]/text"/>
+    <eval expected="overline" xpath="//flow/block[2]/lineArea/inlineparent[1]"/>
     
     <true xpath="//flow/block[3]/lineArea/inlineparent[1]/text/@through-score"/>
     <eval expected="#000000" xpath="//flow/block[3]/lineArea/inlineparent[1]/text/@through-score-color"/>
-    <eval expected="line-through" xpath="//flow/block[3]/lineArea/inlineparent[1]/text"/>
+    <eval expected="line-through" xpath="//flow/block[3]/lineArea/inlineparent[1]"/>
     
     <true xpath="//flow/block[4]/lineArea/inlineparent[1]/text/@blink"/>
     <eval expected="blink" xpath="//flow/block[4]/lineArea/inlineparent[1]/text"/>
@@ -75,7 +75,7 @@
     <true xpath="not(//flow/block[5]/lineArea/inlineparent[1]/text/@through-score)"/>
     <eval expected="#000000" xpath="//flow/block[5]/lineArea/inlineparent[1]/text/@underline-score-color"/>
     <eval expected="#000000" xpath="//flow/block[5]/lineArea/inlineparent[1]/text/@overline-score-color"/>
-    <eval expected="over/under" xpath="//flow/block[5]/lineArea/inlineparent[1]/text"/>
+    <eval expected="over/under" xpath="//flow/block[5]/lineArea/inlineparent[1]"/>
 
     <true xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@underline-score"/>
     <true xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@overline-score"/>
@@ -83,7 +83,7 @@
     <eval expected="#000000" xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@underline-score-color"/>
     <eval expected="#000000" xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@overline-score-color"/>
     <eval expected="#000000" xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@through-score-color"/>
-    <eval expected="over/under/through" xpath="//flow/block[6]/lineArea/inlineparent[1]/text"/>
+    <eval expected="over/under/through" xpath="//flow/block[6]/lineArea/inlineparent[1]"/>
     
     <!-- *** on different elements *** -->
     <true xpath="//flow/block[7]/lineArea/text/@underline-score"/>