Test class updated: com.itextpdf.layout.FloatAndAlignmentTest

new tests added for DEVSIX-1268

Autoported commit.
Original commit hash: [fe56adabd]

Author: Veronika Lisovskaya

itext.tests/itext.layout.tests/itext/layout/FloatAndAlignmentTest.cs

@@ -32,23 +32,61 @@ public virtual void BlocksInsideDiv() {
             PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
             pdfDocument.SetTagged();
             Document document = new Document(pdfDocument);
+            Div div1 = CreateDiv(ColorConstants.RED, HorizontalAlignment.CENTER, ClearPropertyValue.BOTH, FloatPropertyValue
+                .NONE);
+            Div div2 = CreateDiv(ColorConstants.BLUE, HorizontalAlignment.LEFT, ClearPropertyValue.BOTH, FloatPropertyValue
+                .NONE);
+            Div div3 = CreateDiv(ColorConstants.GREEN, HorizontalAlignment.RIGHT, ClearPropertyValue.BOTH, FloatPropertyValue
+                .NONE);
+            Div divParent1 = CreateParentDiv(HorizontalAlignment.CENTER, ClearPropertyValue.BOTH, 500);
+            divParent1.Add(div3);
+            divParent1.Add(div2);
+            divParent1.Add(div1);
+            document.Add(divParent1);
+            Div divParent2 = CreateParentDiv(HorizontalAlignment.LEFT, ClearPropertyValue.BOTH, 500);
+            divParent2.Add(div2);
+            divParent2.Add(div1);
+            divParent2.Add(div3);
+            document.Add(divParent2);
+            Div divParent3 = CreateParentDiv(HorizontalAlignment.RIGHT, ClearPropertyValue.BOTH, 500);
+            divParent3.Add(div1);
+            divParent3.Add(div2);
+            divParent3.Add(div3);
+            document.Add(divParent3);
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                , "diff01_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void BlocksInsideDivFloat() {
+            /* this test shows different combinations of 3 float values blocks  within divParent containers
+            */
+            String testName = "blocksInsideDivFloat";
+            String outFileName = destinationFolder + testName + ".pdf";
+            String cmpFileName = sourceFolder + "cmp_" + testName + ".pdf";
+            PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
+            pdfDocument.SetTagged();
+            Document document = new Document(pdfDocument);
             Div div1 = CreateDiv(ColorConstants.RED, HorizontalAlignment.CENTER, ClearPropertyValue.BOTH, FloatPropertyValue
                 .NONE);
             Div div2 = CreateDiv(ColorConstants.BLUE, HorizontalAlignment.LEFT, ClearPropertyValue.BOTH, FloatPropertyValue
                 .RIGHT);
             Div div3 = CreateDiv(ColorConstants.GREEN, HorizontalAlignment.RIGHT, ClearPropertyValue.BOTH, FloatPropertyValue
                 .LEFT);
-            Div divParent1 = CreateParentDiv(HorizontalAlignment.CENTER, ClearPropertyValue.BOTH);
+            Div divParent1 = CreateParentDiv(HorizontalAlignment.CENTER, ClearPropertyValue.BOTH, 400);
             divParent1.Add(div3);
             divParent1.Add(div2);
             divParent1.Add(div1);
             document.Add(divParent1);
-            Div divParent2 = CreateParentDiv(HorizontalAlignment.LEFT, ClearPropertyValue.BOTH);
+            Div divParent2 = CreateParentDiv(HorizontalAlignment.LEFT, ClearPropertyValue.BOTH, 400);
             divParent2.Add(div2);
             divParent2.Add(div1);
             divParent2.Add(div3);
             document.Add(divParent2);
-            Div divParent3 = CreateParentDiv(HorizontalAlignment.RIGHT, ClearPropertyValue.BOTH);
+            Div divParent3 = CreateParentDiv(HorizontalAlignment.RIGHT, ClearPropertyValue.BOTH, 400);
             divParent3.Add(div1);
             divParent3.Add(div2);
             divParent3.Add(div3);
@@ -82,39 +120,80 @@ public virtual void BlocksInsideEachOther() {
                 .RIGHT);
             Div div5 = CreateDiv(ColorConstants.ORANGE, HorizontalAlignment.LEFT, ClearPropertyValue.NONE, FloatPropertyValue
                 .LEFT);
-            Div divParent1 = CreateParentDiv(HorizontalAlignment.CENTER, ClearPropertyValue.BOTH);
+            Div divParent1 = CreateParentDiv(HorizontalAlignment.CENTER, ClearPropertyValue.BOTH, 500);
             divParent1.Add(div1);
             div1.Add(div2);
             div2.Add(div3);
             document.Add(divParent1);
-            Div divParent2 = CreateParentDiv(HorizontalAlignment.LEFT, ClearPropertyValue.BOTH);
+            Div divParent2 = CreateParentDiv(HorizontalAlignment.LEFT, ClearPropertyValue.BOTH, 500);
             divParent2.Add(div4);
             div4.Add(div1);
             document.Add(divParent2);
-            Div divParent3 = CreateParentDiv(HorizontalAlignment.RIGHT, ClearPropertyValue.BOTH);
+            Div divParent3 = CreateParentDiv(HorizontalAlignment.RIGHT, ClearPropertyValue.BOTH, 500);
             divParent3.Add(div5);
             div5.Add(div4);
             document.Add(divParent3);
             document.Close();
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
-                , "diff01_"));
+                , "diff02_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void BlocksNotInDivCenter() {
+            /* this test shows different combinations of 3 float values blocks
+            * NOTE, that div1 text is partly overlapped
+            */
+            String testName = "blocksNotInDivCenter";
+            String outFileName = destinationFolder + testName + ".pdf";
+            String cmpFileName = sourceFolder + "cmp_" + testName + ".pdf";
+            CreateDocumentWithBlocks(outFileName, HorizontalAlignment.CENTER);
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                , "diff03_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void BlocksNotInDivLeft() {
+            /* this test shows different combinations of 3 float values blocks
+            * NOTE, that div1 text is partly overlapped
+            */
+            String testName = "blocksNotInDivLeft";
+            String outFileName = destinationFolder + testName + ".pdf";
+            String cmpFileName = sourceFolder + "cmp_" + testName + ".pdf";
+            CreateDocumentWithBlocks(outFileName, HorizontalAlignment.LEFT);
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                , "diff04_"));
         }
 
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
-        public virtual void BlocksNotInDiv01() {
+        public virtual void BlocksNotInDivRight() {
             /* this test shows different combinations of 3 float values blocks
-            * TODO: DEVSIX-1731: div1 text is partly overlapped.
+            * NOTE, that div1 text is partly overlapped
             */
-            String testName = "blocksNotInDiv01";
+            String testName = "blocksNotInDivRight";
             String outFileName = destinationFolder + testName + ".pdf";
             String cmpFileName = sourceFolder + "cmp_" + testName + ".pdf";
+            /*
+            * Please, NOTE: in current example HorizontalAlignment values are ignored, if FloatPropertyValue !=NONE
+            * So, only FloatPropertyValue defines the position of element in such cases
+            */
+            CreateDocumentWithBlocks(outFileName, HorizontalAlignment.RIGHT);
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                , "diff05_"));
+        }
+
+        /// <exception cref="System.IO.FileNotFoundException"/>
+        private void CreateDocumentWithBlocks(String outFileName, HorizontalAlignment? horizontalAlignment) {
             PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
             pdfDocument.SetTagged();
             Document document = new Document(pdfDocument);
-            Div div1 = CreateDiv(ColorConstants.RED, HorizontalAlignment.CENTER, ClearPropertyValue.NONE, FloatPropertyValue
-                .NONE);
+            Div div1 = CreateDiv(ColorConstants.RED, horizontalAlignment, ClearPropertyValue.NONE, FloatPropertyValue.
+                NONE);
             Div div2 = CreateDiv(ColorConstants.BLUE, HorizontalAlignment.LEFT, ClearPropertyValue.NONE, FloatPropertyValue
                 .RIGHT);
             Div div3 = CreateDiv(ColorConstants.GREEN, HorizontalAlignment.RIGHT, ClearPropertyValue.NONE, FloatPropertyValue
@@ -136,8 +215,6 @@ public virtual void BlocksNotInDiv01() {
             document.Add(div1);
             document.Add(div1);
             document.Close();
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
-                , "diff01_"));
         }
 
         /// <exception cref="System.IO.IOException"/>
