Skip to content

Commit a5ae044

Browse files
nanouhiText-CI
nanouh
authored and
iText-CI
committed
Change expected log messages to correct constant
DEVSIX-5879 Autoported commit. Original commit hash: [eb06a49e1]
1 parent 9f1a73b commit a5ae044

File tree

63 files changed

+208
-223
lines changed

Some content is hidden

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

63 files changed

+208
-223
lines changed

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfA3Test.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ You should have received a copy of the GNU Affero General Public License
2323
using System;
2424
using System.IO;
2525
using iText.Commons.Utils;
26-
using iText.Html2pdf.Logs;
2726
using iText.Html2pdf.Resolver.Font;
2827
using iText.Kernel.Pdf;
2928
using iText.Pdfa;
@@ -95,8 +94,8 @@ public virtual void ConvertToPdfA3ASimpleTest() {
9594

9695
//TODO DEVSIX-4201 adapt test when property is added
9796
[NUnit.Framework.Test]
98-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2, LogLevel = LogLevelConstants
99-
.WARN)]
97+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
98+
Count = 2, LogLevel = LogLevelConstants.WARN)]
10099
public virtual void ConvertToPdfA3ColorsTest() {
101100
String sourceHtml = SOURCE_FOLDER + "colors.html";
102101
String destinationPdf = DESTINATION_FOLDER + "pdfA3ColorTest.pdf";

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfA4Test.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ You should have received a copy of the GNU Affero General Public License
2323
using System;
2424
using System.IO;
2525
using iText.Commons.Utils;
26-
using iText.Html2pdf.Logs;
2726
using iText.Html2pdf.Resolver.Font;
2827
using iText.Kernel.Pdf;
2928
using iText.Pdfa;
@@ -68,8 +67,8 @@ public virtual void ConvertToPdfA4SimpleTest() {
6867

6968
//TODO DEVSIX-4201 adapt test when property is added
7069
[NUnit.Framework.Test]
71-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2, LogLevel = LogLevelConstants
72-
.WARN)]
70+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
71+
Count = 2, LogLevel = LogLevelConstants.WARN)]
7372
public virtual void ConvertToPdfA4ColorsTest() {
7473
String sourceHtml = SOURCE_FOLDER + "colors.html";
7574
String destinationPdf = DESTINATION_FOLDER + "pdfA4ColorTest.pdf";

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/BackgroundTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ You should have received a copy of the GNU Affero General Public License
2323
using System;
2424
using System.IO;
2525
using iText.Html2pdf;
26-
using iText.Html2pdf.Logs;
2726
using iText.Kernel.Utils;
2827
using iText.Test.Attributes;
2928

@@ -72,7 +71,7 @@ public virtual void BackgroundMarginHtmlTest() {
7271

7372
[NUnit.Framework.Test]
7473
// TODO DEVSIX-4426 support rotateZ() - remove log message after fixing
75-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
74+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
7675
public virtual void BackgroundTransformedRootTest() {
7776
ConvertToPdfAndCompare("backgroundTransformedRoot", sourceFolder, destinationFolder);
7877
}
@@ -106,7 +105,7 @@ public virtual void BackgroundImageAndColorNotLastTest() {
106105
}
107106

108107
[NUnit.Framework.Test]
109-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
108+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
110109
public virtual void BackgroundImageAndColorsTest() {
111110
ConvertToPdfAndCompare("background_image_and_colors", sourceFolder, destinationFolder);
112111
}

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/BorderTest.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf;
25-
using iText.Html2pdf.Logs;
2625
using iText.StyledXmlParser.Css.Validate;
2726
using iText.StyledXmlParser.Css.Validate.Impl;
2827
using iText.Test.Attributes;
@@ -47,7 +46,8 @@ public virtual void Border01Test() {
4746
}
4847

4948
[NUnit.Framework.Test]
50-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 4)]
49+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
50+
Count = 4)]
5151
public virtual void Border02Test() {
5252
ConvertToPdfAndCompare("border02", sourceFolder, destinationFolder);
5353
}
@@ -63,7 +63,8 @@ public virtual void Border04Test() {
6363
}
6464

6565
[NUnit.Framework.Test]
66-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
66+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
67+
Count = 2)]
6768
public virtual void Border05Test() {
6869
ConvertToPdfAndCompare("border05", sourceFolder, destinationFolder);
6970
}
@@ -84,13 +85,15 @@ public virtual void Border08Test() {
8485
}
8586

8687
[NUnit.Framework.Test]
87-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
88+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
89+
Count = 2)]
8890
public virtual void Border09Test() {
8991
ConvertToPdfAndCompare("border09", sourceFolder, destinationFolder);
9092
}
9193

9294
[NUnit.Framework.Test]
93-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
95+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
96+
Count = 2)]
9497
public virtual void Border10Test() {
9598
ConvertToPdfAndCompare("border10", sourceFolder, destinationFolder);
9699
}

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/DisplayTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ public virtual void DisplayDivInlineWithStyle() {
308308
}
309309

