Add ColumnWidthTest, ColumnsTest

DEVSIX-7557

Autoported commit.
Original commit hash: [34933215d]

Author: Andrei Stryhelski

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/ColumnCountTest.cs renamed to itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnCountTest.cs

@@ -23,14 +23,14 @@ You should have received a copy of the GNU Affero General Public License
 using System;
 using iText.Html2pdf;
 
-namespace iText.Html2pdf.Css {
+namespace iText.Html2pdf.Css.Multicol {
     [NUnit.Framework.Category("IntegrationTest")]
     public class ColumnCountTest : ExtendedHtmlConversionITextTest {
         public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
-            .CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/ColumnCountTest/";
+            .CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/multicol/ColumnCountTest/";
 
         public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
-             + "/test/itext/html2pdf/css/ColumnCountTest/";
+             + "/test/itext/html2pdf/css/multicol/ColumnCountTest/";
 
         [NUnit.Framework.OneTimeSetUp]
         public static void BeforeClass() {
@@ -39,100 +39,96 @@ public static void BeforeClass() {
 
         [NUnit.Framework.Test]
         public virtual void ConvertBasicArticleTest() {
-            ConvertToPdfAndCompare("basicArticleTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true).SetBaseUri(SOURCE_FOLDER));
+            RunTest("basicArticleTest");
         }
 
         [NUnit.Framework.Test]
         public virtual void ConvertBasicDivTest() {
-            ConvertToPdfAndCompare("basicDivTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties()
-                .SetMulticolEnabled(true));
+            RunTest("basicDivTest");
         }
 
         [NUnit.Framework.Test]
         public virtual void ConvertBasicDivWithImageTest() {
-            ConvertToPdfAndCompare("basicDivWithImageTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true).SetBaseUri(SOURCE_FOLDER));
+            RunTest("basicDivWithImageTest");
         }
 
         [NUnit.Framework.Test]
         public virtual void ConvertBasicPTest() {
-            ConvertToPdfAndCompare("basicPTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
-                (true));
+            RunTest("basicPTest");
         }
 
         //TODO: DEVSIX-7592 add support for forms
         [NUnit.Framework.Test]
         public virtual void ConvertBasicFormTest() {
-            ConvertToPdfAndCompare("basicFormTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties(
-                ).SetMulticolEnabled(true));
+            RunTest("basicFormTest");
         }
 
         [NUnit.Framework.Test]
         public virtual void ConvertBasicUlTest() {
-            ConvertToPdfAndCompare("basicUlTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().
-                SetMulticolEnabled(true));
+            RunTest("basicUlTest");
         }
 
         //TODO: DEVSIX-7591
         [NUnit.Framework.Test]
         public virtual void ConvertBasicOlTest() {
-            ConvertToPdfAndCompare("basicOlTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().
-                SetMulticolEnabled(true));
+            RunTest("basicOlTest");
         }
 
         //TODO: DEVSIX-7592
         [NUnit.Framework.Test]
         public virtual void ConvertBasicTableTest() {
-            ConvertToPdfAndCompare("basicTableTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true));
+            RunTest("basicTableTest");
         }
 
         //TODO: DEVSIX-7584 add multipage support
         [NUnit.Framework.Test]
         public virtual void ConvertBasicSectionTest() {
-            ConvertToPdfAndCompare("basicSectionTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true));
+            RunTest("basicSectionTest");
         }
 
         //TODO: DEVSIX-7584 add multipage support
         [NUnit.Framework.Test]
         public virtual void ConvertBasicDivMultiPageDocumentsTest() {
-            ConvertToPdfAndCompare("basicDivMultiPageTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true));
+            RunTest("basicDivMultiPageTest");
         }
 
         //TODO: DEVSIX-7592 add support for forms
         [NUnit.Framework.Test]
         public virtual void ConvertBasicFormMultiPageDocumentsTest() {
-            ConvertToPdfAndCompare("basicFormMultiPageTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true));
+            RunTest("basicFormMultiPageTest");
         }
 
         [NUnit.Framework.Test]
         public virtual void ConvertBasicDisplayPropertyTest() {
-            ConvertToPdfAndCompare("basicDisplayPropertyTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true));
+            RunTest("basicDisplayPropertyTest");
         }
 
         //TODO: DEVSIX-7591
         [NUnit.Framework.Test]
         public virtual void ConvertBasicDisplayPropertyWithNestedColumnsTest() {
-            ConvertToPdfAndCompare("basicDisplayPropertyWithNestedColumnsTest", SOURCE_FOLDER, DESTINATION_FOLDER, false
-                , new ConverterProperties().SetMulticolEnabled(true));
+            RunTest("basicDisplayPropertyWithNestedColumnsTest");
         }
 
         //TODO: DEVSIX-7556
         [NUnit.Framework.Test]
         public virtual void ConvertBasicFloatPropertyTest() {
-            ConvertToPdfAndCompare("basicFloatPropertyTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true));
+            RunTest("basicFloatPropertyTest");
         }
 
         [NUnit.Framework.Test]
         public virtual void ConvertBasicFlexPropertyTest() {
-            ConvertToPdfAndCompare("basicFlexPropertyTest", SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties
-                ().SetMulticolEnabled(true));
+            RunTest("basicFlexPropertyTest");
+        }
+
+        //TODO: DEVSIX-7587 adjust approximate height calculation
+        [NUnit.Framework.Test]
+        public virtual void ConvertImagesWithDifferentColValuesTest() {
+            RunTest("imagesWithDifferentColValuesTest");
+        }
+
+        private void RunTest(String testName) {
+            ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
+                (true).SetBaseUri(SOURCE_FOLDER));
         }
 
         [NUnit.Framework.Test]

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnWidthTest.cs

@@ -0,0 +1,220 @@
+/*
+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/>.
+*/
+using System;
+using iText.Html2pdf;
+
+namespace iText.Html2pdf.Css.Multicol {
+    [NUnit.Framework.Category("IntegrationTest")]
+    public class ColumnWidthTest : ExtendedHtmlConversionITextTest {
+        public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/multicol/ColumnWidthTest/";
+
+        public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+             + "/test/itext/html2pdf/css/multicol/ColumnWidthTest/";
+
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertSimpleDivTest() {
+            RunTest("simpleDivTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertColumnWidthAutoTest() {
+            RunTest("columnWidthAutoTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertDifferentUnitsTest() {
+            RunTest("differentUnitsTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertParagraphsInsideContainerTest() {
+            RunTest("paragraphsInsideContainer");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertOneParagraphSpecifiedWithDifferentWidthTest() {
+            RunTest("oneParagraphSpecifiedWithDifferentWidthTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertMixedElementsInContainerTest() {
+            RunTest("mixedElementsInContainer");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertNarrowColumnsTest() {
+            RunTest("narrowColumns");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertLargeColumnsTest() {
+            RunTest("largeColumns");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicArticleTest() {
+            RunTest("basicArticleTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicDivMultiPageTest() {
+            RunTest("basicDivMultiPageTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicDivTest() {
+            RunTest("basicDivTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertNestedElementsTest() {
+            RunTest("nestedElementsTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicDisplayPropertyTest() {
+            RunTest("basicDisplayPropertyTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertDisplayPropertyWithNestedColumnsTest() {
+            RunTest("displayPropertyWithNestedColumnsTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicDivWithImageTest() {
+            RunTest("basicDivWithImageTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertOverlaidContentInDivWithImageTest() {
+            RunTest("overlaidContentInDivWithImageTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicFlexPropertyTest() {
+            RunTest("basicFlexPropertyTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertOverlaidFlexContentInColumnContainerTest() {
+            RunTest("overlaidFlexContentInColumnContainerTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicFloatPropertyTest() {
+            RunTest("basicFloatPropertyTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicFormTest() {
+            RunTest("basicFormTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertFormWithNestedElementsTest() {
+            RunTest("formWithNestedElementsTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertFormMultiPageTest() {
+            RunTest("formMultiPageTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertFormWithNestedElementsMultiPageTest() {
+            RunTest("formWithNestedElementsMultiPageTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicOlTest() {
+            RunTest("basicOlTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertOlWithTestedElementsTest() {
+            RunTest("olWithNestedElementsTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicSectionTest() {
+            RunTest("basicSectionTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertColumnizedShortParagraphsInTableCellTest() {
+            RunTest("columnizedShortParagraphsInTableCellTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertColumnizedShortPInTableCellWithHeightTest() {
+            RunTest("columnizedShortPInTableCellWithHeightTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertColumnizedSpanInTableCellTest() {
+            RunTest("columnizedSpanInTableCellTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertColumnizedContentInTableTest() {
+            RunTest("columnizedContentInTableTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertBasicUlTest() {
+            RunTest("basicUlTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertUlWithNestedElementsTest() {
+            RunTest("ulWithNestedElementsTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertImagesTest() {
+            RunTest("imagesTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertImagesWithDifferentHeightsTest() {
+            RunTest("imagesWithDifferentHeightsTest");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ConvertColumnWidthEqualsImagesTest() {
+            RunTest("columnWidthEqualsImagesTest");
+        }
+
+        private void RunTest(String testName) {
+            ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
+                (true).SetBaseUri(SOURCE_FOLDER));
+        }
+    }
+}