Add message logging for not supported flex-related properties

DEVSIX-5170

Author: Eugene Bochilo

layout/src/main/java/com/itextpdf/layout/property/JustifyContent.java

@@ -35,5 +35,6 @@ public enum JustifyContent {
     FLEX_END,
     LEFT,
     RIGHT,
-    NORMAL
+    NORMAL,
+    STRETCH
 }

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

@@ -525,17 +525,17 @@ private static void applyAlignItemsAndAlignSelf(List<List<FlexItemCalculationInf
                 float freeSpace = lineCrossSize - itemInfo.getOuterCrossSize(itemInfo.crossSize);
 
                 switch (selfAlignment) {
+                    case SELF_END:
+                    case END:
                     case FLEX_END:
                         itemInfo.yShift = freeSpace;
                         break;
                     case CENTER:
                         itemInfo.yShift = freeSpace / 2;
                         break;
-                    case END:
                     case START:
                     case BASELINE:
                     case SELF_START:
-                    case SELF_END:
                     case STRETCH:
                     case NORMAL:
                     case FLEX_START:
@@ -559,17 +559,20 @@ private static void applyJustifyContent(List<List<FlexItemCalculationInfo>> line
             float freeSpace = mainSize - childrenWidth;
 
             switch (justifyContent) {
+                case RIGHT:
+                case END:
+                case SELF_END:
                 case FLEX_END:
                     line.get(0).xShift = freeSpace;
                     break;
                 case CENTER:
                     line.get(0).xShift = freeSpace / 2;
                     break;
                 case NORMAL:
+                case STRETCH:
                 case START:
-                case END:
-                case RIGHT:
                 case LEFT:
+                case SELF_START:
                 case FLEX_START:
                 default:
                     // We don't need to do anything in these cases

layout/src/test/java/com/itextpdf/layout/element/FlexContainerTest.java

@@ -568,7 +568,7 @@ public void ltWidthGrow0Shrink1Item2MarginBorderPadding30Test01() {
     }
 
     @Test
-    public void ltWidthGrow0Shrink1Item2MarginBorderPadding30JustifyContentCenterAlignItemsCenterTest01() {
+    public void ltWidthGrow0Shrink1Item2MBP30JustifyContentCenterTest() {
         Rectangle bBox = new Rectangle(575, 842);
         List<UnitValue> flexBasisValues = Arrays.<UnitValue>asList(
                 UnitValue.createPointValue(50f),
@@ -623,77 +623,91 @@ public void ltWidthGrow0Shrink1Item2MarginBorderPadding30JustifyContentCenterAli
     }
 
     @Test
-    public void ltWidthGrow0Shrink1Item2MarginBorderPadding30JustifyContentFlexEndAlignItemsFlexEndTest01() {
-        Rectangle bBox = new Rectangle(575, 842);
-        List<UnitValue> flexBasisValues = Arrays.<UnitValue>asList(
-                UnitValue.createPointValue(50f),
-                UnitValue.createPointValue(50f),
-                UnitValue.createPointValue(50f)
-        );
+    public void ltWidthGrow0Shrink1Item2MBP30JustifyContentFlexStartTest() {
+        JustifyContent[] justifyContentValues = {
+                JustifyContent.NORMAL,
+                JustifyContent.START,
+                JustifyContent.STRETCH,
+                JustifyContent.LEFT,
+                JustifyContent.SELF_START,
+                JustifyContent.FLEX_START
+        };
+        AlignmentPropertyValue[] alignItemsValues = {
+                AlignmentPropertyValue.START,
+                AlignmentPropertyValue.SELF_START,
+                AlignmentPropertyValue.BASELINE,
+                AlignmentPropertyValue.SELF_START,
+                AlignmentPropertyValue.FLEX_START,
+                AlignmentPropertyValue.FLEX_START
+        };
+        for (int j = 0; j < justifyContentValues.length; ++j) {
+            Rectangle bBox = new Rectangle(575, 842);
+            List<UnitValue> flexBasisValues = Arrays.<UnitValue>asList(
+                    UnitValue.createPointValue(50f),
+                    UnitValue.createPointValue(50f),
+                    UnitValue.createPointValue(50f)
+            );
 
-        Div div = new Div().setWidth(200).setHeight(300);
+            Div div = new Div().setWidth(200).setHeight(300);
 
-        DocumentRenderer documentRenderer = new DocumentRenderer(
-                new Document(new PdfDocument(new PdfWriter(new ByteArrayOutputStream()))));
+            DocumentRenderer documentRenderer = new DocumentRenderer(
+                    new Document(new PdfDocument(new PdfWriter(new ByteArrayOutputStream()))));
 
-        FlexContainerRenderer flexContainerRenderer = new FlexContainerRenderer(div);
-        flexContainerRenderer.setParent(documentRenderer);
-        flexContainerRenderer.setProperty(Property.FLEX_WRAP, FlexWrapPropertyValue.WRAP);
-        flexContainerRenderer.setProperty(Property.JUSTIFY_CONTENT, JustifyContent.FLEX_END);
-        flexContainerRenderer.setProperty(Property.ALIGN_ITEMS, AlignmentPropertyValue.FLEX_END);
-        div.setNextRenderer(flexContainerRenderer);
+            FlexContainerRenderer flexContainerRenderer = new FlexContainerRenderer(div);
+            flexContainerRenderer.setParent(documentRenderer);
+            flexContainerRenderer.setProperty(Property.FLEX_WRAP, FlexWrapPropertyValue.WRAP);
+            flexContainerRenderer.setProperty(Property.JUSTIFY_CONTENT, justifyContentValues[j]);
+            flexContainerRenderer.setProperty(Property.ALIGN_ITEMS, alignItemsValues[j]);
+            div.setNextRenderer(flexContainerRenderer);
 
-        for (int i = 0; i < flexBasisValues.size(); i++) {
-            Div flexItem = new Div().add(new Paragraph("x"));
-            if (1 == i) {
-                flexItem.setMargin(10).setBorder(new SolidBorder(15)).setPadding(5);
-                flexItem.setHeight(50);
+            for (int i = 0; i < flexBasisValues.size(); i++) {
+                Div flexItem = new Div().add(new Paragraph("x"));
+                if (1 == i) {
+                    flexItem.setMargin(10).setBorder(new SolidBorder(15)).setPadding(5);
+                    flexItem.setHeight(50);
+                }
+                AbstractRenderer flexItemRenderer = (AbstractRenderer) flexItem.createRendererSubTree()
+                        .setParent(documentRenderer);
+                flexItemRenderer.setProperty(Property.FLEX_GROW, 0f);
+                flexItemRenderer.setProperty(Property.FLEX_SHRINK, 1f);
+                flexItemRenderer.setProperty(Property.FLEX_BASIS, flexBasisValues.get(i));
+                flexContainerRenderer.addChild(flexItemRenderer);
             }
-            AbstractRenderer flexItemRenderer = (AbstractRenderer) flexItem.createRendererSubTree()
-                    .setParent(documentRenderer);
-            flexItemRenderer.setProperty(Property.FLEX_GROW, 0f);
-            flexItemRenderer.setProperty(Property.FLEX_SHRINK, 1f);
-            flexItemRenderer.setProperty(Property.FLEX_BASIS, flexBasisValues.get(i));
-            flexContainerRenderer.addChild(flexItemRenderer);
-        }
 
-        List<List<FlexItemInfo>> rectangleTable =
-                FlexUtil.calculateChildrenRectangles(bBox, (FlexContainerRenderer) div.getRenderer());
+            List<List<FlexItemInfo>> rectangleTable =
+                    FlexUtil.calculateChildrenRectangles(bBox, (FlexContainerRenderer) div.getRenderer());
 
-        Assert.assertEquals(25.9375f, rectangleTable.get(0).get(0).getRectangle().getHeight(), EPS);
-        Assert.assertEquals(110.0f, rectangleTable.get(0).get(1).getRectangle().getHeight(), EPS);
-        Assert.assertEquals(25.9375f, rectangleTable.get(1).get(0).getRectangle().getHeight(), EPS);
+            Assert.assertEquals(25.9375f, rectangleTable.get(0).get(0).getRectangle().getHeight(), EPS);
+            Assert.assertEquals(110.0f, rectangleTable.get(0).get(1).getRectangle().getHeight(), EPS);
+            Assert.assertEquals(25.9375f, rectangleTable.get(1).get(0).getRectangle().getHeight(), EPS);
 
-        Assert.assertEquals(50.0f, rectangleTable.get(0).get(0).getRectangle().getWidth(), EPS);
-        Assert.assertEquals(110.0f, rectangleTable.get(0).get(1).getRectangle().getWidth(), EPS);
-        Assert.assertEquals(50.0f, rectangleTable.get(1).get(0).getRectangle().getWidth(), EPS);
+            Assert.assertEquals(50.0f, rectangleTable.get(0).get(0).getRectangle().getWidth(), EPS);
+            Assert.assertEquals(110.0f, rectangleTable.get(0).get(1).getRectangle().getWidth(), EPS);
+            Assert.assertEquals(50.0f, rectangleTable.get(1).get(0).getRectangle().getWidth(), EPS);
 
-        Assert.assertEquals(40.0f, rectangleTable.get(0).get(0).getRectangle().getX(), EPS);
-        Assert.assertEquals(0f, rectangleTable.get(0).get(1).getRectangle().getX(), EPS);
-        Assert.assertEquals(150.0f, rectangleTable.get(1).get(0).getRectangle().getX(), EPS);
+            Assert.assertEquals(0f, rectangleTable.get(0).get(0).getRectangle().getX(), EPS);
+            Assert.assertEquals(0f, rectangleTable.get(0).get(1).getRectangle().getX(), EPS);
+            Assert.assertEquals(0f, rectangleTable.get(1).get(0).getRectangle().getX(), EPS);
 
-        Assert.assertEquals(166.09375f, rectangleTable.get(0).get(0).getRectangle().getY(), EPS);
-        Assert.assertEquals(82.03125f, rectangleTable.get(0).get(1).getRectangle().getY(), EPS);
-        Assert.assertEquals(82.03125f, rectangleTable.get(1).get(0).getRectangle().getY(), EPS);
+            Assert.assertEquals(0f, rectangleTable.get(0).get(0).getRectangle().getY(), EPS);
+            Assert.assertEquals(0f, rectangleTable.get(0).get(1).getRectangle().getY(), EPS);
+            Assert.assertEquals(0f, rectangleTable.get(1).get(0).getRectangle().getY(), EPS);
+        }
     }
 
     @Test
-    public void ltWidthGrow0Shrink1Item2MarginBorderPadding30JustifyContentFlexStartAndNotValidAlignItemsFlexStartAndNotValidTest01() {
+    public void ltWidthGrow0Shrink1Item2MBP30JustifyContentFlexEndTest() {
         JustifyContent[] justifyContentValues = {
-                JustifyContent.NORMAL,
-                JustifyContent.START,
                 JustifyContent.END,
-                JustifyContent.LEFT,
                 JustifyContent.RIGHT,
-                JustifyContent.FLEX_START
+                JustifyContent.SELF_END,
+                JustifyContent.FLEX_END
         };
         AlignmentPropertyValue[] alignItemsValues = {
-                AlignmentPropertyValue.START,
                 AlignmentPropertyValue.END,
-                AlignmentPropertyValue.SELF_START,
                 AlignmentPropertyValue.SELF_END,
-                AlignmentPropertyValue.BASELINE,
-                AlignmentPropertyValue.FLEX_START
+                AlignmentPropertyValue.FLEX_END,
+                AlignmentPropertyValue.FLEX_END
         };
         for (int j = 0; j < justifyContentValues.length; ++j) {
             Rectangle bBox = new Rectangle(575, 842);
@@ -740,18 +754,18 @@ public void ltWidthGrow0Shrink1Item2MarginBorderPadding30JustifyContentFlexStart
             Assert.assertEquals(110.0f, rectangleTable.get(0).get(1).getRectangle().getWidth(), EPS);
             Assert.assertEquals(50.0f, rectangleTable.get(1).get(0).getRectangle().getWidth(), EPS);
 
-            Assert.assertEquals(0f, rectangleTable.get(0).get(0).getRectangle().getX(), EPS);
+            Assert.assertEquals(40.0f, rectangleTable.get(0).get(0).getRectangle().getX(), EPS);
             Assert.assertEquals(0f, rectangleTable.get(0).get(1).getRectangle().getX(), EPS);
-            Assert.assertEquals(0f, rectangleTable.get(1).get(0).getRectangle().getX(), EPS);
+            Assert.assertEquals(150.0f, rectangleTable.get(1).get(0).getRectangle().getX(), EPS);
 
-            Assert.assertEquals(0f, rectangleTable.get(0).get(0).getRectangle().getY(), EPS);
-            Assert.assertEquals(0f, rectangleTable.get(0).get(1).getRectangle().getY(), EPS);
-            Assert.assertEquals(0f, rectangleTable.get(1).get(0).getRectangle().getY(), EPS);
+            Assert.assertEquals(166.09375f, rectangleTable.get(0).get(0).getRectangle().getY(), EPS);
+            Assert.assertEquals(82.03125f, rectangleTable.get(0).get(1).getRectangle().getY(), EPS);
+            Assert.assertEquals(82.03125f, rectangleTable.get(1).get(0).getRectangle().getY(), EPS);
         }
     }
 
     @Test
-    public void ltWidthGrow0Shrink1Item2MarginBorderPadding30AlignItemsStretchAndNormalTest01() {
+    public void ltWidthGrow0Shrink1Item2MBP30AlignItemsStretchTest() {
         AlignmentPropertyValue[] alignItemsValues = {
                 AlignmentPropertyValue.STRETCH,
                 AlignmentPropertyValue.NORMAL
@@ -811,7 +825,7 @@ public void ltWidthGrow0Shrink1Item2MarginBorderPadding30AlignItemsStretchAndNor
     }
 
     @Test
-    public void ltWidthGrow0Shrink0Item2MarginBorderPadding30JustifyContentCenterAlignItemsCenterDontFitTest01() {
+    public void ltWidthGrow0Shrink1Item2MBP30JustifyContentCenterDontFitTest() {
         Rectangle bBox = new Rectangle(575, 842);
         List<UnitValue> flexBasisValues = Arrays.<UnitValue>asList(
                 UnitValue.createPointValue(100f),