Revert r1067644 (local 'clean' trunk got mixed up with fix for 49877)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1067722 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml b/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
index c25223a4720262be6e784de8c995eea601f2eb94..888de0394d2cc7fd92753d56234852d108fd9570 100644 (file)
--- a/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
+++ b/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
@@ -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"/>