Process incomplete rows in header and footer. Add a test.

ars18wrw · ars18wrw · commit 268a8d40f1aa · 2017-11-28T12:33:35.000+03:00
DEVSIX-1597
diff --git a/src/main/java/com/itextpdf/html2pdf/attach/wrapelement/TableWrapper.java b/src/main/java/com/itextpdf/html2pdf/attach/wrapelement/TableWrapper.java
@@ -197,16 +197,22 @@ public Table toTable(WaitingColgroupsHelper colgroupsHelper) {
         //Workaround to remove default width:100%
         table.deleteOwnProperty(Property.WIDTH);
         if (headerRows != null) {
-            for (List<CellWrapper> headerRow : headerRows) {
-                for (CellWrapper headerCell : headerRow) {
-                    table.addHeaderCell(headerCell.cell);
+            for (int i = 0; i < headerRows.size(); i++) {
+                for (int j = 0; j < headerRows.get(i).size(); j++) {
+                    table.addHeaderCell(headerRows.get(i).get(j).cell);
+                }
+                if (i != headerRows.size() - 1) {
+                    table.getHeader().startNewRow();
                 }
             }
         }
         if (footerRows != null) {
-            for (List<CellWrapper> footerRow : footerRows) {
-                for (CellWrapper footerCell : footerRow) {
-                    table.addFooterCell(footerCell.cell);
+            for (int i = 0; i < footerRows.size(); i++) {
+                for (int j = 0; j < footerRows.get(i).size(); j++) {
+                    table.addFooterCell(footerRows.get(i).get(j).cell);
+                }
+                if (i != footerRows.size() - 1) {
+                    table.getFooter().startNewRow();
                 }
             }
         }
diff --git a/src/test/java/com/itextpdf/html2pdf/element/TableTest.java b/src/test/java/com/itextpdf/html2pdf/element/TableTest.java
@@ -321,6 +321,11 @@ public void tableMaxHeightTest02() throws IOException, InterruptedException {
         runTest("tableMaxHeight02");
     }
 
+    @Test
+    public void multipleRowsInHeade01() throws IOException, InterruptedException {
+        runTest("multipleRowsInHeader01");
+    }
+
     @Test
     @Ignore("DEVSIX-994")
     public void tableCollapseColCellBoxSizingWidthDifference() throws IOException, InterruptedException {
diff --git a/src/test/resources/com/itextpdf/html2pdf/element/TableTest/cmp_multipleRowsInHeader01.pdf b/src/test/resources/com/itextpdf/html2pdf/element/TableTest/cmp_multipleRowsInHeader01.pdf
diff --git a/src/test/resources/com/itextpdf/html2pdf/element/TableTest/multipleRowsInHeader01.html b/src/test/resources/com/itextpdf/html2pdf/element/TableTest/multipleRowsInHeader01.html
@@ -0,0 +1,36 @@
+<html>
+<body>
+<table border="1">
+    <thead>
+    <tr>
+        <td>Header Row 1 Col 1</td>
+    </tr>
+    <tr>
+        <td>Header Row 2 Col 1</td>
+        <td>Header Row 2 Col 2</td>
+        <td>Header Row 2 Col 3</td>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td>Body Row 1 Col 1</td>
+    </tr>
+    <tr>
+        <td>Body Row 2 Col 1</td>
+        <td>Body Row 2 Col 2</td>
+        <td>Body Row 2 Col 3</td>
+    </tr>
+    </tbody>
+    <tfoot>
+    <tr>
+        <td>Footer Row 1 Col 1</td>
+    </tr>
+    <tr>
+        <td>Footer Row 2 Col 1</td>
+        <td>Footer Row 2 Col 2</td>
+        <td>Footer Row 2 Col 3</td>
+    </tr>
+    </tfoot>
+</table>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -197,16 +197,22 @@ public Table toTable(WaitingColgroupsHelper colgroupsHelper) {`
`197`	`197`	`//Workaround to remove default width:100%`
`198`	`198`	`table.deleteOwnProperty(Property.WIDTH);`
`199`	`199`	`if (headerRows != null) {`
`200`		`- for (List<CellWrapper> headerRow : headerRows) {`
`201`		`- for (CellWrapper headerCell : headerRow) {`
`202`		`- table.addHeaderCell(headerCell.cell);`
	`200`	`+ for (int i = 0; i < headerRows.size(); i++) {`
	`201`	`+ for (int j = 0; j < headerRows.get(i).size(); j++) {`
	`202`	`+ table.addHeaderCell(headerRows.get(i).get(j).cell);`
	`203`	`+ }`
	`204`	`+ if (i != headerRows.size() - 1) {`
	`205`	`+ table.getHeader().startNewRow();`
`203`	`206`	`}`
`204`	`207`	`}`
`205`	`208`	`}`
`206`	`209`	`if (footerRows != null) {`
`207`		`- for (List<CellWrapper> footerRow : footerRows) {`
`208`		`- for (CellWrapper footerCell : footerRow) {`
`209`		`- table.addFooterCell(footerCell.cell);`
	`210`	`+ for (int i = 0; i < footerRows.size(); i++) {`
	`211`	`+ for (int j = 0; j < footerRows.get(i).size(); j++) {`
	`212`	`+ table.addFooterCell(footerRows.get(i).get(j).cell);`
	`213`	`+ }`
	`214`	`+ if (i != footerRows.size() - 1) {`
	`215`	`+ table.getFooter().startNewRow();`
`210`	`216`	`}`
`211`	`217`	`}`
`212`	`218`	`}`