Author: vhennebert
Date: Tue Jan 29 03:15:29 2008
New Revision: 616260
URL: http://svn.apache.org/viewvc?rev=616260&view=rev
Log:
Added more tests to ensure no weird things occurs when keep-with-previous/next
is set on table. Runs ok
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous.xml
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next.xml?rev=616260&r1=616259&r2=616260&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next.xml
(original)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-next.xml
Tue Jan 29 03:15:29 2008
@@ -73,5 +73,30 @@
<!-- Line "Before the table" plus the table itself on the second page -->
<eval expected="2" xpath="count(//[EMAIL PROTECTED]//flow/block)"/>
<eval expected="After the table" xpath="//[EMAIL
PROTECTED]//flow/block[2]/lineArea/text[1]"/>
+ <!-- table -->
+ <eval expected="75200" xpath="//[EMAIL
PROTECTED]//flow/block[1]/@bpd"/>
+ <eval expected="83200" xpath="//[EMAIL
PROTECTED]//flow/block[1]/@bpda"/>
+ <eval expected="(solid,#000000,4000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/@border-before"/>
+ <eval expected="(solid,#000000,4000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/@border-after"/>
+ <!-- cell 1.1 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[1]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[1]/@bpda"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[1]/@border-before"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[1]/@border-after"/>
+ <!-- cell 1.2 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[2]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[2]/@bpda"/>
+ <eval expected="(solid,#008080,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[2]/@border-before"/>
+ <eval expected="(solid,#008080,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[2]/@border-after"/>
+ <!-- cell 2.1 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[3]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[3]/@bpda"/>
+ <eval expected="(solid,#008000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[3]/@border-before"/>
+ <eval expected="(solid,#008000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[3]/@border-after"/>
+ <!-- cell 2.2 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[4]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[4]/@bpda"/>
+ <eval expected="(solid,#808000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[4]/@border-before"/>
+ <eval expected="(solid,#808000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[1]/block[4]/@border-after"/>
</checks>
</testcase>
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous.xml?rev=616260&r1=616259&r2=616260&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous.xml
(original)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-with-previous.xml
Tue Jan 29 03:15:29 2008
@@ -73,5 +73,30 @@
<!-- Line "Before the table" plus the table itself on the second page -->
<eval expected="2" xpath="count(//[EMAIL PROTECTED]//flow/block)"/>
<eval expected="Before the table" xpath="//[EMAIL
PROTECTED]//flow/block[1]/lineArea/text[1]"/>
+ <!-- table -->
+ <eval expected="75200" xpath="//[EMAIL
PROTECTED]//flow/block[2]/@bpd"/>
+ <eval expected="83200" xpath="//[EMAIL
PROTECTED]//flow/block[2]/@bpda"/>
+ <eval expected="(solid,#000000,4000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/@border-before"/>
+ <eval expected="(solid,#000000,4000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/@border-after"/>
+ <!-- cell 1.1 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[1]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[1]/@bpda"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[1]/@border-before"/>
+ <eval expected="(solid,#0000ff,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[1]/@border-after"/>
+ <!-- cell 1.2 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[2]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[2]/@bpda"/>
+ <eval expected="(solid,#008080,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[2]/@border-before"/>
+ <eval expected="(solid,#008080,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[2]/@border-after"/>
+ <!-- cell 2.1 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[3]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[3]/@bpda"/>
+ <eval expected="(solid,#008000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[3]/@border-before"/>
+ <eval expected="(solid,#008000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[3]/@border-after"/>
+ <!-- cell 2.2 -->
+ <eval expected="33600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[4]/@bpd"/>
+ <eval expected="37600" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[4]/@bpda"/>
+ <eval expected="(solid,#808000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[4]/@border-before"/>
+ <eval expected="(solid,#808000,2000)" xpath="//[EMAIL
PROTECTED]//flow/block[2]/block[4]/@border-after"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
