Verify TODO references, add TextWritingTest#leadingAndFloatInTextTest

DEVSIX-4574

Autoported commit.
Original commit hash: [6a1962d6d]

Author: Kate Ivanova

itext.tests/itext.layout.tests/itext/layout/TextWritingTest.cs

@@ -47,6 +47,7 @@ source product.
 using iText.Kernel.Pdf;
 using iText.Kernel.Pdf.Canvas;
 using iText.Kernel.Utils;
+using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
 using iText.Test;
@@ -59,6 +60,9 @@ public class TextWritingTest : ExtendedITextTest {
         public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
              + "/test/itext/layout/TextWritingTest/";
 
+        public static readonly String fontsFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/layout/fonts/";
+
         [NUnit.Framework.OneTimeSetUp]
         public static void BeforeClass() {
             CreateDestinationFolder(destinationFolder);
@@ -308,5 +312,23 @@ public virtual void LineThroughTest() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
                 , "diff_"));
         }
+
+        [NUnit.Framework.Test]
+        public virtual void LeadingAndFloatInTextTest() {
+            // TODO: update cmp file after fixing DEVSIX-4604
+            String outFileName = destinationFolder + "leadingAndFloatInText.pdf";
+            String cmpFileName = sourceFolder + "cmp_leadingAndFloatInText.pdf";
+            PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
+            Document document = new Document(pdfDocument);
+            Paragraph p = new Paragraph().SetFixedLeading(30).SetBorder(new SolidBorder(ColorConstants.RED, 2));
+            p.Add("First text");
+            Text text = new Text("Second text with float ");
+            text.SetProperty(Property.FLOAT, FloatPropertyValue.LEFT);
+            p.Add(text);
+            document.Add(p);
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder
+                ));
+        }
     }
 }

itext.tests/itext.layout.tests/resources/itext/layout/TextWritingTest/cmp_leadingAndFloatInText.pdf

@@ -909,7 +909,6 @@ protected internal virtual void ApplyLeading(float deltaY) {
             }
         }
 
-        // TODO for floats we don't apply any leading for the moment (and therefore line-height for pdf2html is not entirely supported in terms of floats)
         protected internal virtual LineRenderer TrimLast() {
             int lastIndex = childRenderers.Count;
             IRenderer lastRenderer = null;
@@ -1065,29 +1064,22 @@ private void AdjustLineOnFloatPlaced(Rectangle layoutBox, int childPos, FloatPro
                 ()) {
                 return;
             }
-            // TODO handle it
-            bool ltr = true;
             float floatWidth = justPlacedFloatBox.GetWidth();
             if (kidFloatPropertyVal.Equals(FloatPropertyValue.LEFT)) {
                 layoutBox.SetWidth(layoutBox.GetWidth() - floatWidth).MoveRight(floatWidth);
                 occupiedArea.GetBBox().MoveRight(floatWidth);
-                if (ltr) {
-                    for (int i = 0; i < childPos; ++i) {
-                        IRenderer prevChild = childRenderers[i];
-                        if (!FloatingHelper.IsRendererFloating(prevChild)) {
-                            prevChild.Move(floatWidth, 0);
-                        }
+                for (int i = 0; i < childPos; ++i) {
+                    IRenderer prevChild = childRenderers[i];
+                    if (!FloatingHelper.IsRendererFloating(prevChild)) {
+                        prevChild.Move(floatWidth, 0);
                     }
                 }
             }
             else {
                 layoutBox.SetWidth(layoutBox.GetWidth() - floatWidth);
-                if (!ltr) {
-                }
             }
         }
 
-        // TODO
         private void ReplaceSplitRendererKidFloats(IDictionary<int, IRenderer> floatsToNextPageSplitRenderers, LineRenderer
              splitRenderer) {
             foreach (KeyValuePair<int, IRenderer> splitFloat in floatsToNextPageSplitRenderers) {

itext/itext.layout/itext/layout/renderer/LineRenderer.cs

@@ -1 +1 @@
-9ce4248245a3a7c8fdbe3b6df576b6843ef90b69
+6a1962d6d00ba5adb620b7e73b979fdaec3c641b