Add the very same test cases with tables using starts-row/ends-row instead of fo:table-row objects

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

1 files changed, 21 insertions, 5 deletions

diff --git a/test/java/org/apache/fop/layoutmgr/table/TableRowIteratorTestCase.java b/test/java/org/apache/fop/layoutmgr/table/TableRowIteratorTestCase.java
index 9714c7d17..b6959143f 100644
--- a/test/java/org/apache/fop/layoutmgr/table/TableRowIteratorTestCase.java
+++ b/test/java/org/apache/fop/layoutmgr/table/TableRowIteratorTestCase.java
@@ -137,8 +137,8 @@ public class TableRowIteratorTestCase extends TestCase {
         checkTablePartRowGroups(tri, expectedBodyRowLengths);
     }
 
-    public void testSimple() throws Exception {
-        setUp("TableRowIterator_simple.fo");
+    public void checkSimple(String filename) throws Exception {
+        setUp(filename);
 
         // Table 1: no header, no footer, one body (1 row)
         checkNextTableRowGroups(null, null, new int[] {1});
@@ -168,8 +168,8 @@ public class TableRowIteratorTestCase extends TestCase {
         checkNextTableRowGroups(new int[] {1, 1, 1}, new int[] {1, 1}, new int[] {1, 1, 1, 1, 1, 1});
     }
 
-    public void testSpans() throws Exception {
-        setUp("TableRowIterator_spans.fo");
+    public void checkSpans(String filename) throws Exception {
+        setUp(filename);
 
         // Table 1: no header, no footer, one body (1 row with column-span)
         checkNextTableRowGroups(null, null, new int[] {1});
@@ -190,4 +190,20 @@ public class TableRowIteratorTestCase extends TestCase {
         // one body (1 row-group of 2 rows, 1 row, 1 row-group of 3 rows) 
         checkNextTableRowGroups(new int[] {2}, new int[] {1, 3}, new int[] {2, 1, 3});
     }
-}
+
+    public void testWithRowsSimple() throws Exception {
+        checkSimple("TableRowIterator_simple.fo");
+    }
+
+    public void testWithRowsSpans() throws Exception {
+        checkSpans("TableRowIterator_spans.fo");
+    }
+
+    public void testNoRowSimple() throws Exception {
+        checkSimple("TableRowIterator_no-row_simple.fo");
+    }
+
+    public void testNoRowSpans() throws Exception {
+        checkSpans("TableRowIterator_no-row_spans.fo");
+    }
+}
\ No newline at end of file