Bugzilla #35534

space-* production for list-item.
Fixed the testcase to provide more accurate testing. The .optimum way currently doesn't work, as the page breaker seems to always use the .minimum value (which is 0pt) and the addAreas stage currently doesn't take this into account.

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

diff --git a/test/layoutengine/testcases/list4.xml b/test/layoutengine/testcases/list4.xml
index f9daeaf6f124b19b498cb7e80c3481c8ba3321f9..10ab1c936b38caff36d14b53d0bc3b86a494c3ae 100644 (file)
--- a/test/layoutengine/testcases/list4.xml
+++ b/test/layoutengine/testcases/list4.xml
@@ -31,8 +31,9 @@
       </fo:layout-master-set>\r
       <fo:page-sequence master-reference="normal" white-space-collapse="true">\r
         <fo:flow flow-name="xsl-region-body">\r
+          <fo:block>test</fo:block>\r
           <fo:list-block provisional-distance-between-starts="50pt" provisional-label-separation="5pt">\r
-            <fo:list-item space-before.optimum="1em">\r
+            <fo:list-item space-before="1em">\r
               <fo:list-item-label end-indent="label-end()">\r
                 <fo:block>•</fo:block>\r
               </fo:list-item-label>\r
@@ -40,7 +41,7 @@
                 <fo:block>here is text in the list item body</fo:block>\r
               </fo:list-item-body>\r
             </fo:list-item>\r
-            <fo:list-item space-before.optimum="1em">\r
+            <fo:list-item space-before="1em">\r
               <fo:list-item-label end-indent="label-end()">\r
                 <fo:block>•</fo:block>\r
               </fo:list-item-label>\r
@@ -48,7 +49,7 @@
                 <fo:block>here is text in the list item body</fo:block>\r
               </fo:list-item-body>\r
             </fo:list-item>\r
-            <fo:list-item space-before.optimum="1em">\r
+            <fo:list-item space-before="1em">\r
               <fo:list-item-label end-indent="label-end()">\r
                 <fo:block>•</fo:block>\r
               </fo:list-item-label>\r
@@ -56,7 +57,7 @@
                 <fo:block>here is text in the list item body</fo:block>\r
               </fo:list-item-body>\r
             </fo:list-item>\r
-            <fo:list-item space-before.optimum="1em">\r
+            <fo:list-item space-before="1em">\r
               <fo:list-item-label end-indent="label-end()">\r
                 <fo:block>•</fo:block>\r
               </fo:list-item-label>\r
@@ -64,7 +65,7 @@
                 <fo:block>here is text in the list item body</fo:block>\r
               </fo:list-item-body>\r
             </fo:list-item>\r
-            <fo:list-item space-before.optimum="1em">\r
+            <fo:list-item space-before="1em">\r
               <fo:list-item-label end-indent="label-end()">\r
                 <fo:block>•</fo:block>\r
               </fo:list-item-label>\r
@@ -75,18 +76,28 @@
           </fo:list-block>\r
         </fo:flow>\r
       </fo:page-sequence>\r
-      <!--fo:page-sequence master-reference="normal" white-space-collapse="true">\r
-        <fo:flow flow-name="xsl-region-body">\r
-          <fo:block space-before.optimum="1em">line</fo:block>\r
-          <fo:block space-before.optimum="1em">line</fo:block>\r
-          <fo:block space-before.optimum="1em">line</fo:block>\r
-          <fo:block space-before.optimum="1em">line</fo:block>\r
-          <fo:block space-before.optimum="1em">line</fo:block>\r
-        </fo:flow>\r
-      </fo:page-sequence-->\r
     </fo:root>\r
   </fo>\r
   <checks>\r
     <eval expected="2" xpath="count(//pageViewport)"/>\r
+    <element-list category="breaker">\r
+      <box w="14400"/>\r
+      <penalty w="0" p="0"/>\r
+      <glue w="12000"/>\r
+      <box w="14400"/>\r
+      <penalty w="0" p="0"/>\r
+      <glue w="12000"/>\r
+      <box w="14400"/>\r
+      <penalty w="0" p="0"/>\r
+      <glue w="12000"/>\r
+      <box w="14400"/>\r
+      <penalty w="0" p="0"/>\r
+      <glue w="12000"/>\r
+      <box w="14400"/>\r
+      <penalty w="0" p="0"/>\r
+      <glue w="12000"/>\r
+      <box w="14400"/>\r
+      <skip>3</skip>\r
+    </element-list>\r
   </checks>\r
 </testcase>\r