From 0183284de24e0eca02c4db434a1428a3c9c8a13d Mon Sep 17 00:00:00 2001
From: "Andreas L. Delmelle" <adelmelle@apache.org>
Date: Sun, 18 Sep 2005 00:02:35 +0000
Subject: [PATCH] Update of FOTree testcases for column-number property

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@289867 13f79535-47bb-0310-9956-ffa450edef68
---
 .../testcases/column-number_cells_body.fo     | 145 +++++++++++++
 .../column-number_cells_out-of-order.fo       | 200 ++++++++++++++++++
 .../testcases/column-number_cells_rows.fo     | 169 +++++++++++++++
 .../column-number_columns_special.fo          |  72 +++++++
 4 files changed, 586 insertions(+)
 create mode 100644 test/fotree/testcases/column-number_cells_body.fo
 create mode 100644 test/fotree/testcases/column-number_cells_out-of-order.fo
 create mode 100644 test/fotree/testcases/column-number_cells_rows.fo
 create mode 100644 test/fotree/testcases/column-number_columns_special.fo

diff --git a/test/fotree/testcases/column-number_cells_body.fo b/test/fotree/testcases/column-number_cells_body.fo
new file mode 100644
index 000000000..97cfb2e1e
--- /dev/null
+++ b/test/fotree/testcases/column-number_cells_body.fo
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+         xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" 
+          margin="20pt">
+      <fo:region-body />
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal">
+    <fo:flow flow-name="xsl-region-body">
+      <!--  table with explicit columns -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-column column-width="proportional-column-width(1)">
+          <test:assert property="column-number" expected="1" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(2)">
+          <test:assert property="column-number" expected="2" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(1)">
+          <test:assert property="column-number" expected="3" />
+        </fo:table-column>
+        <fo:table-header>
+          <fo:table-cell number-columns-spanned="3" starts-row="true" ends-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>header cell</fo:block>
+          </fo:table-cell>
+        </fo:table-header>
+        <fo:table-footer>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>footer cell 1</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>footer cell 2</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>footer cell 3</fo:block>
+          </fo:table-cell>
+        </fo:table-footer>
+        <fo:table-body>
+          <fo:table-cell number-columns-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+        </fo:table-body>
+      </fo:table>
+      <!-- table with implicit columns. -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-header>
+          <fo:table-cell number-columns-spanned="3" starts-row="true" ends-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>header cell</fo:block>
+          </fo:table-cell>
+        </fo:table-header>
+        <fo:table-footer>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>footer cell 1</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>footer cell 2</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>footer cell 3</fo:block>
+          </fo:table-cell>
+        </fo:table-footer>
+        <fo:table-body>
+          <fo:table-cell number-columns-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+        </fo:table-body>
+      </fo:table>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_cells_out-of-order.fo b/test/fotree/testcases/column-number_cells_out-of-order.fo
new file mode 100644
index 000000000..83f0dec4b
--- /dev/null
+++ b/test/fotree/testcases/column-number_cells_out-of-order.fo
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+         xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" 
+          margin="20pt">
+      <fo:region-body />
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal">
+    <fo:flow flow-name="xsl-region-body">
+      <!-- table with explicit columns -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-column column-width="proportional-column-width(1)"
+                         number-columns-repeated="5">
+          <test:assert property="column-number" expected="1" />
+        </fo:table-column>
+        <fo:table-header>
+          <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>header cell</fo:block>
+          </fo:table-cell>
+        </fo:table-header>
+        <fo:table-footer>
+          <fo:table-cell starts-row="true" column-number="4">
+            <test:assert property="column-number" expected="4" />
+            <fo:block>footer cell 4</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>footer cell 5</fo:block>
+          </fo:table-cell>
+          <fo:table-cell column-number="1">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>footer cell 1</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>footer cell 2</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>footer cell 3</fo:block>
+          </fo:table-cell>
+        </fo:table-footer>
+        <fo:table-body>
+          <fo:table-cell number-columns-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell column-number="4">
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell column-number="3">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="3" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" 
+                         number-columns-spanned="2"
+                         starts-row="true">
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+        </fo:table-body>
+      </fo:table>
+      <!-- table with implicit columns -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-header>
+          <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>header cell</fo:block>
+          </fo:table-cell>
+        </fo:table-header>
+        <fo:table-footer>
+          <fo:table-cell starts-row="true" column-number="4">
+            <test:assert property="column-number" expected="4" />
+            <fo:block>footer cell 4</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>footer cell 5</fo:block>
+          </fo:table-cell>
+          <fo:table-cell column-number="1">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>footer cell 1</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>footer cell 2</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>footer cell 3</fo:block>
+          </fo:table-cell>
+        </fo:table-footer>
+        <fo:table-body>
+          <fo:table-cell number-columns-spanned="2" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell column-number="4">
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell column-number="3">
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="3" starts-row="true">
+            <test:assert property="column-number" expected="1" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="3" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell number-rows-spanned="2" 
+                         number-columns-spanned="2"
+                         starts-row="true">
+            <test:assert property="column-number" expected="2" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell>
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell starts-row="true">
+            <test:assert property="column-number" expected="4" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+          <fo:table-cell ends-row="true">
+            <test:assert property="column-number" expected="5" />
+            <fo:block>cell-content</fo:block>
+          </fo:table-cell>
+        </fo:table-body>
+      </fo:table>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_cells_rows.fo b/test/fotree/testcases/column-number_cells_rows.fo
new file mode 100644
index 000000000..b7f901cd5
--- /dev/null
+++ b/test/fotree/testcases/column-number_cells_rows.fo
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+         xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" 
+          margin="20pt">
+      <fo:region-body background-color="yellow"/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal">
+    <fo:flow flow-name="xsl-region-body">
+      <!-- table with explicit columns -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-column column-width="proportional-column-width(1)">
+          <test:assert property="column-number" expected="1" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(2)">
+          <test:assert property="column-number" expected="2" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(1)">
+          <test:assert property="column-number" expected="3" />
+        </fo:table-column>
+        <fo:table-header>
+          <fo:table-row>
+            <fo:table-cell number-columns-spanned="3">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>header cell</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-header>
+        <fo:table-footer>
+          <fo:table-row>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="1" />
+              <fo:block>footer cell 1</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="2" />
+              <fo:block>footer cell 2</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>footer cell 3</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-footer>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell number-columns-spanned="2">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell number-rows-spanned="2">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="2" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell number-rows-spanned="2">
+              <test:assert property="column-number" expected="2" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+      <!-- table with implicit columns -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-header>
+          <fo:table-row>
+            <fo:table-cell number-columns-spanned="3">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>header cell</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-header>
+        <fo:table-footer>
+          <fo:table-row>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="1" />
+              <fo:block>footer cell 1</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="2" />
+              <fo:block>footer cell 2</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>footer cell 3</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-footer>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell number-columns-spanned="2">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell number-rows-spanned="2">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="2" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell number-rows-spanned="2">
+              <test:assert property="column-number" expected="2" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell-content</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_columns_special.fo b/test/fotree/testcases/column-number_columns_special.fo
new file mode 100644
index 000000000..5adceca9b
--- /dev/null
+++ b/test/fotree/testcases/column-number_columns_special.fo
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+         xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" 
+          margin="20pt">
+      <fo:region-body />
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <!-- 6 columns, of which one repeated, and one unused column-number (= 4) -->
+        <fo:table-column column-width="proportional-column-width(1)"
+                         number-columns-repeated="2">
+          <test:assert property="column-number" expected="1" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(1)">
+          <test:assert property="column-number" expected="3" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(1)"
+                         column-number="5">
+          <test:assert property="column-number" expected="5" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(1)">
+          <test:assert property="column-number" expected="6" />
+        </fo:table-column>
+        <fo:table-column column-width="proportional-column-width(1)">
+          <test:assert property="column-number" expected="7" />
+        </fo:table-column>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell number-columns-spanned="5">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>This cell should span columns 1, 2, 3, 5, 6</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="7" />
+              <fo:block>cell for column 7</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell for column 1</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="2" />
+              <fo:block>cell for column 2</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell for column 3</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="5" />
+              <fo:block>cell for column 5</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="6" />
+              <fo:block>cell for column 6</fo:block>
+            </fo:table-cell>
+            <fo:table-cell>
+              <test:assert property="column-number" expected="7" />
+              <fo:block>cell for column 7</fo:block>
+            </fo:table-cell>          
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
-- 
2.39.5