Update of FOTree testcases for column-number property

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

diff --git a/test/fotree/disabled-testcases.txt b/test/fotree/disabled-testcases.txt
index af7454e5b48c0e2f9034da21146a3d10d7d4893c..59cd3c9c0ddd2c2ba68aaf1c31c69c9d529992d3 100644 (file)
--- a/test/fotree/disabled-testcases.txt
+++ b/test/fotree/disabled-testcases.txt
@@ -1,3 +1 @@
 demo-test-failure.fo
-column-number_body.fo
-column-number_rows.fo

diff --git a/test/fotree/testcases/column-number_body.fo b/test/fotree/testcases/column-number_body.fo
deleted file mode 100644 (file)
index 48dd9c3..0000000
--- a/test/fotree/testcases/column-number_body.fo
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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 id="page-sequence1" master-reference="normal" white-space-collapse="true">
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block>The following table has explicit columns.</fo:block>
-      <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>body-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:block>The following table has implicit columns.</fo:block>
-      <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>body-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_rows.fo b/test/fotree/testcases/column-number_rows.fo
deleted file mode 100644 (file)
index 82e8aad..0000000
--- a/test/fotree/testcases/column-number_rows.fo
+++ /dev/null
@@ -1,169 +0,0 @@
-<?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 id="page-sequence1" master-reference="normal" white-space-collapse="true">
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block>The following table has explicit columns.</fo:block>
-      <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>body-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:block>The following table has implicit columns.</fo:block>
-      <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>body-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>