Add ColumnWidthTest, ColumnsTest

DEVSIX-7557

Author: Andrei Stryhelski

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

@@ -20,7 +20,7 @@ This file is part of the iText (R) project.
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.itextpdf.html2pdf.css;
+package com.itextpdf.html2pdf.css.multicol;
 
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
@@ -34,8 +34,8 @@ This file is part of the iText (R) project.
 
 @Category(IntegrationTest.class)
 public class ColumnCountTest extends ExtendedHtmlConversionITextTest {
-    public static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/html2pdf/css/ColumnCountTest/";
-    public static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/html2pdf/css/ColumnCountTest/";
+    public static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/html2pdf/css/multicol/ColumnCountTest/";
+    public static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/html2pdf/css/multicol/ColumnCountTest/";
 
     @BeforeClass
     public static void beforeClass() {
@@ -44,102 +44,97 @@ public static void beforeClass() {
 
     @Test
     public void convertBasicArticleTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicArticleTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true)
-                        .setBaseUri(SOURCE_FOLDER));
+        runTest("basicArticleTest");
     }
 
     @Test
     public void convertBasicDivTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicDivTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicDivTest");
     }
 
     @Test
     public void convertBasicDivWithImageTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicDivWithImageTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true)
-                        .setBaseUri(SOURCE_FOLDER));
+        runTest("basicDivWithImageTest");
     }
 
     @Test
     public void convertBasicPTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicPTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicPTest");
     }
 
     //TODO: DEVSIX-7592 add support for forms
     @Test
     public void convertBasicFormTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicFormTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicFormTest");
     }
 
     @Test
     public void convertBasicUlTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicUlTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicUlTest");
     }
 
     //TODO: DEVSIX-7591
     @Test
     public void convertBasicOlTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicOlTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicOlTest");
     }
 
     //TODO: DEVSIX-7592
     @Test
     public void convertBasicTableTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicTableTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicTableTest");
     }
 
     //TODO: DEVSIX-7584 add multipage support
     @Test
     public void convertBasicSectionTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicSectionTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicSectionTest");
     }
 
     //TODO: DEVSIX-7584 add multipage support
     @Test
     public void convertBasicDivMultiPageDocumentsTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicDivMultiPageTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicDivMultiPageTest");
     }
 
     //TODO: DEVSIX-7592 add support for forms
     @Test
     public void convertBasicFormMultiPageDocumentsTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicFormMultiPageTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicFormMultiPageTest");
     }
 
     @Test
     public void convertBasicDisplayPropertyTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicDisplayPropertyTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicDisplayPropertyTest");
     }
 
     //TODO: DEVSIX-7591
     @Test
     public void convertBasicDisplayPropertyWithNestedColumnsTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicDisplayPropertyWithNestedColumnsTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicDisplayPropertyWithNestedColumnsTest");
     }
 
     //TODO: DEVSIX-7556
     @Test
     public void convertBasicFloatPropertyTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicFloatPropertyTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicFloatPropertyTest");
     }
 
     @Test
     public void convertBasicFlexPropertyTest() throws IOException, InterruptedException {
-        convertToPdfAndCompare("basicFlexPropertyTest",
-                SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().setMulticolEnabled(true));
+        runTest("basicFlexPropertyTest");
+    }
+
+    //TODO: DEVSIX-7587 adjust approximate height calculation
+    @Test
+    public void convertImagesWithDifferentColValuesTest() throws IOException, InterruptedException {
+        runTest("imagesWithDifferentColValuesTest");
+    }
+
+    private void runTest(String testName) throws IOException, InterruptedException {
+        convertToPdfAndCompare(testName,
+                SOURCE_FOLDER, DESTINATION_FOLDER, false,
+                new ConverterProperties().setMulticolEnabled(true).setBaseUri(SOURCE_FOLDER));
     }
 
 

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

