Checks for marker test cases. markers5b disabled because of a bug with table handling...

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

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 9ecfa09ce80805a51be7fcddff588003bcb1ae2b..550cd57f6e89e90e2d3f3dafac94229e263fae88 100644 (file)
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -1,4 +1,5 @@
 breaks1.xml
 breaks2.xml
+markers5a.xml
 table-row1.xml
 table-cell1.xml
\ No newline at end of file

diff --git a/test/layoutengine/testcases/markers5a.xml b/test/layoutengine/testcases/markers5a.xml
index 00b573d60ebc74acd9ec544b32dc92d5ead092a1..615f1a5021eb25b86e4053ce176035d5e88d50d2 100644 (file)
--- a/test/layoutengine/testcases/markers5a.xml
+++ b/test/layoutengine/testcases/markers5a.xml
@@ -80,5 +80,18 @@
     </fo:root>
   </fo>
   <checks>
+    <!-- page 1 -->
+    <eval expected="0.00" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
+    <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+    <eval expected="1: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+    <eval expected="2: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+    <eval expected="3: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+    <eval expected="4: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[4]/lineArea"/>
+
+    <!-- page 2 -->
+    <eval expected="4.00" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
+    <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+    <eval expected="5: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+    <eval expected="6: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
   </checks>
 </testcase>

diff --git a/test/layoutengine/testcases/markers5b.xml b/test/layoutengine/testcases/markers5b.xml
index 769c894a14c1d6d9926878850e374b972a9dbe9c..ea9ccb4f02812adb3e5e17a7fa76954990ca6839 100644 (file)
--- a/test/layoutengine/testcases/markers5b.xml
+++ b/test/layoutengine/testcases/markers5b.xml
@@ -60,7 +60,7 @@
                 </fo:table-cell>
                 <fo:table-cell>
                   <fo:block>
-                    <fo:marker marker-class-name="previous-total">0</fo:marker>
+                    <fo:marker marker-class-name="previous-total">0.00</fo:marker>
                     <fo:marker marker-class-name="total">1.00</fo:marker>
                   </fo:block>
                 </fo:table-cell>
@@ -142,5 +142,18 @@
     </fo:root>
   </fo>
   <checks>
+    <!-- page 1 -->
+    <eval expected="0.00" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
+    <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+    <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
+    <eval expected="2" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[4]/block[1]/lineArea"/>
+    <eval expected="3" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[7]/block[1]/lineArea"/>
+    <eval expected="4" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[10]/block[1]/lineArea"/>
+
+    <!-- page 2 -->
+    <eval expected="4.00" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
+    <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+    <eval expected="5: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
+    <eval expected="6: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[4]/block[1]/lineArea"/>
   </checks>
 </testcase>