jeremias    2005/02/07 02:47:58

  Modified:    test/layoutengine/testcases markers5a.xml markers5b.xml
               test/layoutengine disabled-testcases.txt
  Log:
  Checks for marker test cases. markers5b disabled because of a bug with table 
handling that I will fix shortly.
  
  Revision  Changes    Path
  1.2       +14 -1     xml-fop/test/layoutengine/testcases/markers5a.xml
  
  Index: markers5a.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/markers5a.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- markers5a.xml     3 Feb 2005 17:06:29 -0000       1.1
  +++ markers5a.xml     7 Feb 2005 10:47:58 -0000       1.2
  @@ -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>
  
  
  
  1.2       +15 -2     xml-fop/test/layoutengine/testcases/markers5b.xml
  
  Index: markers5b.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/markers5b.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- markers5b.xml     3 Feb 2005 17:06:29 -0000       1.1
  +++ markers5b.xml     7 Feb 2005 10:47:58 -0000       1.2
  @@ -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>
  
  
  
  1.11      +1 -0      xml-fop/test/layoutengine/disabled-testcases.txt
  
  Index: disabled-testcases.txt
  ===================================================================
  RCS file: /home/cvs/xml-fop/test/layoutengine/disabled-testcases.txt,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- disabled-testcases.txt    4 Feb 2005 17:10:57 -0000       1.10
  +++ disabled-testcases.txt    7 Feb 2005 10:47:58 -0000       1.11
  @@ -1,4 +1,5 @@
   breaks1.xml
   breaks2.xml
  +markers5a.xml
   table-row1.xml
   table-cell1.xml
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to