Updated testcase to reflect new code behaviour: gaps between columns are now ignored

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

diff --git a/test/fotree/testcases/column-number_columns_special.fo b/test/fotree/testcases/column-number_columns_special.fo
index 116524ede2d1ab6a8249126e73d19085175db60d..5793de73f6467e6ec51a9ff5dc0fbb06691e3b09 100644 (file)
--- a/test/fotree/testcases/column-number_columns_special.fo
+++ b/test/fotree/testcases/column-number_columns_special.fo
@@ -49,11 +49,11 @@
           <fo:table-row>\r
             <fo:table-cell number-columns-spanned="5">\r
               <test:assert property="column-number" expected="1" />\r
-              <fo:block>This cell should span columns 1, 2, 3, 5, 6</fo:block>\r
+              <fo:block>This cell should span columns 1, 2, 3, 4, 5</fo:block>\r
             </fo:table-cell>\r
             <fo:table-cell>\r
-              <test:assert property="column-number" expected="7" />\r
-              <fo:block>cell for column 7</fo:block>\r
+              <test:assert property="column-number" expected="6" />\r
+              <fo:block>cell for column 6</fo:block>\r
             </fo:table-cell>\r
           </fo:table-row>\r
           <fo:table-row>\r
@@ -69,6 +69,10 @@
               <test:assert property="column-number" expected="3" />\r
               <fo:block>cell for column 3</fo:block>\r
             </fo:table-cell>\r
+            <fo:table-cell>\r
+              <test:assert property="column-number" expected="4" />\r
+              <fo:block>cell for column 4</fo:block>\r
+            </fo:table-cell>\r
             <fo:table-cell>\r
               <test:assert property="column-number" expected="5" />\r
               <fo:block>cell for column 5</fo:block>\r
@@ -76,10 +80,6 @@
             <fo:table-cell>\r
               <test:assert property="column-number" expected="6" />\r
               <fo:block>cell for column 6</fo:block>\r
-            </fo:table-cell>\r
-            <fo:table-cell>\r
-              <test:assert property="column-number" expected="7" />\r
-              <fo:block>cell for column 7</fo:block>\r
             </fo:table-cell>          \r
           </fo:table-row>\r
         </fo:table-body>\r