From: Jeremias Maerki <jeremias@apache.org>
Date: Mon, 31 Jul 2006 09:33:32 +0000 (+0000)
Subject: float_float_none_2.xml did not take the default values for widows/orphans into accoun... 
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7ce830f267fb27a059ee934b533b1ee3d39d22f4;p=xmlgraphics-fop.git

float_float_none_2.xml did not take the default values for widows/orphans into account. The code works as expected for this particular case.

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

diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index 2d1d8318a..f3d61eb2b 100644
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -356,12 +356,6 @@
     <description>Long text cause an IndexOutOfBounds exception</description>
     <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=39414</reference>
   </testcase>
-  <testcase>
-    <name>fo:float float="none" should be split</name>
-    <file>float_float_none_2.xml</file>
-    <description>When float="none", it should be possible to split an fo:float
-      element on several pages.</description>
-  </testcase>
   <testcase>
     <name>Before-floats when no stretch available</name>
     <file>before-float_not-deferred_no-stretch_2.xml</file>
diff --git a/test/layoutengine/standard-testcases/float_float_none_2.xml b/test/layoutengine/standard-testcases/float_float_none_2.xml
index 90f24fdb2..7871085d0 100644
--- a/test/layoutengine/standard-testcases/float_float_none_2.xml
+++ b/test/layoutengine/standard-testcases/float_float_none_2.xml
@@ -49,11 +49,12 @@
 	      "none", which will be split on two pages. The float anchor is
 	      just behind this <fo:inline
 		color="blue">word</fo:inline><fo:float float="none" color="red">
-		<fo:block>
+		<fo:block id="float-content">
 		  This is the float content. This is the float content. This is
 		  the float content. This is the float content. This is the
 		  float content. This is the float content. This is the float
-		  content.
+		  content. This is the float content. This is the float content. 
+          This is the float content.
 		</fo:block>
 	      </fo:float>
 	      This is the end of the block containing the float. This is the
@@ -73,11 +74,13 @@
   </fo>
   <checks>
     <eval expected="2" xpath="count(//pageViewport)"/>
-    <eval expected='This is a block containing a before-float with "float" set to "none".'
-      xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[2]/lineArea[1]/text[1]"/>
+    <eval expected='This is a block containing an fo:float with "float" set to "none", which'
+      xpath="//pageViewport[1]//flow/block[1]/block[2]/lineArea[1]/text[1]"/>
     <eval expected="This is the float content. This is the float content. This is the float"
-      xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[2]/block[1]/lineArea[1]/text[1]"/>
-    <eval expected="43200"
-      xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block[2]/block[1]/@bpd"/>
+      xpath="//pageViewport[1]//flow/block[1]/block[2]/block[1]/lineArea[1]/text[1]"/>
+    <eval expected="28800"
+      xpath="//pageViewport[1]//flow/block[1]/block[2]/block[1]/@bpd"/>
+    <eval expected="28800"
+      xpath="//pageViewport[2]//block[@prod-id='float-content']/@bpd"/>
   </checks>
 </testcase>