Fix NPE and infinite loop if using display: inline-block with display: flex on page split

DEVSIX-8951

Author: AnhelinaM

src/test/java/com/itextpdf/html2pdf/css/flex/DisplayFlexTest.java

@@ -46,16 +46,15 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.LogLevelConstants;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.List;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
 
 @Tag("IntegrationTest")
 public class DisplayFlexTest extends ExtendedHtmlConversionITextTest {
@@ -64,7 +63,6 @@ public class DisplayFlexTest extends ExtendedHtmlConversionITextTest {
     private static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/html2pdf/css/flex/DisplayFlexTest/";
     private static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/html2pdf/css/flex/DisplayFlexTest/";
 
-
     @BeforeAll
     public static void beforeClass() {
         createDestinationFolder(DESTINATION_FOLDER);
@@ -623,7 +621,7 @@ public void displayFlexWithRobotoFontTest() throws IOException, InterruptedExcep
         String outFile = DESTINATION_FOLDER + "displayFlexWithRobotoFont.pdf";
         String cmpFile = SOURCE_FOLDER + "cmp_displayFlexWithRobotoFont.pdf";
         String htmlFile = SOURCE_FOLDER + "displayFlexWithRobotoFont.html";
-        String robotoFont ="./src/test/resources/com/itextpdf/html2pdf/fonts/Roboto-Regular.ttf";
+        String robotoFont = "./src/test/resources/com/itextpdf/html2pdf/fonts/Roboto-Regular.ttf";
 
         PdfWriter writer = new PdfWriter(new File(outFile));
         PdfDocument pdfDocument = new PdfDocument(writer);
@@ -639,26 +637,72 @@ public void displayFlexWithRobotoFontTest() throws IOException, InterruptedExcep
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
-    })
-    // TODO DEVSIX-8951 Nullpointer exception if using display: inline-block with display: flex on page split
-    public void inlineBlockInsideFlexWithFixedSizeSiblingTest() {
-        String html = "inlineBlockInsideFlexWithFixedSizeSibling";
-        File htmlFile = new File(SOURCE_FOLDER + html + ".html");
-        File output = new File(DESTINATION_FOLDER + html + ".pdf");
-        Assertions.assertThrows(Exception.class, () -> HtmlConverter.convertToPdf(htmlFile, output));
+    public void inlineBlockInsideFlexWithFixedSizeSiblingTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexWithFixedSizeSibling", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void inlineBlockInsideFlexWithFixedWidthOnlySiblingTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexWithFixedWidthOnlySibling", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    // TODO DEVSIX-9509 Move flex container to the next page since inline-block flex item is not fit and not 1st
+    public void inlineBlockInsideFlexWithFixedWidthOnlySiblingAfterParagraphTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexWithFixedWidthOnlySiblingAfterParagraph", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    // TODO DEVSIX-9509 Move flex container to the next page since inline-block flex item is not fit and not 1st
+    public void inlineBlockInsideFlexAfterParagraphTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexAfterParagraph", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void inlineBlockInsideFlexSingleItemTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexSingleItem", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
     @Test
-    @Disabled("TODO DEVSIX-8951 Infinite loop if using display: inline-block with display: flex on page split")
-    public void inlineBlockInsideFlexWithFixedWidthOnlySiblingTest() throws IOException {
-        String html = "inlineBlockInsideFlexWithFixedWidthOnlySibling";
-        File htmlFile = new File(SOURCE_FOLDER + html + ".html");
-        File output = new File(DESTINATION_FOLDER + html + ".pdf");
-        HtmlConverter.convertToPdf(htmlFile, output);
+    public void inlineBlockInsideFlexFirstItemTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexFirstItem", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
-    
+
+    @Test
+    public void inlineBlockInsideFlexSplitTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexSplit", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void inlineBlockInsideFlexSeveralItemsTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexSeveralItems", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void inlineBlockInsideFlexWrapTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexWrap", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void inlineBlockInsideFlexColumnTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexColumn", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void inlineBlockInsideFlexColumnReverseTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexColumnReverse", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void blockInsideFlexSimpleColumnTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("blockInsideFlexSimpleColumn", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void inlineBlockInsideFlexSimpleColumnTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("inlineBlockInsideFlexSimpleColumn", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
     @Test
     // TODO DEVSIX-7402 Add display:flex support for all relevant tags
     public void displayFlexOnHeaderTagTest() throws IOException, InterruptedException {

src/test/java/com/itextpdf/html2pdf/css/grid/GridItemPlacementTest.java

@@ -222,6 +222,17 @@ public void noTemplate2Test() throws IOException, InterruptedException {
         runTest("noTemplate2");
     }
 
+    @Test
+    public void blockInsideGridTest() throws IOException, InterruptedException {
+        runTest("blockInsideGrid");
+    }
+
+    @Test
+    // TODO DEVSIX-9509 Move inline-block item to the next page
+    public void inlineBlockInsideGridTest() throws IOException, InterruptedException {
+        runTest("inlineBlockInsideGrid");
+    }
+
     private void runTest(String testName) throws IOException, InterruptedException {
         convertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false,
                 new ConverterProperties().setBaseUri(SOURCE_FOLDER));

src/test/java/com/itextpdf/html2pdf/css/multicol/ColumnCountTest.java

@@ -433,6 +433,16 @@ public void shortHandResolverTest01() throws IOException, InterruptedException {
         runTest("shortHandResolverTest01");
     }
 
+    @Test
+    public void blockInsideMulticolTest() throws IOException, InterruptedException {
+        runTest("blockInsideMulticol");
+    }
+
+    @Test
+    public void inlineBlockInsideMulticolTest() throws IOException, InterruptedException {
+        runTest("inlineBlockInsideMulticol");
+    }
+
     private void runTest(String testName) throws IOException, InterruptedException {
         convertToPdfAndCompare(testName,
                 SOURCE_FOLDER, DESTINATION_FOLDER, false,

src/test/resources/com/itextpdf/html2pdf/css/flex/DisplayFlexTest/blockInsideFlexSimpleColumn.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <style>
+        .flex {
+            display: flex;
+            flex-direction: column;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="flex">
+    <div style="width: 25px;height:25px;background-color: green;"></div>
+    <div>
+        <div>
+
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec pellentesque nunc<br/>, a sagittis erat. Vivamus eu odio sagittis, aliquam augue eu, suscipit nibh.<br/> Donec lacinia ultrices auctor. Etiam nec mauris vitae felis sodales congue.<br/> Mauris dolor augue, eleifend sit amet diam tristique, convallis varius tortor.<br/> Cras tristique commodo aliquet. Donec eu velit vitae tortor tempor aliquet in at dui.<br/>
+
+            Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Donec erat odio, semper vitae eros condimentum, volutpat iaculis lorem.<br/> Sed mollis mi lacus, ut suscipit dui maximus congue. Etiam varius nulla eget scelerisque laoreet. <br/>Sed elementum, magna id pharetra aliquam, elit justo finibus sapien, a tempor arcu velit et justo. <br/>Integer eu placerat diam. Sed efficitur lacinia sapien sed tincidunt.<br/> Cras nisl sem, maximus eget arcu eget, bibendum convallis lectus. Aliquam a sodales neque.<br/> Maecenas risus velit, malesuada quis porta vel, efficitur sit amet nunc. <br/>Suspendisse suscipit mi vitae dui dignissim, id gravida lacus euismod.<br/> Aenean volutpat sodales ligula, egestas tincidunt sem venenatis in.<br/> Vestibulum bibendum erat dolor, eget bibendum lacus lobortis lobortis. Maecenas a aliquet sapien,<br/> eu viverra felis. Suspendisse a orci quis eros volutpat placerat fermentum eu velit. <br/>Quisque magna nulla, elementum cursus odio.
+
+            <br/>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec pellentesque nunc<br/>, a sagittis erat. Vivamus eu odio sagittis, aliquam augue eu, suscipit nibh.<br/> Donec lacinia ultrices auctor. Etiam nec mauris vitae felis sodales congue.<br/> Mauris dolor augue, eleifend sit amet diam tristique, convallis varius tortor.<br/> Cras tristique commodo aliquet. Donec eu velit vitae tortor tempor aliquet in at dui.<br/>
+
+            Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Donec erat odio, semper vitae eros condimentum, volutpat iaculis lorem.<br/> Sed mollis mi lacus, ut suscipit dui maximus congue. Etiam varius nulla eget scelerisque laoreet. <br/>Sed elementum, magna id pharetra aliquam, elit justo finibus sapien, a tempor arcu velit et justo. <br/>Integer eu placerat diam. Sed efficitur lacinia sapien sed tincidunt.<br/> Cras nisl sem, maximus eget arcu eget, bibendum convallis lectus. Aliquam a sodales neque.<br/> Maecenas risus velit, malesuada quis porta vel, efficitur sit amet nunc. <br/>Suspendisse suscipit mi vitae dui dignissim, id gravida lacus euismod.<br/> Aenean volutpat sodales ligula, egestas tincidunt sem venenatis in.<br/> Vestibulum bibendum erat dolor, eget bibendum lacus lobortis lobortis. Maecenas a aliquet sapien,<br/> eu viverra felis. Suspendisse a orci quis eros volutpat placerat fermentum eu velit. <br/>Quisque magna nulla, elementum cursus odio.
+
+            <br/>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec pellentesque nunc<br/>, a sagittis erat. Vivamus eu odio sagittis, aliquam augue eu, suscipit nibh.<br/> Donec lacinia ultrices auctor. Etiam nec mauris vitae felis sodales congue.<br/> Mauris dolor augue, eleifend sit amet diam tristique, convallis varius tortor.<br/> Cras tristique commodo aliquet. Donec eu velit vitae tortor tempor aliquet in at dui.<br/>
+
+            Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Donec erat odio, semper vitae eros condimentum, volutpat iaculis lorem.<br/> Sed mollis mi lacus, ut suscipit dui maximus congue. Etiam varius nulla eget scelerisque laoreet. <br/>Sed elementum, magna id pharetra aliquam, elit justo finibus sapien, a tempor arcu velit et justo. <br/>Integer eu placerat diam. Sed efficitur lacinia sapien sed tincidunt.<br/> Cras nisl sem, maximus eget arcu eget, bibendum convallis lectus. Aliquam a sodales neque.<br/> Maecenas risus velit, malesuada quis porta vel, efficitur sit amet nunc. <br/>Suspendisse suscipit mi vitae dui dignissim, id gravida lacus euismod.<br/> Aenean volutpat sodales ligula, egestas tincidunt sem venenatis in.<br/> Vestibulum bibendum erat dolor, eget bibendum lacus lobortis lobortis. Maecenas a aliquet sapien,<br/> eu viverra felis. Suspendisse a orci quis eros volutpat placerat fermentum eu velit. <br/>Quisque magna nulla, elementum cursus odio.
+
+            <br/>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec pellentesque nunc<br/>, a sagittis erat. Vivamus eu odio sagittis, aliquam augue eu, suscipit nibh.<br/> Donec lacinia ultrices auctor. Etiam nec mauris vitae felis sodales congue.<br/> Mauris dolor augue, eleifend sit amet diam tristique, convallis varius tortor.<br/> Cras tristique commodo aliquet. Donec eu velit vitae tortor tempor aliquet in at dui.<br/>
+
+            Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Donec erat odio, semper vitae eros condimentum, volutpat iaculis lorem.<br/> Sed mollis mi lacus, ut suscipit dui maximus congue. Etiam varius nulla eget scelerisque laoreet. <br/>Sed elementum, magna id pharetra aliquam, elit justo finibus sapien, a tempor arcu velit et justo. <br/>Integer eu placerat diam. Sed efficitur lacinia sapien sed tincidunt.<br/> Cras nisl sem, maximus eget arcu eget, bibendum convallis lectus. Aliquam a sodales neque.<br/> Maecenas risus velit, malesuada quis porta vel, efficitur sit amet nunc. <br/>Suspendisse suscipit mi vitae dui dignissim, id gravida lacus euismod.<br/> Aenean volutpat sodales ligula, egestas tincidunt sem venenatis in.<br/> Vestibulum bibendum erat dolor, eget bibendum lacus lobortis lobortis. Maecenas a aliquet sapien,<br/> eu viverra felis. Suspendisse a orci quis eros volutpat placerat fermentum eu velit. <br/>Quisque magna nulla, elementum cursus odio.
+
+
+        </div>
+    </div>
+</div>
+</body>
+</html>