Basic support of CSS order property for flex items

DEVSIX-9402

Author: Alexandr Fedorov

src/main/java/com/itextpdf/html2pdf/css/apply/util/FlexApplierUtil.java

@@ -69,6 +69,8 @@ public static void applyFlexItemProperties(Map<String, String> cssProps, Process
 
         applyAlignSelf(cssProps, element);
 
+        applyOrder(cssProps, element);
+
         final String flexGrow = cssProps.get(CommonCssConstants.FLEX_GROW);
         if (flexGrow != null) {
             final Float flexGrowValue = CssDimensionParsingUtils.parseFloat(flexGrow);
@@ -264,6 +266,10 @@ private static void applyAlignItems(Map<String, String> cssProps, IPropertyConta
         }
     }
 
+    private static void applyOrder(Map<String, String> cssProps, IPropertyContainer element) {
+        element.setProperty(Property.ORDER, CssDimensionParsingUtils.parseInteger(cssProps.get(CommonCssConstants.ORDER)));
+    }
+
     private static void applyJustifyContent(Map<String, String> cssProps, IPropertyContainer element) {
         final String justifyContentString = cssProps.get(CommonCssConstants.JUSTIFY_CONTENT);
         if (justifyContentString != null) {
@@ -384,9 +390,7 @@ private static void logWarningIfThereAreNotSupportedPropertyValues(Map<String, S
     }
 
     private static Map<String, Set<String>> createSupportedFlexItemPropertiesAndValuesMap() {
-        final Map<String, Set<String>> supportedPairs = new HashMap<>();
-        supportedPairs.put(CommonCssConstants.ORDER, new HashSet<>());
-        return supportedPairs;
+        return new HashMap<>();
     }
 
     private static Map<String, Set<String>> createSupportedFlexContainerPropertiesAndValuesMap() {

src/test/java/com/itextpdf/html2pdf/css/apply/util/FlexApplierUtilTest.java

@@ -257,11 +257,10 @@ public void applyFlexContainerUnsupportedPropertiesUnsupportedValuesTest() {
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 2))
+    @LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET))
     public void applyFlexItemUnsupportedPropertiesUnsupportedValuesTest() {
         ProcessorContext context = new ProcessorContext(new ConverterProperties());
         Map<String, String> cssProps = new HashMap<>();
-        cssProps.put(CssConstants.ORDER, "1");
         cssProps.put(CssConstants.ALIGN_SELF, CssConstants.SAFE);
         IElement element = new Div();
 

src/test/java/com/itextpdf/html2pdf/css/flex/FlexOrderTest.java

@@ -36,7 +36,6 @@ This file is part of the iText (R) project.
 @Tag("IntegrationTest")
 public class FlexOrderTest extends ExtendedHtmlConversionITextTest {
 
-    //TODO DEVSIX-9402: Update cmp files
     private static final String SOURCE_FOLDER = "./src/test/resources/com/itextpdf/html2pdf/css/flex/FlexOrderTest/";
     private static final String DESTINATION_FOLDER = "./target/test/com/itextpdf/html2pdf/css/flex/FlexOrderTest/";
 
@@ -47,25 +46,18 @@ public static void beforeClass() {
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 36)
-    })
     public void decimalAlignContentWrapTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("decimalAlignContentWrap", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 36)
-    })
     public void decimalAlignContentWrapReverseTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("decimalAlignContentWrapReverse", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 16),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION),
+            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET),
             @LogMessage(messageTemplate = Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER)
     })
     public void decimalAlignItemsTest() throws IOException, InterruptedException {
@@ -74,189 +66,118 @@ public void decimalAlignItemsTest() throws IOException, InterruptedException {
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 8)
+            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET)
     })
     public void decimalAlignSelfTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("decimalAlignSelf", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 4)
-    })
     public void decimalsTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("decimals", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 9)
-    })
     public void decimalsNestedTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("decimalsNested", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 10)
-    })
     public void decimalsDuplicatedValuesTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("decimalsDuplicatedValues", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
+    public void decimalsDuplicatedValuesWrapReverseTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("decimalsDuplicatedValuesWrapReverse", SOURCE_FOLDER, DESTINATION_FOLDER, true);
+    }
+
+    @Test
     public void dirColumnTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("dirColumn", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 12)
-    })
     public void dirColumnLongTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("dirColumnLong", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void dirColumnReverseTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("dirColumnReverse", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void dirRowTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("dirRow", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void dirRowReverseTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("dirRowReverse", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 6)
-    })
     public void dirRowWideTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("dirRowWide", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void flexBasisTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("flexBasis", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 14),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void flexGrowTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("flexGrow", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 14),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void flexShrinkTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("flexShrink", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void flowColumnWrapTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("flowColumnWrap", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void flowRowWrapTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("flowRowWrap", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 3)
-    })
     public void inheritTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("inherit", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 7)
-    })
     public void inheritNestedTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("inheritNested", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 2),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void initialTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("initial", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 35),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN, count = 7)
-    })
     public void initialAlignContentTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("initialAlignContent", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 5)
-    })
     public void negativeTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("negative", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 5)
-    })
     public void noWrapTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("noWrap", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 3)
-    })
     public void revertTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("revert", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
@@ -270,27 +191,16 @@ public void revertLayerTest() throws IOException, InterruptedException {
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 3)
-    })
     public void unsetTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("unset", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void wrapTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("wrap", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }
 
     @Test
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 18),
-            @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN)
-    })
     public void wrapReverseTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("wrapReverse", SOURCE_FOLDER, DESTINATION_FOLDER, true);
     }

src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexboxItemsAsStackingContexts002Test.java

@@ -27,8 +27,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-// TODO DEVSIX-9402 Flex: basic support of CSS order property for flex items
-@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET, count = 3))
 public class FlexboxItemsAsStackingContexts002Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {