Introduce new LayoutLogMessageConstant class and move one log message there

Snipx · Snipx · commit 80d5a3bad7f7 · 2021-12-08T23:47:28.000+03:00
DEVSIX-6175
diff --git a/src/test/java/com/itextpdf/html2pdf/css/PageBreakTest.java b/src/test/java/com/itextpdf/html2pdf/css/PageBreakTest.java
@@ -53,6 +53,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.element.IElement;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
@@ -217,42 +218,42 @@ public void pageBreakInConstrainedDivTest() throws IOException, InterruptedExcep
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
+    @LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
     // TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
     public void pageBreakInsideAvoidInTdWithBrInsideTest() throws IOException, InterruptedException {
         convertToElements("pageBreakInsideAvoidInTdWithBrInside");
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
+    @LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
     // TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
     public void pageBreakInsideAvoidInTdWithSpanInsideTest() throws IOException, InterruptedException {
         convertToElements("pageBreakInsideAvoidInTdWithSpanInside");
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
+    @LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
     // TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
     public void pageBreakInsideAvoidInTdWithHeadingsTest() throws IOException, InterruptedException {
         convertToElements("pageBreakInsideAvoidInTdWithHeadings");
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
+    @LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
     // TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
     public void pageBreakInsideAvoidInTdWithParaTest() throws IOException, InterruptedException {
         convertToElements("pageBreakInsideAvoidInTdWithPara");
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
+    @LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
     // TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
     public void pageBreakInsideAvoidInTdWithTableTest() throws IOException, InterruptedException {
         convertToElements("pageBreakInsideAvoidInTdWithTable");
     }
 
     @Test
-    @LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
+    @LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
     // TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
     public void pageBreakInsideAvoidInTdWithDivTest() throws IOException, InterruptedException {
         convertToElements("pageBreakInsideAvoidInTdWithDiv");
diff --git a/src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreakMargins002Test.java b/src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreakMargins002Test.java
@@ -43,11 +43,11 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css21.pagination;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import com.itextpdf.io.logs.IoLogMessageConstant;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2))
+@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2))
 public class PageBreakMargins002Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {
diff --git a/src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreaks100Test.java b/src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreaks100Test.java
@@ -43,11 +43,11 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css21.pagination;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import com.itextpdf.io.logs.IoLogMessageConstant;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
+@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
 public class PageBreaks100Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {
diff --git a/src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreaks101Test.java b/src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreaks101Test.java
@@ -43,11 +43,11 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css21.pagination;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import com.itextpdf.io.logs.IoLogMessageConstant;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
-@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
+@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
 public class PageBreaks101Test extends W3CCssTest {
     @Override
     protected String getHtmlFileName() {
diff --git a/src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow001Test.java b/src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow001Test.java
@@ -23,12 +23,12 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css_flexbox;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import com.itextpdf.io.logs.IoLogMessageConstant;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
 @LogMessages(messages = {
-        @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
+        @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
 })
 // TODO DEVSIX-5087 Image is not displayed correctly when overflow happens
 public class FlexAspectRatioImgRow001Test extends W3CCssTest {
diff --git a/src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow002Test.java b/src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow002Test.java
@@ -23,12 +23,12 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css_flexbox;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import com.itextpdf.io.logs.IoLogMessageConstant;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
 @LogMessages(messages = {
-        @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
+        @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
 })
 // TODO DEVSIX-5087 Image is not displayed correctly when overflow happens
 public class FlexAspectRatioImgRow002Test extends W3CCssTest {
diff --git a/src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow003Test.java b/src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow003Test.java
@@ -23,12 +23,12 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf.css.w3c.css_flexbox;
 
 import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
-import com.itextpdf.io.logs.IoLogMessageConstant;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 
 @LogMessages(messages = {
-        @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
+        @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
 })
 // TODO DEVSIX-5087 Image is not displayed correctly when overflow happens
 public class FlexAspectRatioImgRow003Test extends W3CCssTest {
diff --git a/src/test/java/com/itextpdf/html2pdf/element/FormTest.java b/src/test/java/com/itextpdf/html2pdf/element/FormTest.java
@@ -45,13 +45,13 @@ This file is part of the iText (R) project.
 import com.itextpdf.forms.PdfAcroForm;
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.HtmlConverter;
-import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.io.util.UrlUtil;
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
@@ -174,15 +174,15 @@ public void buttonSplit01Test() throws IOException, InterruptedException {
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
     })
     public void buttonSplit02Test() throws IOException, InterruptedException {
         runTest("buttonSplit02");
     }
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
     })
     public void buttonSplit03Test() throws IOException, InterruptedException {
         runTest("buttonSplit03");
diff --git a/src/test/java/com/itextpdf/html2pdf/element/InputTest.java b/src/test/java/com/itextpdf/html2pdf/element/InputTest.java
@@ -51,7 +51,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
 import com.itextpdf.html2pdf.attach.impl.layout.form.element.InputField;
 import com.itextpdf.html2pdf.attach.impl.tags.DivTagWorker;
-import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.io.util.UrlUtil;
 import com.itextpdf.kernel.colors.ColorConstants;
 import com.itextpdf.kernel.geom.PageSize;
@@ -62,6 +61,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.element.IElement;
 import com.itextpdf.layout.element.Paragraph;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.styledxmlparser.node.IElementNode;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
@@ -273,7 +273,7 @@ public void checkboxTaggingTest() throws IOException, InterruptedException {
     @Test
     // TODO DEVSIX-5571 Update cmp after the ticket is closed
     @LogMessages(ignore = true, messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
             @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INPUT_FIELD_DOES_NOT_FIT),
     })
     public void checkboxFullWidthDisplayBlockTest() throws IOException, InterruptedException {
@@ -282,7 +282,7 @@ public void checkboxFullWidthDisplayBlockTest() throws IOException, InterruptedE
 
     @Test
     @LogMessages(ignore = true, messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)
     })
     public void longInputValueCausesNothingTest() throws IOException, InterruptedException {
         ConverterProperties converterProperties = new ConverterProperties();
diff --git a/src/test/java/com/itextpdf/html2pdf/element/SelectTest.java b/src/test/java/com/itextpdf/html2pdf/element/SelectTest.java
@@ -47,6 +47,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
 import com.itextpdf.io.util.UrlUtil;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
@@ -274,13 +275,13 @@ public void selectNotFittingTest01() throws IOException, InterruptedException {
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
+    @LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
     public void selectNotFittingTest02() throws IOException, InterruptedException {
         runTest("selectNotFittingTest02");
     }
 
     @Test
-    @LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
+    @LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
     public void selectNotFittingTest03() throws IOException, InterruptedException {
         runTest("selectNotFittingTest03");
     }
diff --git a/src/test/java/com/itextpdf/html2pdf/element/SvgTest.java b/src/test/java/com/itextpdf/html2pdf/element/SvgTest.java
@@ -45,10 +45,10 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.HtmlConverter;
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
-import com.itextpdf.io.logs.IoLogMessageConstant;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
 import com.itextpdf.svg.logs.SvgLogMessageConstant;
 import com.itextpdf.test.ExtendedITextTest;
@@ -110,7 +110,7 @@ public void inlineSvgExternalFontUrlTest() throws IOException, InterruptedExcept
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
     })
     public void convert_inline_Svg_path_in_HTML() throws IOException, InterruptedException {
         String name = "HTML_with_inline_svg_path";
@@ -120,7 +120,7 @@ public void convert_inline_Svg_path_in_HTML() throws IOException, InterruptedExc
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
     })
     // TODO: Update cmp_ file when DEVSIX-2719 resolved
     public void convert_inline_Svg_polygon_in_HTML() throws IOException, InterruptedException {
@@ -131,7 +131,7 @@ public void convert_inline_Svg_polygon_in_HTML() throws IOException, Interrupted
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
     })
     public void convert_namespace_Svg_in_HTML() throws IOException, InterruptedException {
         String name = "namespace_svg";
@@ -299,7 +299,7 @@ public void externalObjectWithResourceTest() throws IOException, InterruptedExce
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 66),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 66),
     })
     public void externalObjectWithGoogleCharts() throws IOException, InterruptedException {
         //TODO update after DEVSIX-2239
diff --git a/src/test/java/com/itextpdf/html2pdf/element/TableTest.java b/src/test/java/com/itextpdf/html2pdf/element/TableTest.java
@@ -55,6 +55,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.element.IElement;
+import com.itextpdf.layout.logs.LayoutLogMessageConstant;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
@@ -291,7 +292,7 @@ public void checkDisplayInTableTagged() throws IOException, InterruptedException
     @Test
     @LogMessages(messages = {
             @LogMessage(messageTemplate =  IoLogMessageConstant.TABLE_WIDTH_IS_MORE_THAN_EXPECTED_DUE_TO_MIN_WIDTH, count = 3),
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2)
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2)
     })
     //TODO update after DEVSIX-2382
     public void checkLargeImagesInTable() throws IOException, InterruptedException {
@@ -532,7 +533,7 @@ public void checkResponsiveTableExample() throws IOException, InterruptedExcepti
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
+            @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
             @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INPUT_FIELD_DOES_NOT_FIT, count = 2),
     })
     //TODO: DEVSIX-3022 - Inputs bigger than enclosing cell force table to split
