jeremias    2005/01/24 06:05:44

  Modified:    test/layoutengine/testcases page-master1.xml
  Added:       test/layoutengine/testcases page-master2.xml
  Log:
  More page-master testing.
  
  Revision  Changes    Path
  1.2       +27 -1     xml-fop/test/layoutengine/testcases/page-master1.xml
  
  Index: page-master1.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/page-master1.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- page-master1.xml  19 Jan 2005 17:21:08 -0000      1.1
  +++ page-master1.xml  24 Jan 2005 14:05:44 -0000      1.2
  @@ -69,28 +69,54 @@
       </fo:root>
     </fo>
     <checks>
  +    <true xpath="//pageViewport[1]/page/regionViewport/@is-viewport-area"/>
  +    <true 
xpath="//pageViewport[1]/page/regionViewport//regionBody/@is-reference-area"/>
  +    <true 
xpath="//pageViewport[1]/page/regionViewport//regionBody/mainReference/@is-reference-area"/>
  +    <true 
xpath="//pageViewport[1]/page/regionViewport//regionBody/mainReference/span/@is-reference-area"/>
  +    <true 
xpath="//pageViewport[1]/page/regionViewport//regionBody/mainReference/span/flow/@is-reference-area"/>
  +  
       <eval expected="0 0 360000 360000" xpath="//pageViewport[1]/@bounds"/>
       <eval expected="10000 20000 320000 300000" 
xpath="//pageViewport[1]/page/regionViewport/@rect"/>
  +    <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/@ipda"/>
  +    <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/@ipd"/>
  +    <eval expected="300000" 
xpath="//pageViewport[1]/page/regionViewport/@bpda"/>
  +    <eval expected="300000" 
xpath="//pageViewport[1]/page/regionViewport/@bpd"/>
       <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
       <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
   
       <eval expected="0 0 360000 360000" xpath="//pageViewport[2]/@bounds"/>
       <eval expected="20000 20000 320000 320000" 
xpath="//pageViewport[2]/page/regionViewport/@rect"/>
  +    <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@ipda"/>
  +    <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@ipd"/>
  +    <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@bpda"/>
  +    <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@bpd"/>
       <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
       <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
   
       <eval expected="0 0 360000 360000" xpath="//pageViewport[3]/@bounds"/>
       <eval expected="10000 20000 340000 320000" 
xpath="//pageViewport[3]/page/regionViewport/@rect"/>
  +    <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/@ipda"/>
  +    <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/@ipd"/>
  +    <eval expected="320000" 
xpath="//pageViewport[3]/page/regionViewport/@bpda"/>
  +    <eval expected="320000" 
xpath="//pageViewport[3]/page/regionViewport/@bpd"/>
       <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
       <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
   
       <eval expected="0 0 360000 360000" xpath="//pageViewport[4]/@bounds"/>
       <eval expected="10000 20000 340000 310000" 
xpath="//pageViewport[4]/page/regionViewport/@rect"/>
  +    <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/@ipda"/>
  +    <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/@ipd"/>
  +    <eval expected="310000" 
xpath="//pageViewport[4]/page/regionViewport/@bpda"/>
  +    <eval expected="310000" 
xpath="//pageViewport[4]/page/regionViewport/@bpd"/>
       <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
       <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
   
       <eval expected="0 0 360000 360000" xpath="//pageViewport[5]/@bounds"/>
       <eval expected="20000 20000 320000 310000" 
xpath="//pageViewport[5]/page/regionViewport/@rect"/>
  +    <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/@ipda"/>
  +    <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/@ipd"/>
  +    <eval expected="310000" 
xpath="//pageViewport[5]/page/regionViewport/@bpda"/>
  +    <eval expected="310000" 
xpath="//pageViewport[5]/page/regionViewport/@bpd"/>
       <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
       <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
     </checks>
  
  
  
  1.1                  xml-fop/test/layoutengine/testcases/page-master2.xml
  
  Index: page-master2.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
    Copyright 2005 The Apache Software Foundation
  
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
  
         http://www.apache.org/licenses/LICENSE-2.0
  
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
  <!-- $Id: page-master2.xml,v 1.1 2005/01/24 14:05:44 jeremias Exp $ -->
  <testcase>
    <info>
      <p>
        This test checks page-masters (margins part 2).
      </p>
    </info>
    <fo>
      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; 
