Skip to content

Commit eb06a49

Browse files
nanouhnanouh
committed
Change expected log messages to correct constant
DEVSIX-5879
1 parent 563a684 commit eb06a49

File tree

62 files changed

+144
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+144
-142
lines changed

‎src/main/java/com/itextpdf/html2pdf/logs/Html2PdfLogMessageConstant.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ public final class Html2PdfLogMessageConstant {
4747
/** The Constant CSS_PROPERTY_IN_PERCENTS_NOT_SUPPORTED. */
4848
public static final String CSS_PROPERTY_IN_PERCENTS_NOT_SUPPORTED = "Css property {0} in percents is not supported";
4949

50-
public static final String DEFAULT_VALUE_OF_CSS_PROPERTY_UNKNOWN =
51-
"Default value of the css property \"{0}\" is unknown.";
52-
5350
/** The Constant ERROR_LOADING_FONT. */
5451
public static final String ERROR_LOADING_FONT = "Error while loading font";
5552

@@ -117,11 +114,7 @@ public final class Html2PdfLogMessageConstant {
117114

118115
/** The Constant PAGE_SIZE_VALUE_IS_INVALID. */
119116
public static final String PAGE_SIZE_VALUE_IS_INVALID = "Page size value {0} is invalid.";
120-
121-
/** The Constant QUOTES_PROPERTY_INVALID. */
122-
public static final String QUOTES_PROPERTY_INVALID =
123-
"Quote property \"{0}\" is invalid. It should contain even number of <string> values.";
124-
117+
125118
/** The Constant TEXT_DECORATION_BLINK_NOT_SUPPORTED. */
126119
public static final String TEXT_DECORATION_BLINK_NOT_SUPPORTED = "text-decoration: blink not supported";
127120

@@ -134,16 +127,9 @@ public final class Html2PdfLogMessageConstant {
134127
/** The Constant UNABLE_TO_PROCESS_SVG. */
135128
public static final String UNABLE_TO_PROCESS_SVG_ELEMENT = "Unable to process an SVG element";
136129

137-
/** The Constant UNABLE_TO_RESOLVE_COUNTER. */
138-
public static final String UNABLE_TO_RESOLVE_COUNTER = "Unable to resolve counter \"{0}\"";
139-
140130
/** The Constant UNABLE_TO_RETRIEVE_FONT. */
141131
public static final String UNABLE_TO_RETRIEVE_FONT = "Unable to retrieve font:\n {0}";
142132

143-
/** The Constant UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI. */
144-
public static final String UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI =
145-
"Unable to retrieve image with given base URI ({0}) and image source path ({1})";
146-
147133
/** The Constant UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI. */
148134
public static final String UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI =
149135
"Unable to retrieve stream with given base URI ({0}) and source path ({1})";

‎src/test/java/com/itextpdf/html2pdf/HtmlConverterPdfA3Test.java‎

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

2525
import com.itextpdf.commons.utils.MessageFormatUtil;
26-
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
2726
import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
2827
import com.itextpdf.kernel.pdf.PdfAConformance;
2928
import com.itextpdf.kernel.pdf.PdfOutputIntent;
3029
import com.itextpdf.kernel.pdf.PdfWriter;
3130
import com.itextpdf.pdfa.PdfADocument;
3231
import com.itextpdf.pdfa.exceptions.PdfAConformanceException;
3332
import com.itextpdf.pdfa.exceptions.PdfaExceptionMessageConstant;
33+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
3434
import com.itextpdf.test.LogLevelConstants;
3535
import com.itextpdf.test.annotations.LogMessage;
3636
import com.itextpdf.test.annotations.LogMessages;
@@ -115,7 +115,7 @@ public void convertToPdfA3ASimpleTest() throws IOException, InterruptedException
115115
//TODO DEVSIX-4201 adapt test when property is added
116116
@Test
117117
@LogMessages(messages = {
118-
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2,
118+
@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2,
119119
logLevel = LogLevelConstants.WARN)
120120
})
121121
public void convertToPdfA3ColorsTest() throws IOException, InterruptedException {

‎src/test/java/com/itextpdf/html2pdf/HtmlConverterPdfA4Test.java‎

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

2525
import com.itextpdf.commons.utils.MessageFormatUtil;
26-
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
2726
import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
2827
import com.itextpdf.kernel.pdf.PdfAConformance;
2928
import com.itextpdf.kernel.pdf.PdfOutputIntent;
@@ -35,6 +34,7 @@ This file is part of the iText (R) project.
3534
import com.itextpdf.pdfa.checker.PdfA4Checker;
3635
import com.itextpdf.pdfa.exceptions.PdfAConformanceException;
3736
import com.itextpdf.pdfa.exceptions.PdfaExceptionMessageConstant;
37+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
3838
import com.itextpdf.test.ExtendedITextTest;
3939
import com.itextpdf.test.LogLevelConstants;
4040
import com.itextpdf.test.annotations.LogMessage;
@@ -85,7 +85,7 @@ public void convertToPdfA4SimpleTest() throws IOException, InterruptedException
8585
//TODO DEVSIX-4201 adapt test when property is added
8686
@Test
8787
@LogMessages(messages = {
88-
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2,
88+
@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2,
8989
logLevel = LogLevelConstants.WARN)
9090
})
9191
public void convertToPdfA4ColorsTest() throws IOException, InterruptedException {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ This file is part of the iText (R) project.
2424

2525
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
2626
import com.itextpdf.html2pdf.HtmlConverter;
27-
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
2827
import com.itextpdf.kernel.utils.CompareTool;
2928
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
3029
import com.itextpdf.test.annotations.LogMessage;
@@ -81,7 +80,7 @@ public void backgroundMarginHtmlTest() throws IOException, InterruptedException
8180
@Test
8281
// TODO DEVSIX-4426 support rotateZ() - remove log message after fixing
8382
@LogMessages(messages = {
84-
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)})
83+
@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)})
8584
public void backgroundTransformedRootTest() throws IOException, InterruptedException {
8685
convertToPdfAndCompare("backgroundTransformedRoot", sourceFolder, destinationFolder);
8786
}
@@ -116,7 +115,7 @@ public void backgroundImageAndColorNotLastTest() throws IOException, Interrupted
116115
}
117116

