Skip to content

Commit 80d5a3b

Browse files
SnipxSnipx
committed
Introduce new LayoutLogMessageConstant class and move one log message there
DEVSIX-6175
1 parent 17b47a2 commit 80d5a3b

File tree

12 files changed

+36
-33
lines changed

12 files changed

+36
-33
lines changed

‎src/test/java/com/itextpdf/html2pdf/css/PageBreakTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ This file is part of the iText (R) project.
5353
import com.itextpdf.layout.Document;
5454
import com.itextpdf.layout.element.IBlockElement;
5555
import com.itextpdf.layout.element.IElement;
56+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
5657
import com.itextpdf.test.annotations.LogMessage;
5758
import com.itextpdf.test.annotations.LogMessages;
5859
import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
@@ -217,42 +218,42 @@ public void pageBreakInConstrainedDivTest() throws IOException, InterruptedExcep
217218
}
218219

219220
@Test
220-
@LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
221+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
221222
// TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
222223
public void pageBreakInsideAvoidInTdWithBrInsideTest() throws IOException, InterruptedException {
223224
convertToElements("pageBreakInsideAvoidInTdWithBrInside");
224225
}
225226

226227
@Test
227-
@LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
228+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
228229
// TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
229230
public void pageBreakInsideAvoidInTdWithSpanInsideTest() throws IOException, InterruptedException {
230231
convertToElements("pageBreakInsideAvoidInTdWithSpanInside");
231232
}
232233

233234
@Test
234-
@LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
235+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
235236
// TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
236237
public void pageBreakInsideAvoidInTdWithHeadingsTest() throws IOException, InterruptedException {
237238
convertToElements("pageBreakInsideAvoidInTdWithHeadings");
238239
}
239240

240241
@Test
241-
@LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
242+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
242243
// TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
243244
public void pageBreakInsideAvoidInTdWithParaTest() throws IOException, InterruptedException {
244245
convertToElements("pageBreakInsideAvoidInTdWithPara");
245246
}
246247

247248
@Test
248-
@LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
249+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
249250
// TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
250251
public void pageBreakInsideAvoidInTdWithTableTest() throws IOException, InterruptedException {
251252
convertToElements("pageBreakInsideAvoidInTdWithTable");
252253
}
253254

