You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/07/26 15:34:28 UTC

svn commit: r225305 - in /xmlgraphics/fop/trunk/test/layoutengine: ./ testcases/

Author: jeremias
Date: Tue Jul 26 06:34:17 2005
New Revision: 225305

URL: http://svn.apache.org/viewcvs?rev=225305&view=rev
Log:
Renamed page-number3 to page-number-citation1.
Systematic ID-testing for most FOs. (there are still a few gaps)
Checks for border/padding/background on external-graphic and instream-foreign-object.

Added:
    xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml
    xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml
    xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml
    xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml
    xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation1.xml
      - copied unchanged from r210075, xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number3.xml
    xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation2.xml
    xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation3.xml
Removed:
    xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number3.xml
Modified:
    xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt

Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt?rev=225305&r1=225304&r2=225305&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt Tue Jul 26 06:34:17 2005
@@ -8,6 +8,8 @@
 list4a.xml
 multi-column3.xml
 normal-breaking4.xml
+page-number-citation2.xml
+page-number-citation3.xml
 table-border-collapse1.xml
 table-border-collapse2.xml
 table-column4.xml

Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml?rev=225305&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml Tue Jul 26 06:34:17 2005
@@ -0,0 +1,53 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks borders and the like on external-graphics.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="orange">
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" border="solid 5pt" padding="5pt" background-color="white"/>
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="10000 10000 10000 10000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
+    <eval expected="color=#ffffff,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/lineArea/viewport/@background"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
+  </checks>
+</testcase>

Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml?rev=225305&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml Tue Jul 26 06:34:17 2005
@@ -0,0 +1,79 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks IDs on inline-level FOs.
+    </p>
+    <p>
+      TODO:
+      Test inline-container, bidi-override once implemented.
+    </p>
+    <p>
+      Notes:
+      The following FOs cannot be tested this way:
+      wrapper, initial-property-set.
+    </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="normal" page-width="5in" page-height="20in" 
+              margin="20pt">
+          <fo:region-body background-color="yellow"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence id="page-sequence1" master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>text<fo:inline id="inline1">inline</fo:inline>text</fo:block>
+          <fo:block>text<fo:wrapper id="wrapper1">wrapper</fo:wrapper>text</fo:block>
+          <fo:block>text<!--fo:inline-container id="inline-container1"><fo:block>inline-container</fo:block></fo:inline-container-->text</fo:block>
+          <fo:block>text<fo:page-number id="page-number1"/>text</fo:block>
+          <fo:block>text<fo:page-number-citation id="page-number-citation1" ref-id="inline1"/>text</fo:block>
+          <fo:block>text<fo:leader id="leader1" leader-pattern="dots" leader-length="2cm"/>text</fo:block>
+          <fo:block>text<fo:character id="char1" character="X"/>text</fo:block>
+          <fo:block>text<!--fo:bidi-override id="bidi1" direction="ltr">bidi-override</fo:bidi-override-->text</fo:block>
+          <fo:block>text<fo:basic-link id="link1" internal-destination="page-number1">link</fo:basic-link>text</fo:block>
+          <fo:block>text<fo:instream-foreign-object id="ifo1" content-height="12pt">
+            <svg:svg viewBox="0 0 20 20">
+              <svg:g style="fill:red; stroke:#000000">
+                <svg:rect x="0" y="0" width="15" height="15"/>
+                <svg:rect x="5" y="5" width="15" height="15"/>
+              </svg:g>
+            </svg:svg>
+          </fo:instream-foreign-object>text</fo:block>
+          <fo:block>text<fo:external-graphic id="eg1" src="../../resources/images/bgimg72dpi.jpg" content-height="12pt"/>text</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="inline1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/inlineparent/@prod-id"/>
+    <!-- wrapper skipped -->
+    <!--eval expected="inline-container1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/???/@prod-id"/-->
+    <eval expected="page-number1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text[2]/@prod-id"/>
+    <eval expected="page-number-citation1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[5]/lineArea/text[2]/@prod-id"/>
+    <eval expected="leader1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[6]/lineArea/inlineparent/@prod-id"/>
+    <eval expected="char1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[7]/lineArea/char/@prod-id"/>
+    <!--eval expected="bidi1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[8]/lineArea/???/@prod-id"/-->
+    <eval expected="link1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[9]/lineArea/inlineparent/@prod-id"/>
+    <eval expected="ifo1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[10]/lineArea/viewport/@prod-id"/>
+    <eval expected="ifo1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[10]/lineArea/viewport/foreignObject/@prod-id"/>
+    <eval expected="eg1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[11]/lineArea/viewport/@prod-id"/>
+  </checks>
+</testcase>

Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml?rev=225305&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml Tue Jul 26 06:34:17 2005
@@ -0,0 +1,56 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks the basics for instream-foreign-object.
+    </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="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>start
+            <fo:instream-foreign-object content-width="20pt" content-height="20pt">
+              <svg:svg viewBox="0 0 20 20">
+                <svg:g style="fill:red; stroke:#000000">
+                  <svg:rect x="0" y="0" width="15" height="15"/>
+                  <svg:rect x="5" y="5" width="15" height="15"/>
+                </svg:g>
+              </svg:svg>
+            </fo:instream-foreign-object>
+            end
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <true xpath="count(//flow/block[1]/lineArea/viewport) = 1" fail-msg="viewport area not found"/>
+    <true xpath="count(//flow/block[1]/lineArea/viewport/foreignObject) = 1" fail-msg="foreign object area not found"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipda"/>
+  </checks>
+</testcase>

Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml?rev=225305&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml Tue Jul 26 06:34:17 2005
@@ -0,0 +1,59 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks the borders and the like for instream-foreign-object.
+    </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="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="orange">
+            <fo:instream-foreign-object content-width="20pt" content-height="20pt" border="solid 5pt" padding="5pt" background-color="white">
+              <svg:svg viewBox="0 0 20 20">
+                <svg:g style="fill:red; stroke:#000000">
+                  <svg:rect x="0" y="0" width="15" height="15"/>
+                  <svg:rect x="5" y="5" width="15" height="15"/>
+                </svg:g>
+              </svg:svg>
+            </fo:instream-foreign-object>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="10000 10000 10000 10000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
+    <eval expected="color=#ffffff,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/lineArea/viewport/@background"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
+  </checks>
+</testcase>

Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation2.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation2.xml?rev=225305&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation2.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation2.xml Tue Jul 26 06:34:17 2005
@@ -0,0 +1,113 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks page-number-citations with all combinations of 
+      definition-level and block-level IDs.
+    </p>
+    <p>
+      TODO:
+      Test table-and-caption and table-caption once implemented.
+    </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="normal" page-width="5in" page-height="5in" 
+              margin="20pt">
+          <fo:region-body background-color="yellow"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence id="page-sequence1" master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block id="block1">block1</fo:block>
+          <fo:list-block id="list1" provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
+            <fo:list-item id="item1">
+              <fo:list-item-label id="item1-label" end-indent="label-end()">
+                <fo:block>•</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body id="item1-body" start-indent="body-start()">
+                <fo:block>here is text in the list item body</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+          <fo:table id="table1" table-layout="fixed" border-collapse="separate">
+            <fo:table-column column-width="100%"/>
+            <fo:table-header id="table-header1">
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>header</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-footer id="table-footer1">
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>footer</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-footer>
+            <fo:table-body id="table-body1">
+              <fo:table-row id="table-row1">
+                <fo:table-cell id="table-cell1">
+                  <fo:block>body-content</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block-container id="block-container1">
+            <fo:block>block-container-content</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body" font-size="8pt">
+          <fo:block><fo:page-number-citation ref-id="page-sequence1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="block1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="list1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="item1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="item1-label"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="item1-body"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="table1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="table-header1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="table-footer1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="table-body1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="table-row1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="table-cell1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="block-container1"/></fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <true fail-msg="no ID for page-sequence" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]"/>
+    <true fail-msg="no ID for block" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]"/>
+    <true fail-msg="no ID for list-block" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]"/>
+    <true fail-msg="no ID for list-item" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]"/>
+    <true fail-msg="no ID for list-item-label" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[5]"/>
+    <true fail-msg="no ID for list-item-body" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[6]"/>
+    <true fail-msg="no ID for table" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[7]"/>
+    <true fail-msg="no ID for table-header" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[8]"/>
+    <true fail-msg="no ID for table-footer" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[9]"/>
+    <true fail-msg="no ID for table-body" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[10]"/>
+    <true fail-msg="no ID for table-row" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[11]"/>
+    <true fail-msg="no ID for table-cell" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[12]"/>
+    <true fail-msg="no ID for block-container" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[13]"/>
+  </checks>
+</testcase>

Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation3.xml?rev=225305&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation3.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation3.xml Tue Jul 26 06:34:17 2005
@@ -0,0 +1,89 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks page-number-citations with all combinations of 
+      inline-level IDs.
+    </p>
+    <p>
+      TODO:
+      Test inline-container, bidi-override once implemented.
+    </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="normal" page-width="5in" page-height="20in" 
+              margin="20pt">
+          <fo:region-body background-color="yellow"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence id="page-sequence1" master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>text<fo:inline id="inline1">inline</fo:inline>text</fo:block>
+          <fo:block>text<fo:wrapper id="wrapper1">wrapper</fo:wrapper>text</fo:block>
+          <fo:block>text<!--fo:inline-container id="inline-container1"><fo:block>inline-container</fo:block></fo:inline-container-->text</fo:block>
+          <fo:block>text<fo:page-number id="page-number1"/>text</fo:block>
+          <fo:block>text<fo:page-number-citation id="page-number-citation1" ref-id="inline1"/>text</fo:block>
+          <fo:block>text<fo:leader id="leader1" leader-pattern="dots" leader-length="2cm"/>text</fo:block>
+          <fo:block>text<fo:character id="char1" character="X"/>text</fo:block>
+          <fo:block>text<!--fo:bidi-override id="bidi1" direction="ltr">bidi-override</fo:bidi-override-->text</fo:block>
+          <fo:block>text<fo:basic-link id="link1" internal-destination="page-number1">link</fo:basic-link>text</fo:block>
+          <fo:block>text<fo:instream-foreign-object id="ifo1" content-height="12pt">
+            <svg:svg viewBox="0 0 20 20">
+              <svg:g style="fill:red; stroke:#000000">
+                <svg:rect x="0" y="0" width="15" height="15"/>
+                <svg:rect x="5" y="5" width="15" height="15"/>
+              </svg:g>
+            </svg:svg>
+          </fo:instream-foreign-object>text</fo:block>
+          <fo:block>text<fo:external-graphic id="eg1" src="../../resources/images/bgimg72dpi.jpg" content-height="12pt"/>text</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body" font-size="8pt">
+          <fo:block><fo:page-number-citation ref-id="inline1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="wrapper1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="inline-container1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="page-number1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="page-number-citation1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="leader1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="char1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="bidi1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="link1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="ifo1"/></fo:block>
+          <fo:block><fo:page-number-citation ref-id="eg1"/></fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <true fail-msg="no ID for inline" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]"/>
+    <true fail-msg="no ID for wrapper" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]"/>
+    <true fail-msg="no ID for inline-container" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]"/>
+    <true fail-msg="no ID for page-number" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]"/>
+    <true fail-msg="no ID for page-number-citation" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[5]"/>
+    <true fail-msg="no ID for leader" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[6]"/>
+    <true fail-msg="no ID for character" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[7]"/>
+    <true fail-msg="no ID for bidi-override" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[8]"/>
+    <true fail-msg="no ID for basik-link" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[9]"/>
+    <true fail-msg="no ID for instream-foreign-object" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[10]"/>
+    <true fail-msg="no ID for external-graphic" xpath="'1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[11]"/>
+  </checks>
+</testcase>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org