Background trait's toString() streamlined. Test cases adjusted accordingly.

Test cases without checks will fail from now on!!!
Checks for certain test cases and the others are added to the disabled list.

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

15 files changed, 69 insertions, 23 deletions

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index f0907e52a..9d2b0e01a 100644
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -1,11 +1,26 @@
+background-image-list1.xml
+background-image-list2.xml
+background-image-table2.xml
+background-image-table3.xml
+background-image-table4.xml
+background-image-table5.xml
+background-image3.xml
+background-image5.xml
+background-image6.xml
+background-image7.xml
 block-container4a.xml
 external-graphic1.xml
 external-graphic2.xml
 inline-block2.xml
+inline-container1.xml
 keep-with-previous2.xml
 keep-with-previous3.xml
 keep-with-previous4.xml
 keep-with-previous5.xml
+leader-dots.xml
+leader-rule.xml
+leader-space.xml
+letter-spacing3.xml
 list4a.xml
 multi-column3.xml
 multi-column4.xml
@@ -13,8 +28,13 @@ normal-breaking4.xml
 page-number3.xml
 page-number-citation2.xml
 page-number-citation3.xml
+space-block2.xml
 table-border-collapse1.xml
 table-border-collapse2.xml
 table-border-separate1.xml
 table-column4.xml
 table-fixed2.xml
+word-spacing1.xml
+word-spacing2.xml
+word-spacing3.xml
+word-spacing4.xml
diff --git a/test/layoutengine/testcases/background-image1.xml b/test/layoutengine/testcases/background-image1.xml
index 8b8c95263..698708739 100644
--- a/test/layoutengine/testcases/background-image1.xml
+++ b/test/layoutengine/testcases/background-image1.xml
@@ -59,5 +59,12 @@
     </fo:root>
   </fo>
   <checks>
+    <eval expected="color=#0000ff" xpath="//flow/block[1]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block[2]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block[3]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=31960,vertical=6960" xpath="//flow/block[4]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=63920,vertical=13920" xpath="//flow/block[5]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=5000,vertical=5000" xpath="//flow/block[6]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=12784,vertical=6960" xpath="//flow/block[7]/@background"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/background-image2.xml b/test/layoutengine/testcases/background-image2.xml
index f13c58784..2b3bbeb0a 100644
--- a/test/layoutengine/testcases/background-image2.xml
+++ b/test/layoutengine/testcases/background-image2.xml
@@ -56,5 +56,11 @@
     </fo:root>
   </fo>
   <checks>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-x,horiz=0,vertical=0" xpath="//flow/block[1]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-y,horiz=0,vertical=0" xpath="//flow/block[2]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat,horiz=0,vertical=0" xpath="//flow/block[3]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block[4]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-x,horiz=0,vertical=10440" xpath="//flow/block[5]/@background"/>
+    <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-y,horiz=47940,vertical=0" xpath="//flow/block[6]/@background"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/background-image3.xml b/test/layoutengine/testcases/background-image3.xml
index 342be43cd..2f480ac03 100644
--- a/test/layoutengine/testcases/background-image3.xml
+++ b/test/layoutengine/testcases/background-image3.xml
@@ -44,5 +44,7 @@
     </fo:root>
   </fo>
   <checks>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>
+    <eval expected="color=null,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=136960,vertical=-8640" xpath="//flow/block[1]/block[1]/block[1]/@background"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/external-graphic3.xml b/test/layoutengine/testcases/external-graphic3.xml
index f7ea0f3b1..f8bfa4d79 100644
--- a/test/layoutengine/testcases/external-graphic3.xml
+++ b/test/layoutengine/testcases/external-graphic3.xml
@@ -40,7 +40,7 @@
   </fo>
   <checks>
     <eval expected="10000 10000 10000 10000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
-    <eval expected="color=#ffffff,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/lineArea/viewport/@background"/>
+    <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/>
     <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
     <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
     <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
diff --git a/test/layoutengine/testcases/ifo3.xml b/test/layoutengine/testcases/ifo3.xml
index 459956115..3a1460ea1 100644
--- a/test/layoutengine/testcases/ifo3.xml
+++ b/test/layoutengine/testcases/ifo3.xml
@@ -46,7 +46,7 @@
   </fo>
   <checks>
     <eval expected="10000 10000 10000 10000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
-    <eval expected="color=#ffffff,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/lineArea/viewport/@background"/>
+    <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/>
     <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
     <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
     <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