@@ -188,18 +265,19 @@ public virtual void InlineBlocksAndFloatsWithTextAlignmentTest02() {
         }
 
         private Div CreateParentDiv(HorizontalAlignment? horizontalAlignment, ClearPropertyValue? clearPropertyValue
-            ) {
-            Div divParent1 = new Div().SetBorder(new SolidBorder(5));
-            divParent1.SetHorizontalAlignment(HorizontalAlignment.CENTER);
-            divParent1.SetProperty(Property.CLEAR, ClearPropertyValue.BOTH);
+            , float width) {
+            Div divParent1 = new Div().SetBorder(new SolidBorder(5)).SetWidth(width);
+            divParent1.SetHorizontalAlignment(horizontalAlignment);
+            divParent1.SetProperty(Property.CLEAR, clearPropertyValue);
             divParent1.Add(new Paragraph("Div with HorizontalAlignment." + horizontalAlignment + ", ClearPropertyValue."
                  + clearPropertyValue));
             return divParent1;
         }
 
         private static Div CreateDiv(Color color, HorizontalAlignment? horizontalAlignment, ClearPropertyValue? clearPropertyValue
             , FloatPropertyValue? floatPropertyValue) {
-            Div div = new Div().SetBorder(new SolidBorder(color, 1)).SetMargins(10, 10, 10, 10).SetWidth(300);
+            Div div = new Div().SetBorder(new SolidBorder(color, 1)).SetBackgroundColor(color, 0.3f).SetMargins(10, 10
+                , 10, 10).SetWidth(300);
             div.SetHorizontalAlignment(horizontalAlignment);
             div.SetProperty(Property.CLEAR, clearPropertyValue);
             div.SetProperty(Property.FLOAT, floatPropertyValue);

itext.tests/itext.layout.tests/resources/itext/layout/FloatAndAlignmentTest/cmp_blocksInsideDiv.pdf

@@ -1 +1 @@
-b9149bcc76f3564e3dcad715602ad2331cba3e03
+fe56adabd18723f746152d1e0cdaebb4873335cd