310310
[NUnit.Framework.Test]
311-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 7)]
311+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
312+
Count = 7)]
312313
public virtual void InlineBlockInsideTableCellTest() {
313314
// IO setup
314315
PdfWriter writer = new PdfWriter(new FileInfo(DESTINATION_FOLDER + "inlineBlockInsideTableCellTest.pdf"));

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/FloatAndAlignmentTest.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf;
25-
using iText.Html2pdf.Logs;
2625
using iText.Test.Attributes;
2726

2827
namespace iText.Html2pdf.Css {
@@ -40,7 +39,8 @@ public static void BeforeClass() {
4039
}
4140

4241
[NUnit.Framework.Test]
43-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
42+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
43+
Count = 2)]
4444
public virtual void SingleBlockSingleParagraphRight() {
4545
/* this test shows different combinations of float values blocks and paragraph align RIGHT within div container
4646
*/
@@ -49,21 +49,24 @@ public virtual void SingleBlockSingleParagraphRight() {
4949
}
5050

5151
[NUnit.Framework.Test]
52-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
52+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
53+
Count = 2)]
5354
public virtual void SingleBlockSingleParagraphLeft() {
5455
//TODO: update test after ticket DEVSIX-1720 fix (WARN Invalid css property declaration: float: initial)
5556
ConvertToPdfAndCompare("singleBlockSingleParagraphLeft", sourceFolder, destinationFolder);
5657
}
5758

5859
[NUnit.Framework.Test]
59-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
60+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
61+
Count = 2)]
6062
public virtual void SingleBlockSingleParagraphJustify() {
6163
//TODO: update test after ticket DEVSIX-1720 fix (WARN Invalid css property declaration: float: initial)
6264
ConvertToPdfAndCompare("singleBlockSingleParagraphJustify", sourceFolder, destinationFolder);
6365
}
6466

6567
[NUnit.Framework.Test]
66-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
68+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
69+
Count = 2)]
6770
public virtual void SingleBlockSingleParagraphCenter() {
6871
//TODO: update test after ticket DEVSIX-1720 fix (WARN Invalid css property declaration: float: initial)
6972
ConvertToPdfAndCompare("singleBlockSingleParagraphCenter", sourceFolder, destinationFolder);

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/FontFaceTest.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ public virtual void FontSelectorTest01() {
9090
}
9191

9292
[NUnit.Framework.Test]
93-
[LogMessage(Html2PdfLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI)]
93+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI
94+
)]
9495
public virtual void FontFaceGrammarTest() {
9596
RunTest("fontFaceGrammarTest");
9697
}
@@ -263,7 +264,8 @@ public virtual void CorrectUrlWithNotUsedUnicodeRangeTest() {
263264
}
264265

265266
[NUnit.Framework.Test]
266-
[LogMessage(Html2PdfLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI)]
267+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI
268+
)]
267269
[LogMessage(Html2PdfLogMessageConstant.UNABLE_TO_RETRIEVE_FONT)]
268270
public virtual void DoNotDownloadUnusedFontTest() {
269271
// TODO DEVSIX-2054

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/OverflowWrapTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ You should have received a copy of the GNU Affero General Public License
2424
using System.Collections.Generic;
2525
using System.IO;
2626
using iText.Html2pdf;
27-
using iText.Html2pdf.Logs;
2827
using iText.Kernel.Utils;
2928
using iText.Layout.Element;
3029
using iText.Layout.Properties;
@@ -105,7 +104,7 @@ public virtual void OverflowWrapWordWrapInheritance() {
105104
}
106105

107106
[NUnit.Framework.Test]
108-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
107+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
109108
public virtual void ChosenOverflowWrapValue01() {
110109
IList<IElement> elements = ConvertToElements("chosenOverflowWrapValue01");
111110
Paragraph paragraph = (Paragraph)elements[0];
@@ -117,7 +116,8 @@ public virtual void ChosenOverflowWrapValue01() {
117116
}
118117

119118
[NUnit.Framework.Test]
120-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
119+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
120+
Count = 2)]
121121
public virtual void ChosenOverflowWrapValue02() {
122122
IList<IElement> elements = ConvertToElements("chosenOverflowWrapValue02");
123123
Paragraph paragraph = (Paragraph)elements[0];
@@ -164,7 +164,7 @@ public virtual void ChosenOverflowWrapValueUnset02() {
164164
}
165165

166166
[NUnit.Framework.Test]
167-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
167+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
168168
public virtual void OverflowWrapWordWrapInheritanceAndInvalidValues() {
169169
IList<IElement> elements = ConvertToElements("overflowWrapWordWrapInheritanceAndInvalidValues");
170170
Div div = (Div)elements[0];

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/PropertyValidationTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf;
25-
using iText.Html2pdf.Logs;
2625
using iText.Test.Attributes;
2726

2827
namespace iText.Html2pdf.Css {
@@ -40,7 +39,8 @@ public static void BeforeClass() {
4039
}
4140

4241
[NUnit.Framework.Test]
43-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
42+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
43+
Count = 2)]
4444
public virtual void Test01() {
4545
ConvertToPdfAndCompare("test01", sourceFolder, destinationFolder);
4646
}

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/QuotesTest.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf;
25-
using iText.Html2pdf.Logs;
2625
using iText.Test.Attributes;
2726

2827
namespace iText.Html2pdf.Css {
@@ -71,15 +70,17 @@ public virtual void ValuesTest() {
7170

7271
[NUnit.Framework.Test]
7372
//attr() is not supported in quotes property in browsers
74-
[LogMessage(Html2PdfLogMessageConstant.QUOTES_PROPERTY_INVALID)]
75-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
73+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.QUOTES_PROPERTY_INVALID)]
74+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION)]
7675
public virtual void AttrTest() {
7776
ConvertToPdfAndCompare("attrTest", sourceFolder, destinationFolder);
7877
}
7978

8079
[NUnit.Framework.Test]
81-
[LogMessage(Html2PdfLogMessageConstant.QUOTES_PROPERTY_INVALID, Count = 2)]
82-
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
80+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.QUOTES_PROPERTY_INVALID, Count =
81+
2)]
82+
[LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION,
83+
Count = 2)]
8384
public virtual void ErrorTest() {
8485
ConvertToPdfAndCompare("errorTest", sourceFolder, destinationFolder);
8586
}

0 commit comments

Comments
 (0)