diff --git a/test/layoutengine/testcases/indent2.xml b/test/layoutengine/testcases/indent2.xml
index 4f4481c75..87009ee82 100644
--- a/test/layoutengine/testcases/indent2.xml
+++ b/test/layoutengine/testcases/indent2.xml
@@ -61,5 +61,16 @@ the nested block should be indented as well.
     </fo:root>
   </fo>
   <checks>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea[1]/@start-indent"/>
+    <true xpath="boolean(not(//flow/block[1]/lineArea[2]/@start-indent))"/>
+    <true xpath="boolean(not(//flow/block[1]/lineArea[10]/@start-indent))"/>
+    <eval expected="20000" xpath="//flow/block[2]/lineArea[1]/@start-indent"/>
+    <true xpath="boolean(not(//flow/block[2]/lineArea[2]/@start-indent))"/>
+    <true xpath="boolean(not(//flow/block[2]/lineArea[10]/@start-indent))"/>
+
+    <eval expected="20000" xpath="//flow/block[3]/child::*[1]/@start-indent"/>
+    <eval expected="20000" xpath="//flow/block[3]/child::*[2]/lineArea[1]/@start-indent"/>
+    <eval expected="20000" xpath="//flow/block[3]/child::*[3]/@start-indent"/>
+    <true xpath="boolean(not(//flow/block[3]/child::*[4]/@start-indent))"/>
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/inline-block1.xml b/test/layoutengine/testcases/inline-block1.xml
index ef6ae86b9..e0f77824b 100644
--- a/test/layoutengine/testcases/inline-block1.xml
+++ b/test/layoutengine/testcases/inline-block1.xml
@@ -71,19 +71,19 @@
     <true xpath="not(boolean(//flow/block/lineArea[1]/child::*[1]/@background))"/>
     
     <true xpath="boolean(//flow/block/lineArea[2]/inlineparent[1])"/>
-    <eval expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" xpath="//flow/block/lineArea[2]/child::*[1]/@background"/>
+    <eval expected="color=#d3d3d3" xpath="//flow/block/lineArea[2]/child::*[1]/@background"/>
 
     <true xpath="boolean(//flow/block/lineArea[3]/inlineblockparent[1])"/>
-    <eval expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" xpath="//flow/block/lineArea[3]/child::*[1]/@background"/>
+    <eval expected="color=#d3d3d3" xpath="//flow/block/lineArea[3]/child::*[1]/@background"/>
     <true xpath="not(boolean(//flow/block/lineArea[3]/inlineblockparent[1]/block/@background))"/>
 
     <true xpath="boolean(//flow/block/lineArea[4]/inlineblockparent[1])"/>
-    <eval expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" xpath="//flow/block/lineArea[4]/child::*[1]/@background"/>
+    <eval expected="color=#d3d3d3" xpath="//flow/block/lineArea[4]/child::*[1]/@background"/>
     <true xpath="not(boolean(//flow/block/lineArea[4]/inlineblockparent[1]/block/@background))"/>
 
     <eval expected="inlineparent" xpath="local-name(//flow/block/lineArea[5]/child::*[1])"/>
     <eval expected="text" xpath="local-name(//flow/block/lineArea[5]/child::*[2])"/>
-    <eval expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" xpath="//flow/block/lineArea[5]/child::*[1]/@background"/>
+    <eval expected="color=#d3d3d3" xpath="//flow/block/lineArea[5]/child::*[1]/@background"/>
 
     <true xpath="not(boolean(//flow/block/lineArea[6]/child::*[1]/@background))"/>
 
diff --git a/test/layoutengine/testcases/page-master4.xml b/test/layoutengine/testcases/page-master4.xml
index f5d730d04..39c662a57 100644
--- a/test/layoutengine/testcases/page-master4.xml
+++ b/test/layoutengine/testcases/page-master4.xml
@@ -64,25 +64,25 @@
     
     <eval expected="20000" xpath="//regionBefore/@bpda"/>
     <eval expected="300000" xpath="//regionBefore/@ipda"/>
-    <eval expected="color=#ffcccc,repeat=0,horiz=0,vertical=0" xpath="//regionBefore/../@background"/>
+    <eval expected="color=#ffcccc" xpath="//regionBefore/../@background"/>
     
     <eval expected="20000" xpath="//regionAfter/@bpda"/>
     <eval expected="340000" xpath="//regionAfter/@ipda"/>
     <!-- 360pt due to precendence -->
