Verify TODO references, add TextWritingTest#leadingAndFloatInTextTest

DEVSIX-4574

Author: Kate Ivanova

layout/src/main/java/com/itextpdf/layout/renderer/LineRenderer.java

@@ -917,7 +917,6 @@ protected void applyLeading(float deltaY) {
             if (!FloatingHelper.isRendererFloating(child)) {
                 child.move(0, 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)
         }
     }
 
@@ -1050,25 +1049,19 @@ private void adjustLineOnFloatPlaced(Rectangle layoutBox, int childPos, FloatPro
             return;
         }
 
-        // TODO handle it
-        boolean 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.get(i);
                     if (!FloatingHelper.isRendererFloating(prevChild)) {
                         prevChild.move(floatWidth, 0);
                     }
                 }
-            }
+
         } else {
             layoutBox.setWidth(layoutBox.getWidth() - floatWidth);
-            if (!ltr) {
-                // TODO
-            }
         }
     }
 

layout/src/test/java/com/itextpdf/layout/TextWritingTest.java

@@ -50,11 +50,14 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvasConstants;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.layout.borders.SolidBorder;
 import com.itextpdf.layout.element.AreaBreak;
 import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Text;
+import com.itextpdf.layout.property.FloatPropertyValue;
 import com.itextpdf.layout.property.OverflowPropertyValue;
 import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.IntegrationTest;
 import org.junit.Assert;
@@ -69,6 +72,7 @@ public class TextWritingTest extends ExtendedITextTest {
 
     public static final String sourceFolder = "./src/test/resources/com/itextpdf/layout/TextWritingTest/";
     public static final String destinationFolder = "./target/test/com/itextpdf/layout/TextWritingTest/";
+    public static final String fontsFolder = "./src/test/resources/com/itextpdf/layout/fonts/";
 
     @BeforeClass
     public static void beforeClass() {
@@ -376,4 +380,28 @@ public void lineThroughTest() throws IOException, InterruptedException {
 
         Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, "diff_"));
     }
+
+    @Test
+    // TODO: update cmp file after fixing DEVSIX-4604
+    public void leadingAndFloatInTextTest() throws IOException, InterruptedException {
+        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();
+
+        Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder));
+    }
 }