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

ars18wrw · pavel-alay · commit f440df3c5a02 · 2017-11-29T12:19:17.000+03:00
DEVSIX-1597

Autoported commit.
Original commit hash: [8e00c5ff]
diff --git a/itext.tests/itext.html2pdf.tests/itext/html2pdf/element/TableTest.cs b/itext.tests/itext.html2pdf.tests/itext/html2pdf/element/TableTest.cs
@@ -410,6 +410,13 @@ public virtual void TableMaxHeightTest02() {
             RunTest("tableMaxHeight02");
         }
 
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void MultipleRowsInHeade01() {
+            RunTest("multipleRowsInHeader01");
+        }
+
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/TableTest/cmp_multipleRowsInHeader01.pdf b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/TableTest/cmp_multipleRowsInHeader01.pdf
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/TableTest/multipleRowsInHeader01.html b/itext.tests/itext.html2pdf.tests/resources/itext/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>
diff --git a/itext/itext.html2pdf/itext/html2pdf/attach/wrapelement/TableWrapper.cs b/itext/itext.html2pdf/itext/html2pdf/attach/wrapelement/TableWrapper.cs
@@ -173,16 +173,22 @@ public virtual Table ToTable(WaitingColgroupsHelper colgroupsHelper) {
                 table = new Table(1);
             }
             if (headerRows != null) {
-                foreach (IList<TableWrapper.CellWrapper> headerRow in headerRows) {
-                    foreach (TableWrapper.CellWrapper headerCell in headerRow) {
-                        table.AddHeaderCell(headerCell.cell);
+                for (int i = 0; i < headerRows.Count; i++) {
+                    for (int j = 0; j < headerRows[i].Count; j++) {
+                        table.AddHeaderCell(headerRows[i][j].cell);
+                    }
+                    if (i != headerRows.Count - 1) {
+                        table.GetHeader().StartNewRow();
                     }
                 }
             }
             if (footerRows != null) {
-                foreach (IList<TableWrapper.CellWrapper> footerRow in footerRows) {
-                    foreach (TableWrapper.CellWrapper footerCell in footerRow) {
-                        table.AddFooterCell(footerCell.cell);
+                for (int i = 0; i < footerRows.Count; i++) {
+                    for (int j = 0; j < footerRows[i].Count; j++) {
+                        table.AddFooterCell(footerRows[i][j].cell);
+                    }
+                    if (i != footerRows.Count - 1) {
+                        table.GetFooter().StartNewRow();
                     }
                 }
             }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-675a7c49c18ea91b941ce88da3f971266ca615c4
+8e00c5ff051d0ba35eb920a636fda6dffc4c2b10

Original file line number	Diff line number	Diff line change
`@@ -173,16 +173,22 @@ public virtual Table ToTable(WaitingColgroupsHelper colgroupsHelper) {`
`173`	`173`	`table = new Table(1);`
`174`	`174`	`}`
`175`	`175`	`if (headerRows != null) {`
`176`		`- foreach (IList<TableWrapper.CellWrapper> headerRow in headerRows) {`
`177`		`- foreach (TableWrapper.CellWrapper headerCell in headerRow) {`
`178`		`- table.AddHeaderCell(headerCell.cell);`
	`176`	`+ for (int i = 0; i < headerRows.Count; i++) {`
	`177`	`+ for (int j = 0; j < headerRows[i].Count; j++) {`
	`178`	`+ table.AddHeaderCell(headerRows[i][j].cell);`
	`179`	`+ }`
	`180`	`+ if (i != headerRows.Count - 1) {`
	`181`	`+ table.GetHeader().StartNewRow();`
`179`	`182`	`}`
`180`	`183`	`}`
`181`	`184`	`}`
`182`	`185`	`if (footerRows != null) {`
`183`		`- foreach (IList<TableWrapper.CellWrapper> footerRow in footerRows) {`
`184`		`- foreach (TableWrapper.CellWrapper footerCell in footerRow) {`
`185`		`- table.AddFooterCell(footerCell.cell);`
	`186`	`+ for (int i = 0; i < footerRows.Count; i++) {`
	`187`	`+ for (int j = 0; j < footerRows[i].Count; j++) {`
	`188`	`+ table.AddFooterCell(footerRows[i][j].cell);`
	`189`	`+ }`
	`190`	`+ if (i != footerRows.Count - 1) {`
	`191`	`+ table.GetFooter().StartNewRow();`
`186`	`192`	`}`
`187`	`193`	`}`
`188`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-675a7c49c18ea91b941ce88da3f971266ca615c4`
	`1`	`+8e00c5ff051d0ba35eb920a636fda6dffc4c2b10`