-    <eval expected="color=#cccccc,repeat=0,horiz=0,vertical=0" xpath="//regionAfter/../@background"/>
+    <eval expected="color=#cccccc" xpath="//regionAfter/../@background"/>
     
     <eval expected="320000" xpath="//regionStart/@bpda"/>
     <eval expected="20000" xpath="//regionStart/@ipda"/>
-    <eval expected="color=#ccffcc,repeat=0,horiz=0,vertical=0" xpath="//regionStart/../@background"/>
+    <eval expected="color=#ccffcc" xpath="//regionStart/../@background"/>
     
     <eval expected="20000" xpath="//regionEnd/@bpda"/>
     <eval expected="320000" xpath="//regionEnd/@ipda"/>
     <!-- bpd and ipd flipped due to reference-orientation -->
-    <eval expected="color=#ccccff,repeat=0,horiz=0,vertical=0" xpath="//regionEnd/../@background"/>
+    <eval expected="color=#ccccff" xpath="//regionEnd/../@background"/>
     
     <eval expected="280000" xpath="//regionBody/@bpda"/>
     <eval expected="280000" xpath="//regionBody/@ipda"/>
-    <eval expected="color=#ffffcc,repeat=0,horiz=0,vertical=0" xpath="//regionBody/../@background"/>
+    <eval expected="color=#ffffcc" xpath="//regionBody/../@background"/>
     
   </checks>
 </testcase>
diff --git a/test/layoutengine/testcases/table-border-separate3.xml b/test/layoutengine/testcases/table-border-separate3.xml
index 77d9110cd..12d7e85d5 100644
--- a/test/layoutengine/testcases/table-border-separate3.xml
+++ b/test/layoutengine/testcases/table-border-separate3.xml
@@ -65,11 +65,11 @@
     </fo:root>
   </fo>
   <checks>
-    <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[1]/@background"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/block[1]/@background"/>
     <eval expected="5000 5000 5000 5000" xpath="//flow/block[1]/block[1]/@bap"/>
     <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
 
-    <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[3]/@background"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/block[3]/@background"/>
     <eval expected="5000 5000 5000 5000" xpath="//flow/block[1]/block[3]/@bap"/>
     <eval expected="cell4" xpath="//flow/block[1]/block[4]/block[1]/lineArea"/>
 
diff --git a/test/layoutengine/testcases/table-cell1.xml b/test/layoutengine/testcases/table-cell1.xml
index 64493783e..b573106f1 100644
--- a/test/layoutengine/testcases/table-cell1.xml
+++ b/test/layoutengine/testcases/table-cell1.xml
@@ -128,14 +128,14 @@
     <eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/>
 
     <!-- cell 4: height="20pt" -->
-    <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[4]/@background"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/block[4]/@background"/>
     <eval expected="216000" xpath="//flow/block[1]/block[4]/@ipd"/>
     <eval expected="20000" xpath="//flow/block[1]/block[4]/@bpd"/>
     <eval expected="216000" xpath="//flow/block[1]/block[4]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[1]/block[4]/block[1]/@bpd"/>
 
     <!-- cell 6: block-progression-dimension="20pt" -->
-    <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[6]/@background"/>
+    <eval expected="color=#ffa500" xpath="//flow/block[1]/block[6]/@background"/>
     <eval expected="216000" xpath="//flow/block[1]/block[6]/@ipd"/>
     <eval expected="20000" xpath="//flow/block[1]/block[6]/@bpd"/>
     <eval expected="216000" xpath="//flow/block[1]/block[6]/block[1]/@ipd"/>
diff --git a/test/layoutengine/testcases/table-hf1.xml b/test/layoutengine/testcases/table-hf1.xml
index ec8da5a57..244c7827c 100644
--- a/test/layoutengine/testcases/table-hf1.xml
+++ b/test/layoutengine/testcases/table-hf1.xml
@@ -80,7 +80,7 @@
     <eval expected="57600" xpath="//flow/block[1]/@bpda"/>
 
     <!-- header row background -->
-    <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[1]/@background"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/block[1]/@background"/>
     <eval expected="360000" xpath="//flow/block[1]/block[1]/@ipda"/>
     <eval expected="14400" xpath="//flow/block[1]/block[1]/@bpda"/>
 
@@ -97,7 +97,7 @@
     <eval expected="cell4" xpath="//flow/block[1]/block[7]/block[1]/lineArea"/>
 
     <!-- footer row background -->