118117
@Test
119-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION))
118+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION))
120119
public void backgroundImageAndColorsTest() throws IOException, InterruptedException {
121120
convertToPdfAndCompare("background_image_and_colors", sourceFolder, destinationFolder);
122121
}

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

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

2525
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
26-
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
2726
import com.itextpdf.io.logs.IoLogMessageConstant;
2827
import com.itextpdf.styledxmlparser.css.validate.CssDeclarationValidationMaster;
2928
import com.itextpdf.styledxmlparser.css.validate.impl.CssDefaultValidator;
3029
import com.itextpdf.styledxmlparser.css.validate.impl.CssDeviceCmykAwareValidator;
30+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
3131
import com.itextpdf.test.annotations.LogMessage;
3232
import com.itextpdf.test.annotations.LogMessages;
3333

@@ -54,7 +54,7 @@ public void border01Test() throws IOException, InterruptedException {
5454
}
5555

5656
@Test
57-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 4))
57+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 4))
5858
public void border02Test() throws IOException, InterruptedException {
5959
convertToPdfAndCompare("border02", sourceFolder, destinationFolder);
6060
}
@@ -70,7 +70,7 @@ public void border04Test() throws IOException, InterruptedException {
7070
}
7171

7272
@Test
73-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
73+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
7474
public void border05Test() throws IOException, InterruptedException {
7575
convertToPdfAndCompare("border05", sourceFolder, destinationFolder);
7676
}
@@ -91,13 +91,13 @@ public void border08Test() throws IOException, InterruptedException {
9191
}
9292

9393
@Test
94-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
94+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
9595
public void border09Test() throws IOException, InterruptedException {
9696
convertToPdfAndCompare("border09", sourceFolder, destinationFolder);
9797
}
9898

9999
@Test
100-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
100+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
101101
public void border10Test() throws IOException, InterruptedException {
102102
convertToPdfAndCompare("border10", sourceFolder, destinationFolder);
103103
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ This file is part of the iText (R) project.
3232
import com.itextpdf.kernel.pdf.PdfDocument;
3333
import com.itextpdf.kernel.pdf.PdfWriter;
3434
import com.itextpdf.kernel.utils.CompareTool;
35+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
3536
import com.itextpdf.test.annotations.LogMessage;
3637
import com.itextpdf.test.annotations.LogMessages;
3738

@@ -332,7 +333,7 @@ public void displayDivInlineWithStyle() throws IOException, InterruptedException
332333
}
333334