@@ -0,0 +1,224 @@
+/*
+    This file is part of the iText (R) project.
+    Copyright (c) 1998-2023 Apryse Group NV
+    Authors: Apryse Software.
+
+    This program is offered under a commercial and under the AGPL license.
+    For commercial licensing, contact us at https://itextpdf.com/sales.  For AGPL licensing, see below.
+
+    AGPL licensing:
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.itextpdf.html2pdf.css.multicol;
+
+import com.itextpdf.html2pdf.ConverterProperties;
+import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
+import com.itextpdf.test.annotations.type.IntegrationTest;
+
+import java.io.IOException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(IntegrationTest.class)
+public class ColumnWidthTest extends ExtendedHtmlConversionITextTest {
+    public static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/html2pdf/css/multicol/ColumnWidthTest/";
+    public static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/html2pdf/css/multicol/ColumnWidthTest/";
+
+    @BeforeClass
+    public static void beforeClass() {
+        createOrClearDestinationFolder(DESTINATION_FOLDER);
+    }
+
+    @Test
+    public void convertSimpleDivTest() throws IOException, InterruptedException {
+        runTest("simpleDivTest");
+    }
+
+    @Test
+    public void convertColumnWidthAutoTest() throws IOException, InterruptedException {
+        runTest("columnWidthAutoTest");
+    }
+
+    @Test
+    public void convertDifferentUnitsTest() throws IOException, InterruptedException {
+        runTest("differentUnitsTest");
+    }
+
+    @Test
+    public void convertParagraphsInsideContainerTest() throws IOException, InterruptedException {
+        runTest("paragraphsInsideContainer");
+    }
+
+    @Test
+    public void convertOneParagraphSpecifiedWithDifferentWidthTest() throws IOException, InterruptedException {
+        runTest("oneParagraphSpecifiedWithDifferentWidthTest");
+    }
+
+    @Test
+    public void convertMixedElementsInContainerTest() throws IOException, InterruptedException {
+        runTest("mixedElementsInContainer");
+    }
+
+    @Test
+    public void convertNarrowColumnsTest() throws IOException, InterruptedException {
+        runTest("narrowColumns");
+    }
+
+    @Test
+    public void convertLargeColumnsTest() throws IOException, InterruptedException {
+        runTest("largeColumns");
+    }
+
+    @Test
+    public void convertBasicArticleTest() throws IOException, InterruptedException {
+        runTest("basicArticleTest");
+    }
+
+    @Test
+    public void convertBasicDivMultiPageTest() throws IOException, InterruptedException {
+        runTest("basicDivMultiPageTest");
+    }
+
+    @Test
+    public void convertBasicDivTest() throws IOException, InterruptedException {
+        runTest("basicDivTest");
+    }
+
+    @Test
+    public void convertNestedElementsTest() throws IOException, InterruptedException {
+        runTest("nestedElementsTest");
+    }
+
+    @Test
+    public void convertBasicDisplayPropertyTest() throws IOException, InterruptedException {
+        runTest("basicDisplayPropertyTest");
+    }
+
+    @Test
+    public void convertDisplayPropertyWithNestedColumnsTest() throws IOException, InterruptedException {
+        runTest("displayPropertyWithNestedColumnsTest");
+    }
+
+    @Test
+    public void convertBasicDivWithImageTest() throws IOException, InterruptedException {
+        runTest("basicDivWithImageTest");
+    }
+
+    @Test
+    public void convertOverlaidContentInDivWithImageTest() throws IOException, InterruptedException {
+        runTest("overlaidContentInDivWithImageTest");
+    }
+
+    @Test
+    public void convertBasicFlexPropertyTest() throws IOException, InterruptedException {
+        runTest("basicFlexPropertyTest");
+    }
+
+    @Test
+    public void convertOverlaidFlexContentInColumnContainerTest() throws IOException, InterruptedException {
+        runTest("overlaidFlexContentInColumnContainerTest");
+    }
+
+    @Test
+    public void convertBasicFloatPropertyTest() throws IOException, InterruptedException {
+        runTest("basicFloatPropertyTest");
+    }
+
+    @Test
+    public void convertBasicFormTest() throws IOException, InterruptedException {
+        runTest("basicFormTest");
+    }
+
+    @Test
+    public void convertFormWithNestedElementsTest() throws IOException, InterruptedException {
+        runTest("formWithNestedElementsTest");
+    }
+
+    @Test
+    public void convertFormMultiPageTest() throws IOException, InterruptedException {
+        runTest("formMultiPageTest");
+    }
+
+    @Test
+    public void convertFormWithNestedElementsMultiPageTest() throws IOException, InterruptedException {
+        runTest("formWithNestedElementsMultiPageTest");
+    }
+
+    @Test
+    public void convertBasicOlTest() throws IOException, InterruptedException {
+        runTest("basicOlTest");
+    }
+
+    @Test
+    public void convertOlWithTestedElementsTest() throws IOException, InterruptedException {
+        runTest("olWithNestedElementsTest");
+    }
+
+    @Test
+    public void convertBasicSectionTest() throws IOException, InterruptedException {
+        runTest("basicSectionTest");
+    }
+
+    @Test
+    public void convertColumnizedShortParagraphsInTableCellTest() throws IOException, InterruptedException {
+        runTest("columnizedShortParagraphsInTableCellTest");
+    }
+
+    @Test
+    public void convertColumnizedShortPInTableCellWithHeightTest() throws IOException, InterruptedException {
+        runTest("columnizedShortPInTableCellWithHeightTest");
+    }
+
+    @Test
+    public void convertColumnizedSpanInTableCellTest() throws IOException, InterruptedException {
+        runTest("columnizedSpanInTableCellTest");
+    }
+
+    @Test
+    public void convertColumnizedContentInTableTest() throws IOException, InterruptedException {
+        runTest("columnizedContentInTableTest");
+    }
+
+    @Test
+    public void convertBasicUlTest() throws IOException, InterruptedException {
+        runTest("basicUlTest");
+    }
+
+    @Test
+    public void convertUlWithNestedElementsTest() throws IOException, InterruptedException {
+        runTest("ulWithNestedElementsTest");
+    }
+
+    @Test
+    public void convertImagesTest() throws IOException, InterruptedException {
+        runTest("imagesTest");
+    }
+
+    @Test
+    public void convertImagesWithDifferentHeightsTest() throws IOException, InterruptedException {
+        runTest("imagesWithDifferentHeightsTest");
+    }
+
+    @Test
+    public void convertColumnWidthEqualsImagesTest() throws IOException, InterruptedException {
+        runTest("columnWidthEqualsImagesTest");
+    }
+
+    private void runTest(String testName) throws IOException, InterruptedException {
+        convertToPdfAndCompare(testName,
+                SOURCE_FOLDER, DESTINATION_FOLDER, false,
+                new ConverterProperties().setMulticolEnabled(true).setBaseUri(SOURCE_FOLDER));
+    }
+}