xmlns:svg="http://www.w3.org/2000/svg";>
        <fo:layout-master-set>
          <fo:simple-page-master master-name="master1" page-width="5in" 
page-height="5in">
            <fo:region-body margin-left="10pt" margin-top="20pt" 
margin-right="30pt" margin-bottom="40pt" background-color="lightgreen"/>
          </fo:simple-page-master>
          <fo:simple-page-master master-name="master2" page-width="5in" 
page-height="5in">
            <fo:region-body margin="20pt" background-color="lightgreen"/>
          </fo:simple-page-master>
          <fo:simple-page-master master-name="master3" page-width="5in" 
page-height="5in">
            <fo:region-body margin="20pt 10pt" background-color="lightgreen"/>
          </fo:simple-page-master>
          <fo:simple-page-master master-name="master4" page-width="5in" 
page-height="5in">
            <fo:region-body margin="20pt 10pt 30pt" 
background-color="lightgreen"/>
          </fo:simple-page-master>
        </fo:layout-master-set>
        <fo:page-sequence master-reference="master1" 
white-space-collapse="true">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>testing margins on region-body</fo:block>
          </fo:flow>
        </fo:page-sequence>
        <fo:page-sequence master-reference="master2" 
white-space-collapse="true">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>testing margin shorthands on region-body (with 1 
value)</fo:block>
          </fo:flow>
        </fo:page-sequence>
        <fo:page-sequence master-reference="master3" 
white-space-collapse="true">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>testing margin shorthands on region-body (with 2 
values)</fo:block>
          </fo:flow>
        </fo:page-sequence>
        <fo:page-sequence master-reference="master4" 
white-space-collapse="true">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>testing margin shorthands on region-body (with 3 
values)</fo:block>
          </fo:flow>
        </fo:page-sequence>
      </fo:root>
    </fo>
    <checks>
      <eval expected="0 0 360000 360000" xpath="//pageViewport[1]/@bounds"/>
      <eval expected="10000 20000 320000 300000" 
xpath="//pageViewport[1]/page/regionViewport/@rect"/>
      <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/@ipda"/>
      <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/@ipd"/>
      <eval expected="300000" 
xpath="//pageViewport[1]/page/regionViewport/@bpda"/>
      <eval expected="300000" 
xpath="//pageViewport[1]/page/regionViewport/@bpd"/>
      <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
      <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
  
      <eval expected="0 0 360000 360000" xpath="//pageViewport[2]/@bounds"/>
      <eval expected="20000 20000 320000 320000" 
xpath="//pageViewport[2]/page/regionViewport/@rect"/>
      <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@ipda"/>
      <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@ipd"/>
      <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@bpda"/>
      <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/@bpd"/>
      <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
      <eval expected="320000" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
  
      <eval expected="0 0 360000 360000" xpath="//pageViewport[3]/@bounds"/>
      <eval expected="10000 20000 340000 320000" 
xpath="//pageViewport[3]/page/regionViewport/@rect"/>
      <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/@ipda"/>
      <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/@ipd"/>
      <eval expected="320000" 
xpath="//pageViewport[3]/page/regionViewport/@bpda"/>
      <eval expected="320000" 
xpath="//pageViewport[3]/page/regionViewport/@bpd"/>
      <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
      <eval expected="340000" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
  
      <eval expected="0 0 360000 360000" xpath="//pageViewport[4]/@bounds"/>
      <eval expected="10000 20000 340000 310000" 
xpath="//pageViewport[4]/page/regionViewport/@rect"/>
      <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/@ipda"/>
      <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/@ipd"/>
      <eval expected="310000" 
xpath="//pageViewport[4]/page/regionViewport/@bpda"/>
      <eval expected="310000" 
xpath="//pageViewport[4]/page/regionViewport/@bpd"/>
      <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
      <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
  
    </checks>
  </testcase>
  
  
  

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

Reply via email to