-    <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[8]/@background"/>
+    <eval expected="color=#ffa500" xpath="//flow/block[1]/block[8]/@background"/>
     <eval expected="360000" xpath="//flow/block[1]/block[8]/@ipda"/>
     <eval expected="14400" xpath="//flow/block[1]/block[8]/@bpda"/>
 
diff --git a/test/layoutengine/testcases/table-row1.xml b/test/layoutengine/testcases/table-row1.xml
index 98cd6088e..693436e41 100644
--- a/test/layoutengine/testcases/table-row1.xml
+++ b/test/layoutengine/testcases/table-row1.xml
@@ -82,7 +82,7 @@
     <!-- row 2 -->
     <eval expected="360000" xpath="//flow/block[1]/block[3]/@ipd"/>
     <eval expected="20000" xpath="//flow/block[1]/block[3]/@bpd"/> <!-- background-area generated for the row -->
-    <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[3]/@background"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/block[3]/@background"/>
     <eval expected="144000" xpath="//flow/block[1]/block[4]/@ipd"/>
     <eval expected="20000" xpath="//flow/block[1]/block[4]/@bpd"/>
     <eval expected="216000" xpath="//flow/block[1]/block[5]/@ipd"/>
@@ -91,7 +91,7 @@
     <!-- row 3 -->
     <eval expected="360000" xpath="//flow/block[1]/block[6]/@ipd"/>
     <eval expected="20000" xpath="//flow/block[1]/block[6]/@bpd"/> <!-- background-area generated for the row -->
-    <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[6]/@background"/>
+    <eval expected="color=#ffa500" xpath="//flow/block[1]/block[6]/@background"/>
     <eval expected="144000" xpath="//flow/block[1]/block[7]/@ipd"/>
     <eval expected="20000" xpath="//flow/block[1]/block[7]/@bpd"/>
     <eval expected="216000" xpath="//flow/block[1]/block[8]/@ipd"/>
diff --git a/test/layoutengine/testcases/table1.xml b/test/layoutengine/testcases/table1.xml
index a508e7be1..9637febb6 100644
--- a/test/layoutengine/testcases/table1.xml
+++ b/test/layoutengine/testcases/table1.xml
@@ -80,7 +80,7 @@
     <eval expected="216000" xpath="//flow/block[1]/block[2]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/>
     <eval expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
-    <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[2]/@background"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[1]/block[2]/@background"/>
 
     <!-- cell 3 -->
     <true xpath="//flow/block[1]/block[3]/@is-reference-area"/>
@@ -91,7 +91,7 @@
     <eval expected="144000" xpath="//flow/block[1]/block[3]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[1]/block[3]/block[1]/@bpd"/>
     <eval expected="cell3" xpath="//flow/block[1]/block[3]/block[1]/lineArea"/>
-    <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[1]/block[3]/@background"/>
+    <eval expected="color=#ffa500" xpath="//flow/block[1]/block[3]/@background"/>
 
     <!-- cell 4 -->
     <true xpath="//flow/block[1]/block[4]/@is-reference-area"/>
diff --git a/test/layoutengine/testcases/table2.xml b/test/layoutengine/testcases/table2.xml
index 96bcd070b..373ae151f 100644
--- a/test/layoutengine/testcases/table2.xml
+++ b/test/layoutengine/testcases/table2.xml
@@ -93,7 +93,7 @@
     <eval expected="144000" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[3]/block[2]/block[1]/@bpd"/>
     <eval expected="cell2" xpath="//flow/block[3]/block[2]/block[1]/lineArea"/>
-    <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[3]/block[2]/@background"/>
+    <eval expected="color=#ffff00" xpath="//flow/block[3]/block[2]/@background"/>
 
     <!-- cell 3 -->
     <true xpath="//flow/block[3]/block[3]/@is-reference-area"/>
@@ -104,7 +104,7 @@
     <eval expected="144000" xpath="//flow/block[3]/block[3]/block[1]/@ipd"/>
     <eval expected="14400" xpath="//flow/block[3]/block[3]/block[1]/@bpd"/>
     <eval expected="cell3" xpath="//flow/block[3]/block[3]/block[1]/lineArea"/>
-    <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[3]/block[3]/@background"/>
+    <eval expected="color=#ffa500" xpath="//flow/block[3]/block[3]/@background"/>
 
     <!-- cell 4 -->
     <true xpath="//flow/block[3]/block[4]/@is-reference-area"/>