Author: adelmelle
Date: Sun Feb 6 18:25:21 2011
New Revision: 1067722
URL: http://svn.apache.org/viewvc?rev=1067722&view=rev
Log:
Revert r1067644 (local 'clean' trunk got mixed up with fix for 49877)
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml?rev=1067722&r1=1067721&r2=1067722&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
(original)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
Sun Feb 6 18:25:21 2011
@@ -216,7 +216,12 @@
</fo>
<checks>
<eval expected="0"
xpath="//pageSequence[1]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
- <eval expected="0"
xpath="count(//pageSequence[1]/pageViewport[3]//block[@prod-id='span2'])"/>
+ <eval expected="0"
xpath="//pageSequence[1]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
+ <eval expected="12000"
xpath="//pageSequence[1]/pageViewport[3]//span[2]/@bpd"/>
+ <!-- TODO Replace with the following test once bugs affecting multiple
columns have been
+ corrected
+ <eval expected="0"
xpath="count(//pageSequence[1]/pageViewport[3]//block[@prod-id='span2'])"/>
+ -->
<eval expected="24000"
xpath="//pageSequence[2]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
<eval expected="84000"
xpath="//pageSequence[2]/pageViewport[3]//span[1]/flow[2]/@bpd"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
