Fix null exception with SeparatedTableBorders

Artyom Yanchevsky · iText-CI · commit ad71ba6f897b · 2021-02-11T12:05:58.000Z
DEVSIX-4865

Autoported commit.
Original commit hash: [a7e841cb1]
diff --git a/itext.tests/itext.layout.tests/itext/layout/TableBorderTest.cs b/itext.tests/itext.layout.tests/itext/layout/TableBorderTest.cs
@@ -74,19 +74,16 @@ public static void BeforeClass() {
         }
 
         [NUnit.Framework.Test]
-        public virtual void CellWithBigRowspanCompletedButRowNotCompletedOnThreePagesTest() {
-            NUnit.Framework.Assert.That(() =>  {
-                fileName = "cellWithBigRowspanCompletedButRowNotCompletedOnThreePagesTest.pdf";
-                Document doc = CreateDocument();
-                Table table = new Table(UnitValue.CreatePercentArray(2)).UseAllAvailableWidth().SetBorderCollapse(BorderCollapsePropertyValue
-                    .SEPARATE);
-                table.AddCell(new Cell(2, 1));
-                table.AddCell(new Cell(1, 1).SetHeight(2000).SetBackgroundColor(ColorConstants.RED));
-                doc.Add(table);
-                CloseDocumentAndCompareOutputs(doc);
-            }
-            , NUnit.Framework.Throws.InstanceOf<NullReferenceException>())
-;
+        public virtual void CellWithBigRowspanOnThreePagesTest() {
+            fileName = "cellWithBigRowspanOnThreePagesTest.pdf";
+            Document doc = CreateDocument();
+            Table table = new Table(UnitValue.CreatePercentArray(2)).UseAllAvailableWidth().SetBorderCollapse(BorderCollapsePropertyValue
+                .SEPARATE);
+            table.AddCell(new Cell(2, 1));
+            table.AddCell(new Cell(1, 1).SetHeight(2000).SetBackgroundColor(ColorConstants.RED));
+            table.AddCell(new Cell(1, 1));
+            doc.Add(table);
+            CloseDocumentAndCompareOutputs(doc);
         }
 
         [LogMessage(iText.IO.LogMessageConstant.LAST_ROW_IS_NOT_COMPLETE)]
diff --git a/itext.tests/itext.layout.tests/itext/layout/TableTest.cs b/itext.tests/itext.layout.tests/itext/layout/TableTest.cs
@@ -74,20 +74,6 @@ public class TableTest : ExtendedITextTest {
         private const String MIDDLE_TEXT_CONTENT = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas porttitor congue massa. Fusce posuere, magna sed pulvinar ultricies, purus lectus malesuada libero, sit amet commodo magna eros quis urna.\n"
              + "Nunc viverra imperdiet enim. Fusce est. Vivamus a tellus.";
 
-        private const String BIG_TEXT_CONTENT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n"
-             + " Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"
-             + " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\n"
-             + " Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"
-             + " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n"
-             + " Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"
-             + " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat\n"
-             + " nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"
-             + " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu\n"
-             + " fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"
-             + " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"
-             + " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"
-             + " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n";
-
         [NUnit.Framework.OneTimeSetUp]
         public static void BeforeClass() {
             CreateDestinationFolder(destinationFolder);
@@ -2551,26 +2537,6 @@ public virtual void InheritHeaderPropsWhileMinMaxWidthCalculationsTest() {
                  + "cmp_" + filename, destinationFolder, "diff"));
         }
 
-        [NUnit.Framework.Test]
-        public virtual void TableCellWithRowspanExceedsSeveralPagesTest() {
-            // TODO: DEVSIX-4865 (if table cell exceeds over two pages we'll get NPE)
-            String outFileName = destinationFolder + "tableCellWithRowspanExceedsSeveralPages.pdf";
-            String cmpFileName = sourceFolder + "cmp_tableCellWithRowspanExceedsSeveralPages.pdf";
-            Document doc = new Document(new PdfDocument(new PdfWriter(outFileName)));
-            doc.GetPdfDocument().SetDefaultPageSize(PageSize.A5);
-            NUnit.Framework.Assert.That(() =>  {
-                Table table = new Table(2);
-                table.SetBorderCollapse(BorderCollapsePropertyValue.SEPARATE).AddCell(new Cell(2, 1).Add(new Paragraph("iText 1"
-                    ))).AddCell(new Cell(1, 1).Add(new Paragraph(BIG_TEXT_CONTENT)));
-                doc.Add(table);
-                doc.Close();
-                NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
-                    ));
-            }
-            , NUnit.Framework.Throws.InstanceOf<NullReferenceException>())
-;
-        }
-
         private class RotatedDocumentRenderer : DocumentRenderer {
             private readonly PdfDocument pdfDoc;
 
diff --git a/itext.tests/itext.layout.tests/itext/layout/renderer/TableRendererTest.cs b/itext.tests/itext.layout.tests/itext/layout/renderer/TableRendererTest.cs
@@ -77,8 +77,8 @@ public virtual void CalculateColumnWidthsNotPointValue() {
             tableRenderer.isOriginalNonSplitRenderer = false;
             MinMaxWidth minMaxWidth = tableRenderer.GetMinMaxWidth();
             // TODO DEVSIX-3676: currently margins and paddings are still applied as if they are in points. After the mentioned ticket is fixed, the expected values should be updated.
-            NUnit.Framework.Assert.AreEqual(minMaxWidth.GetMaxWidth(), 332.46f, 0.001);
-            NUnit.Framework.Assert.AreEqual(minMaxWidth.GetMinWidth(), 332.46f, 0.001);
+            NUnit.Framework.Assert.AreEqual(327.46f, minMaxWidth.GetMaxWidth(), 0.001);
+            NUnit.Framework.Assert.AreEqual(327.46f, minMaxWidth.GetMinWidth(), 0.001);
         }
 
         [NUnit.Framework.Test]
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/TableBorderTest/cmp_cellWithBigRowspanOnThreePagesTest.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/TableBorderTest/cmp_cellWithBigRowspanOnThreePagesTest.pdf
diff --git a/itext/itext.layout/itext/layout/renderer/SeparatedTableBorders.cs b/itext/itext.layout/itext/layout/renderer/SeparatedTableBorders.cs
@@ -173,14 +173,7 @@ protected internal override TableBorders UpdateBordersOnNewPage(bool isOriginalN
         }
 
         public override float[] GetCellBorderIndents(int row, int col, int rowspan, int colspan) {
-            float[] indents = new float[4];
-            Border[] borders = rows[row + startRow - largeTableIndexOffset][col].GetBorders();
-            for (int i = 0; i < 4; i++) {
-                if (null != borders[i]) {
-                    indents[i] = borders[i].GetWidth();
-                }
-            }
-            return indents;
+            return new float[] { 0, 0, 0, 0 };
         }
 
         protected internal override void BuildBordersArrays(CellRenderer cell, int row, int col, int[] rowspansToDeduct
diff --git a/itext/itext.layout/itext/layout/renderer/TableRenderer.cs b/itext/itext.layout/itext/layout/renderer/TableRenderer.cs
@@ -1575,18 +1575,14 @@ private void CorrectLayoutedCellsOccupiedAreas(LayoutResult[] splits, int row, i
                         float height = 0;
                         int rowspan = (int)cell.GetPropertyAsInteger(Property.ROWSPAN);
                         int colspan = (int)cell.GetPropertyAsInteger(Property.COLSPAN);
-                        float[] indents = bordersHandler.GetCellBorderIndents(bordersHandler is SeparatedTableBorders ? row : targetOverflowRowIndex
-                            [col], col, rowspan, colspan);
                         for (int l = heights.Count - 1 - 1; l > targetOverflowRowIndex[col] - rowspan && l >= 0; l--) {
                             height += (float)heights[l];
                         }
                         float cellHeightInLastRow;
-                        if (bordersHandler is SeparatedTableBorders) {
-                            cellHeightInLastRow = cell.GetOccupiedArea().GetBBox().GetHeight() - height;
-                        }
-                        else {
-                            cellHeightInLastRow = cell.GetOccupiedArea().GetBBox().GetHeight() + indents[0] / 2 + indents[2] / 2 - height;
-                        }
+                        float[] indents = bordersHandler.GetCellBorderIndents(bordersHandler is SeparatedTableBorders ? row : targetOverflowRowIndex
+                            [col], col, rowspan, colspan);
+                        cellHeightInLastRow = cell.GetOccupiedArea().GetBBox().GetHeight() - height + indents[0] / 2 + indents[2] 
+                            / 2;
                         if (heights[heights.Count - 1] < cellHeightInLastRow) {
                             if (bordersHandler is SeparatedTableBorders) {
                                 float differenceToConsider = cellHeightInLastRow - heights[heights.Count - 1];
@@ -1649,8 +1645,6 @@ private void CorrectRowCellsOccupiedAreas(LayoutResult[] splits, int row, int[]
                 int colspan = (int)cell.GetPropertyAsInteger(Property.COLSPAN);
                 int rowspan = (int)cell.GetPropertyAsInteger(Property.ROWSPAN);
                 float rowspanOffset = 0;
-                float[] indents = bordersHandler.GetCellBorderIndents(currentRowIndex < row || bordersHandler is SeparatedTableBorders
-                     ? currentRowIndex : targetOverflowRowIndex[col], col, rowspan, colspan);
                 // process rowspan
                 for (int l = (currentRowIndex < row ? currentRowIndex : heights.Count - 1) - 1; l > (currentRowIndex < row
                      ? currentRowIndex : targetOverflowRowIndex[col]) - rowspan && l >= 0; l--) {
@@ -1660,9 +1654,9 @@ private void CorrectRowCellsOccupiedAreas(LayoutResult[] splits, int row, int[]
                     }
                 }
                 height += (float)heights[currentRowIndex < row ? currentRowIndex : heights.Count - 1];
-                if (!(bordersHandler is SeparatedTableBorders)) {
-                    height -= indents[0] / 2 + indents[2] / 2;
-                }
+                float[] indents = bordersHandler.GetCellBorderIndents(currentRowIndex < row || bordersHandler is SeparatedTableBorders
+                     ? currentRowIndex : targetOverflowRowIndex[col], col, rowspan, colspan);
+                height -= indents[0] / 2 + indents[2] / 2;
                 // Correcting cell bbox only. We don't need #move() here.
                 // This is because of BlockRenderer's specificity regarding occupied area.
                 float shift = height - cell.GetOccupiedArea().GetBBox().GetHeight();
diff --git a/itext/itext.layout/itext/layout/renderer/TableWidths.cs b/itext/itext.layout/itext/layout/renderer/TableWidths.cs
@@ -695,12 +695,12 @@ private void CalculateMinMaxWidths() {
             foreach (TableWidths.CellInfo cell in cells) {
                 cell.SetParent(tableRenderer);
                 MinMaxWidth minMax = cell.GetCell().GetMinMaxWidth();
-                float[] indents = GetCellBorderIndents(cell);
                 if (BorderCollapsePropertyValue.SEPARATE.Equals(tableRenderer.GetProperty<BorderCollapsePropertyValue?>(Property
                     .BORDER_COLLAPSE))) {
                     minMax.SetAdditionalWidth((float)(minMax.GetAdditionalWidth() - horizontalBorderSpacing));
                 }
                 else {
+                    float[] indents = GetCellBorderIndents(cell);
                     minMax.SetAdditionalWidth(minMax.GetAdditionalWidth() + indents[1] / 2 + indents[3] / 2);
                 }
                 if (cell.GetColspan() == 1) {
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-41fc0675e3b357298ec476161faa831ea1de9111
+a7e841cb148776a804ab87530a76cecc1632bc5e

Original file line number	Diff line number	Diff line change
`@@ -173,14 +173,7 @@ protected internal override TableBorders UpdateBordersOnNewPage(bool isOriginalN`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`public override float[] GetCellBorderIndents(int row, int col, int rowspan, int colspan) {`
`176`		`- float[] indents = new float[4];`
`177`		`- Border[] borders = rows[row + startRow - largeTableIndexOffset][col].GetBorders();`
`178`		`- for (int i = 0; i < 4; i++) {`
`179`		`- if (null != borders[i]) {`
`180`		`- indents[i] = borders[i].GetWidth();`
`181`		`- }`
`182`		`- }`
`183`		`- return indents;`
	`176`	`+ return new float[] { 0, 0, 0, 0 };`
`184`	`177`	`}`
`185`	`178`
`186`	`179`	`protected internal override void BuildBordersArrays(CellRenderer cell, int row, int col, int[] rowspansToDeduct`
Original file line number	Diff line number	Diff line change
`@@ -695,12 +695,12 @@ private void CalculateMinMaxWidths() {`
`695`	`695`	`foreach (TableWidths.CellInfo cell in cells) {`
`696`	`696`	`cell.SetParent(tableRenderer);`
`697`	`697`	`MinMaxWidth minMax = cell.GetCell().GetMinMaxWidth();`
`698`		`- float[] indents = GetCellBorderIndents(cell);`
`699`	`698`	`if (BorderCollapsePropertyValue.SEPARATE.Equals(tableRenderer.GetProperty<BorderCollapsePropertyValue?>(Property`
`700`	`699`	`.BORDER_COLLAPSE))) {`
`701`	`700`	`minMax.SetAdditionalWidth((float)(minMax.GetAdditionalWidth() - horizontalBorderSpacing));`
`702`	`701`	`}`
`703`	`702`	`else {`
	`703`	`+ float[] indents = GetCellBorderIndents(cell);`
`704`	`704`	`minMax.SetAdditionalWidth(minMax.GetAdditionalWidth() + indents[1] / 2 + indents[3] / 2);`
`705`	`705`	`}`
`706`	`706`	`if (cell.GetColspan() == 1) {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-41fc0675e3b357298ec476161faa831ea1de9111`
	`1`	`+a7e841cb148776a804ab87530a76cecc1632bc5e`