254255
@Test
255-
@LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
256+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
256257
// TODO: DEVSIX-5263 inconsistent behavior when page-break-inside: avoid set in td and td contains inline elements
257258
public void pageBreakInsideAvoidInTdWithDivTest() throws IOException, InterruptedException {
258259
convertToElements("pageBreakInsideAvoidInTdWithDiv");

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreakMargins002Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ This file is part of the iText (R) project.
4343
package com.itextpdf.html2pdf.css.w3c.css21.pagination;
4444

4545
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
46-
import com.itextpdf.io.logs.IoLogMessageConstant;
46+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
4747
import com.itextpdf.test.annotations.LogMessage;
4848
import com.itextpdf.test.annotations.LogMessages;
4949

50-
@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2))
50+
@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2))
5151
public class PageBreakMargins002Test extends W3CCssTest {
5252
@Override
5353
protected String getHtmlFileName() {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreaks100Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ This file is part of the iText (R) project.
4343
package com.itextpdf.html2pdf.css.w3c.css21.pagination;
4444

4545
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
46-
import com.itextpdf.io.logs.IoLogMessageConstant;
46+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
4747
import com.itextpdf.test.annotations.LogMessage;
4848
import com.itextpdf.test.annotations.LogMessages;
4949

50-
@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
50+
@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
5151
public class PageBreaks100Test extends W3CCssTest {
5252
@Override
5353
protected String getHtmlFileName() {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css21/pagination/PageBreaks101Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ This file is part of the iText (R) project.
4343
package com.itextpdf.html2pdf.css.w3c.css21.pagination;
4444

4545
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
46-
import com.itextpdf.io.logs.IoLogMessageConstant;
46+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
4747
import com.itextpdf.test.annotations.LogMessage;
4848
import com.itextpdf.test.annotations.LogMessages;
4949

50-
@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
50+
@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
5151
public class PageBreaks101Test extends W3CCssTest {
5252
@Override
5353
protected String getHtmlFileName() {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow001Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ This file is part of the iText (R) project.
2323
package com.itextpdf.html2pdf.css.w3c.css_flexbox;
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
26+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
2727
import com.itextpdf.test.annotations.LogMessage;
2828
import com.itextpdf.test.annotations.LogMessages;
2929

3030
@LogMessages(messages = {
31-
@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
31+
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
3232
})
3333
// TODO DEVSIX-5087 Image is not displayed correctly when overflow happens
3434
public class FlexAspectRatioImgRow001Test extends W3CCssTest {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow002Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ This file is part of the iText (R) project.
2323
package com.itextpdf.html2pdf.css.w3c.css_flexbox;
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
26+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
2727
import com.itextpdf.test.annotations.LogMessage;
2828
import com.itextpdf.test.annotations.LogMessages;
2929

3030
@LogMessages(messages = {
31-
@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
31+
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
3232
})
3333
// TODO DEVSIX-5087 Image is not displayed correctly when overflow happens
3434
public class FlexAspectRatioImgRow002Test extends W3CCssTest {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgRow003Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ This file is part of the iText (R) project.
2323
package com.itextpdf.html2pdf.css.w3c.css_flexbox;
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
26+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
2727
import com.itextpdf.test.annotations.LogMessage;
2828
import com.itextpdf.test.annotations.LogMessages;
2929

3030
@LogMessages(messages = {
31-
@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
31+
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 1),
3232
})
3333
// TODO DEVSIX-5087 Image is not displayed correctly when overflow happens
3434
public class FlexAspectRatioImgRow003Test extends W3CCssTest {

‎src/test/java/com/itextpdf/html2pdf/element/FormTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ This file is part of the iText (R) project.
4545
import com.itextpdf.forms.PdfAcroForm;
4646
import com.itextpdf.html2pdf.ConverterProperties;
4747
import com.itextpdf.html2pdf.HtmlConverter;
48-
import com.itextpdf.io.logs.IoLogMessageConstant;
4948
import com.itextpdf.io.util.UrlUtil;
5049
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
5150
import com.itextpdf.kernel.pdf.PdfDocument;
5251
import com.itextpdf.kernel.pdf.PdfReader;
5352
import com.itextpdf.kernel.pdf.PdfWriter;
5453
import com.itextpdf.kernel.utils.CompareTool;
54+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
5555
import com.itextpdf.test.ExtendedITextTest;
5656
import com.itextpdf.test.annotations.LogMessage;
5757
import com.itextpdf.test.annotations.LogMessages;
@@ -174,15 +174,15 @@ public void buttonSplit01Test() throws IOException, InterruptedException {
174174

175175
@Test
176176
@LogMessages(messages = {
177-
@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
177+
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
178178
})
179179
public void buttonSplit02Test() throws IOException, InterruptedException {
180180
runTest("buttonSplit02");
181181
}
182182

183183
@Test
184184
@LogMessages(messages = {
185-
@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
185+
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, count = 2),
186186
})
187187
public void buttonSplit03Test() throws IOException, InterruptedException {
188188
runTest("buttonSplit03");

‎src/test/java/com/itextpdf/html2pdf/element/InputTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ This file is part of the iText (R) project.
5151
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
5252
import com.itextpdf.html2pdf.attach.impl.layout.form.element.InputField;
5353
import com.itextpdf.html2pdf.attach.impl.tags.DivTagWorker;
54-
import com.itextpdf.io.logs.IoLogMessageConstant;
5554
import com.itextpdf.io.util.UrlUtil;
5655
import com.itextpdf.kernel.colors.ColorConstants;
5756
import com.itextpdf.kernel.geom.PageSize;
@@ -62,6 +61,7 @@ This file is part of the iText (R) project.
6261
import com.itextpdf.layout.element.IBlockElement;
6362
import com.itextpdf.layout.element.IElement;
6463
import com.itextpdf.layout.element.Paragraph;
64+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
6565
import com.itextpdf.styledxmlparser.node.IElementNode;
6666
import com.itextpdf.test.annotations.LogMessage;
6767
import com.itextpdf.test.annotations.LogMessages;
@@ -273,7 +273,7 @@ public void checkboxTaggingTest() throws IOException, InterruptedException {
273273
@Test
274274
// TODO DEVSIX-5571 Update cmp after the ticket is closed
275275
@LogMessages(ignore = true, messages = {
276-
@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
276+
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA),
277277
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.INPUT_FIELD_DOES_NOT_FIT),
278278
})
279279
public void checkboxFullWidthDisplayBlockTest() throws IOException, InterruptedException {
@@ -282,7 +282,7 @@ public void checkboxFullWidthDisplayBlockTest() throws IOException, InterruptedE
282282

283283
@Test
284284
@LogMessages(ignore = true, messages = {
285-
@LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)
285+
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)
286286
})
287287
public void longInputValueCausesNothingTest() throws IOException, InterruptedException {
288288
ConverterProperties converterProperties = new ConverterProperties();

‎src/test/java/com/itextpdf/html2pdf/element/SelectTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ This file is part of the iText (R) project.
4747
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
4848
import com.itextpdf.io.util.UrlUtil;
4949
import com.itextpdf.kernel.utils.CompareTool;
50+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
5051
import com.itextpdf.test.ExtendedITextTest;
5152
import com.itextpdf.test.annotations.LogMessage;
5253
import com.itextpdf.test.annotations.LogMessages;
@@ -274,13 +275,13 @@ public void selectNotFittingTest01() throws IOException, InterruptedException {
274275
}
275276

276277
@Test
277-
@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
278+
@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
278279
public void selectNotFittingTest02() throws IOException, InterruptedException {
279280
runTest("selectNotFittingTest02");
280281
}
281282

282283
@Test
283-
@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
284+
@LogMessages(messages = @LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
284285
public void selectNotFittingTest03() throws IOException, InterruptedException {
285286
runTest("selectNotFittingTest03");
286287
}

0 commit comments

Comments
 (0)