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 cb...@apache.org on 2005/09/15 17:58:49 UTC
svn commit: r289270 -
/xmlgraphics/fop/trunk/test/layoutengine/testcases/table_margin_space-before_space-after.xml
Author: cbowditch
Date: Thu Sep 15 08:58:39 2005
New Revision: 289270
URL: http://svn.apache.org/viewcvs?rev=289270&view=rev
Log:
expected table width was incorrect and now fails due to table width calculation being corrected by Jeremias' last change. I have corrected the expected width
Modified:
xmlgraphics/fop/trunk/test/layoutengine/testcases/table_margin_space-before_space-after.xml
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/table_margin_space-before_space-after.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/table_margin_space-before_space-after.xml?rev=289270&r1=289269&r2=289270&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/table_margin_space-before_space-after.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/table_margin_space-before_space-after.xml Thu Sep 15 08:58:39 2005
@@ -16,104 +16,99 @@
-->
<!-- $Id$ -->
<testcase>
- <info>
- <p>
+ <info>
+ <p>
This test checks basic tables. Tests table spaces and margins.
</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">before table</fo:block>
- <fo:table table-layout="fixed" space-before="5pt" space-after="10pt" margin-left="5pt" margin-right="10pt" width="4in + 15pt" background-color="lightgray">
- <fo:table-column column-width="2in"/>
- <fo:table-column column-width="2in"/>
- <fo:table-body start-indent="0pt" end-indent="0pt">
- <fo:table-row>
- <fo:table-cell>
- <fo:block>cell1</fo:block>
- </fo:table-cell>
- <fo:table-cell background-color="yellow">
- <fo:block>cell2</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell background-color="orange">
- <fo:block text-align="end">cell3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block>cell4</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <fo:block background-color="orange">after table</fo:block>
- <fo:block-container width="4in + 15pt">
- <fo:block space-before="5pt" space-after="10pt" margin-left="5pt" margin-right="10pt" background-color="lightgray">
+ </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">before table</fo:block>
+ <fo:table table-layout="fixed" space-before="5pt" space-after="10pt" margin-left="5pt" margin-right="10pt" width="4in + 15pt" background-color="lightgray">
+ <fo:table-column column-width="2in"/>
+ <fo:table-column column-width="2in"/>
+ <fo:table-body start-indent="0pt" end-indent="0pt">
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>cell1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell background-color="yellow">
+ <fo:block>cell2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell background-color="orange">
+ <fo:block text-align="end">cell3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>cell4</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block background-color="orange">after table</fo:block>
+ <fo:block-container width="4in + 15pt">
+ <fo:block space-before="5pt" space-after="10pt" margin-left="5pt" margin-right="10pt" background-color="lightgray">
reference block
</fo:block>
- </fo:block-container>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <!-- spaces -->
- <eval expected="5000" xpath="//flow/block[2]/@bpd"/>
- <eval expected="10000" xpath="//flow/block[4]/@bpd"/>
-
- <!-- table dimensions -->
- <eval expected="288000" xpath="//flow/block[3]/@ipda"/>
- <eval expected="288000" xpath="//flow/block[3]/@ipd"/>
- <eval expected="28800" xpath="//flow/block[3]/@bpda"/>
- <eval expected="28800" xpath="//flow/block[3]/@bpd"/>
-
- <!-- cell 1 -->
- <true xpath="//flow/block[3]/block[1]/@is-reference-area"/>
- <eval expected="5000" xpath="//flow/block[3]/block[1]/@left-offset"/>
- <true xpath="not(boolean(//flow/block[3]/block[1]/@top-offset)) or (//flow/block[3]/block[1]/@top-offset = 0)"/>
- <eval expected="144000" xpath="//flow/block[3]/block[1]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[1]/@bpd"/>
- <eval expected="144000" xpath="//flow/block[3]/block[1]/block[1]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[1]/block[1]/@bpd"/>
- <eval expected="cell1" xpath="//flow/block[3]/block[1]/block[1]/lineArea"/>
-
- <!-- cell 2 -->
- <true xpath="//flow/block[3]/block[2]/@is-reference-area"/>
- <eval expected="149000" xpath="//flow/block[3]/block[2]/@left-offset"/>
- <true xpath="not(boolean(//flow/block[3]/block[2]/@top-offset)) or (//flow/block[3]/block[2]/@top-offset = 0)"/>
- <eval expected="144000" xpath="//flow/block[3]/block[2]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[2]/@bpd"/>
- <eval expected="144000" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[2]/block[1]/@bpd"/>
- <eval expected="cell2" xpath="//flow/block[3]/block[2]/block[1]/lineArea"/>
- <eval expected="color=#ffff00" xpath="//flow/block[3]/block[2]/@background"/>
-
- <!-- cell 3 -->
- <true xpath="//flow/block[3]/block[3]/@is-reference-area"/>
- <eval expected="5000" xpath="//flow/block[3]/block[3]/@left-offset"/>
- <eval expected="14400" xpath="//flow/block[3]/block[3]/@top-offset"/>
- <eval expected="144000" xpath="//flow/block[3]/block[3]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[3]/@bpd"/>
- <eval expected="144000" xpath="//flow/block[3]/block[3]/block[1]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[3]/block[1]/@bpd"/>
- <eval expected="cell3" xpath="//flow/block[3]/block[3]/block[1]/lineArea"/>
- <eval expected="color=#ffa500" xpath="//flow/block[3]/block[3]/@background"/>
-
- <!-- cell 4 -->
- <true xpath="//flow/block[3]/block[4]/@is-reference-area"/>
- <eval expected="149000" xpath="//flow/block[3]/block[4]/@left-offset"/>
- <eval expected="14400" xpath="//flow/block[3]/block[4]/@top-offset"/>
- <eval expected="144000" xpath="//flow/block[3]/block[4]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[4]/@bpd"/>
- <eval expected="144000" xpath="//flow/block[3]/block[4]/block[1]/@ipd"/>
- <eval expected="14400" xpath="//flow/block[3]/block[4]/block[1]/@bpd"/>
- <eval expected="cell4" xpath="//flow/block[3]/block[4]/block[1]/lineArea"/>
- </checks>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- spaces -->
+ <eval expected="5000" xpath="//flow/block[2]/@bpd"/>
+ <eval expected="10000" xpath="//flow/block[4]/@bpd"/>
+ <!-- table dimensions -->
+ <eval expected="303000" xpath="//flow/block[3]/@ipda"/>
+ <eval expected="303000" xpath="//flow/block[3]/@ipd"/>
+ <eval expected="28800" xpath="//flow/block[3]/@bpda"/>
+ <eval expected="28800" xpath="//flow/block[3]/@bpd"/>
+ <!-- cell 1 -->
+ <true xpath="//flow/block[3]/block[1]/@is-reference-area"/>
+ <eval expected="5000" xpath="//flow/block[3]/block[1]/@left-offset"/>
+ <true xpath="not(boolean(//flow/block[3]/block[1]/@top-offset)) or (//flow/block[3]/block[1]/@top-offset = 0)"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[1]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[1]/@bpd"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[1]/block[1]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[1]/block[1]/@bpd"/>
+ <eval expected="cell1" xpath="//flow/block[3]/block[1]/block[1]/lineArea"/>
+ <!-- cell 2 -->
+ <true xpath="//flow/block[3]/block[2]/@is-reference-area"/>
+ <eval expected="149000" xpath="//flow/block[3]/block[2]/@left-offset"/>
+ <true xpath="not(boolean(//flow/block[3]/block[2]/@top-offset)) or (//flow/block[3]/block[2]/@top-offset = 0)"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[2]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[2]/@bpd"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[2]/block[1]/@bpd"/>
+ <eval expected="cell2" xpath="//flow/block[3]/block[2]/block[1]/lineArea"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[3]/block[2]/@background"/>
+ <!-- cell 3 -->
+ <true xpath="//flow/block[3]/block[3]/@is-reference-area"/>
+ <eval expected="5000" xpath="//flow/block[3]/block[3]/@left-offset"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[3]/@top-offset"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[3]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[3]/@bpd"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[3]/block[1]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[3]/block[1]/@bpd"/>
+ <eval expected="cell3" xpath="//flow/block[3]/block[3]/block[1]/lineArea"/>
+ <eval expected="color=#ffa500" xpath="//flow/block[3]/block[3]/@background"/>
+ <!-- cell 4 -->
+ <true xpath="//flow/block[3]/block[4]/@is-reference-area"/>
+ <eval expected="149000" xpath="//flow/block[3]/block[4]/@left-offset"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[4]/@top-offset"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[4]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[4]/@bpd"/>
+ <eval expected="144000" xpath="//flow/block[3]/block[4]/block[1]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[3]/block[4]/block[1]/@bpd"/>
+ <eval expected="cell4" xpath="//flow/block[3]/block[4]/block[1]/lineArea"/>
+ </checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org