334335
@Test
335-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION
336+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION
336337
, count = 7))
337338
public void inlineBlockInsideTableCellTest() throws IOException, InterruptedException {
338339

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

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

2525
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
26-
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
26+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
2727
import com.itextpdf.test.annotations.LogMessage;
2828
import com.itextpdf.test.annotations.LogMessages;
2929
import org.junit.jupiter.api.BeforeAll;
@@ -44,7 +44,7 @@ public static void beforeClass() {
4444
}
4545

4646
@Test
47-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
47+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
4848
public void singleBlockSingleParagraphRight() throws IOException, InterruptedException {
4949
/* this test shows different combinations of float values blocks and paragraph align RIGHT within div container
5050
*/
@@ -53,21 +53,21 @@ public void singleBlockSingleParagraphRight() throws IOException, InterruptedExc
5353
}
5454

5555
@Test
56-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
56+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
5757
public void singleBlockSingleParagraphLeft() throws IOException, InterruptedException {
5858
//TODO: update test after ticket DEVSIX-1720 fix (WARN Invalid css property declaration: float: initial)
5959
convertToPdfAndCompare("singleBlockSingleParagraphLeft",sourceFolder, destinationFolder);
6060
}
6161

6262
@Test
63-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
63+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
6464
public void singleBlockSingleParagraphJustify() throws IOException, InterruptedException {
6565
//TODO: update test after ticket DEVSIX-1720 fix (WARN Invalid css property declaration: float: initial)
6666
convertToPdfAndCompare("singleBlockSingleParagraphJustify", sourceFolder, destinationFolder);
6767
}
6868

6969
@Test
70-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
70+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
7171
public void singleBlockSingleParagraphCenter() throws IOException, InterruptedException {
7272
//TODO: update test after ticket DEVSIX-1720 fix (WARN Invalid css property declaration: float: initial)
7373
convertToPdfAndCompare("singleBlockSingleParagraphCenter", sourceFolder, destinationFolder);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ This file is part of the iText (R) project.
3030
import com.itextpdf.io.logs.IoLogMessageConstant;
3131
import com.itextpdf.io.util.UrlUtil;
3232
import com.itextpdf.kernel.utils.CompareTool;
33+
import com.itextpdf.kernel.xmp.XMPException;
3334
import com.itextpdf.layout.font.FontProvider;
3435
import com.itextpdf.layout.font.selectorstrategy.BestMatchFontSelectorStrategy.BestMatchFontSelectorStrategyFactory;
3536
import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
3637
import com.itextpdf.styledxmlparser.css.media.MediaType;
38+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
3739
import com.itextpdf.test.ExtendedITextTest;
3840
import com.itextpdf.test.annotations.LogMessage;
3941
import com.itextpdf.test.annotations.LogMessages;
@@ -102,7 +104,7 @@ public void fontSelectorTest01() throws IOException, InterruptedException {
102104
}
103105

104106
@Test
105-
@LogMessages(messages = {@LogMessage(messageTemplate = Html2PdfLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI)})
107+
@LogMessages(messages = {@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI)})
106108
public void fontFaceGrammarTest() throws IOException, InterruptedException {
107109
runTest("fontFaceGrammarTest");
108110
}
@@ -281,7 +283,7 @@ public void correctUrlWithNotUsedUnicodeRangeTest() throws IOException, Interrup
281283

282284
@Test
283285
@LogMessages(messages = {
284-
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI),
286+
@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI),
285287
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.UNABLE_TO_RETRIEVE_FONT),
286288
})
287289
// TODO DEVSIX-2054

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ This file is part of the iText (R) project.
3131
import com.itextpdf.layout.element.Text;
3232
import com.itextpdf.layout.properties.OverflowWrapPropertyValue;
3333
import com.itextpdf.layout.properties.Property;
34+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
3435
import com.itextpdf.test.ExtendedITextTest;
3536
import com.itextpdf.test.annotations.LogMessage;
3637
import com.itextpdf.test.annotations.LogMessages;
@@ -121,7 +122,7 @@ public void overflowWrapWordWrapInheritance() throws IOException, InterruptedExc
121122

122123
@Test
123124
@LogMessages(messages = {
124-
@LogMessage(messageTemplate = com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)
125+
@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)
125126
})
126127
public void chosenOverflowWrapValue01() throws IOException {
127128
List<IElement> elements = convertToElements("chosenOverflowWrapValue01");
@@ -137,7 +138,7 @@ public void chosenOverflowWrapValue01() throws IOException {
137138

138139
@Test
139140
@LogMessages(messages = {
140-
@LogMessage(messageTemplate = com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2)
141+
@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2)
141142
})
142143
public void chosenOverflowWrapValue02() throws IOException {
143144
List<IElement> elements = convertToElements("chosenOverflowWrapValue02");
@@ -195,7 +196,7 @@ public void chosenOverflowWrapValueUnset02() throws IOException {
195196

196197
@Test
197198
@LogMessages(messages = {
198-
@LogMessage(messageTemplate = com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)
199+
@LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)
199200
})
200201
public void overflowWrapWordWrapInheritanceAndInvalidValues() throws IOException {
201202
List<IElement> elements = convertToElements("overflowWrapWordWrapInheritanceAndInvalidValues");

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

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

2525
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
26-
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
26+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
2727
import com.itextpdf.test.annotations.LogMessage;
2828
import com.itextpdf.test.annotations.LogMessages;
2929

@@ -45,7 +45,7 @@ public static void beforeClass() {
4545
}
4646

4747
@Test
48-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
48+
@LogMessages(messages = @LogMessage(messageTemplate = StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 2))
4949
public void test01() throws IOException, InterruptedException {
5050
convertToPdfAndCompare("test01", sourceFolder, destinationFolder);
5151
}

0 commit comments

Comments
 (0)