Corrected testcase for fix from Luca

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

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 2c69eee686246fa8ad172df16f36bd39990da3b0..91db410575545723dbb34b300e4511ff5a6e55dc 100644 (file)
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -8,7 +8,6 @@ block_word-spacing_text-align_justify.xml
 external-graphic_oversized.xml
 inline-block_keep-together.xml
 inline_block_nested_3.xml
-inline_border_padding_block_nested_2.xml
 inline-container_block_nested.xml
 inline-container_border_padding.xml
 inline_letter-spacing.xml

diff --git a/test/layoutengine/testcases/inline_border_padding_block_nested_2.xml b/test/layoutengine/testcases/inline_border_padding_block_nested_2.xml
index 2f82206d16c609fc5cf1b07456f8de1af7d91375..4f48a4dd2b63d39887ec9abea2132f15c0ffee22 100755 (executable)
--- a/test/layoutengine/testcases/inline_border_padding_block_nested_2.xml
+++ b/test/layoutengine/testcases/inline_border_padding_block_nested_2.xml
@@ -19,8 +19,6 @@
   <info>
     <p>
       This test checks fo:inlines with border and padding properties and nested inner blocks.
-      The 2nd and 3rd tests currently fail with a class cast exception - once that is fixed the checks
-      below need to be updated to the correct measurements.
     </p>
   </info>
   <fo>
@@ -153,13 +151,13 @@
     <eval expected="2000" xpath="//flow/block[8]/lineArea[2]/inlineblockparent/@padding-start"/>
     <eval expected="2000" xpath="//flow/block[8]/lineArea[2]/inlineblockparent/@padding-end"/>
     <eval expected="46130" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
-    <eval expected="49130" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="52130" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>
-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
-    <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
+    <eval expected="2000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
+    <eval expected="2000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
     <eval expected="2000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-start"/>
     <eval expected="2000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>