Skip to content

Commit 5a2eaf6

Browse files
AlexanderRasolkoAlexanderRasolko
committed
Refactor tests since zero or negative size log message level changed to INFO
DEVSIX-4191
1 parent 3b3020d commit 5a2eaf6

File tree

154 files changed

+134
-525
lines changed

Some content is hidden

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

154 files changed

+134
-525
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public void absolutePosition02Test() throws IOException, InterruptedException {
7777
}
7878

7979
@Test
80-
@LogMessages(messages = {@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES)})
8180
public void absolutePosition03Test() throws IOException, InterruptedException {
8281
convertToPdfAndCompare("absolutePositionTest03", sourceFolder, destinationFolder);
8382
}

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,13 @@ This file is part of the iText (R) project.
4343
package com.itextpdf.html2pdf.css;
4444

4545
import com.itextpdf.html2pdf.HtmlConverter;
46-
import com.itextpdf.io.LogMessageConstant;
4746
import com.itextpdf.io.util.UrlUtil;
4847
import com.itextpdf.kernel.utils.CompareTool;
4948
import com.itextpdf.test.ExtendedITextTest;
50-
import com.itextpdf.test.annotations.LogMessage;
51-
import com.itextpdf.test.annotations.LogMessages;
5249
import com.itextpdf.test.annotations.type.IntegrationTest;
5350

5451
import java.io.File;
5552
import java.io.IOException;
56-
5753
import org.junit.Assert;
5854
import org.junit.BeforeClass;
5955
import org.junit.Test;
@@ -153,7 +149,6 @@ public void elementTableTest() throws IOException, InterruptedException {
153149
}
154150

155151
@Test
156-
@LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 2)})
157152
public void elementUlOlLiTest() throws IOException, InterruptedException {
158153
test("elementUlOlLiTest.html", "elementUlOlLiTest.pdf", "diff_");
159154
}
@@ -169,9 +164,6 @@ public void emptyInlinesTest02() throws IOException, InterruptedException {
169164
}
170165

171166
@Test
172-
@LogMessages(messages = {
173-
@LogMessage(messageTemplate = LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES)
174-
})
175167
public void negativeMarginsTest01() throws IOException, InterruptedException {
176168
test("negativeMarginsTest01.html", "negativeMarginsTest01.pdf", "diff_");
177169
}
@@ -182,7 +174,6 @@ public void negativeMarginsTest02() throws IOException, InterruptedException {
182174
}
183175

184176
@Test
185-
@LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES))
186177
public void negativeMarginsTest03() throws IOException, InterruptedException {
187178
test("negativeMarginsTest03.html", "negativeMarginsTest03.pdf", "diff_");
188179
}
@@ -263,9 +254,6 @@ public void selfCollapsingTest08_zero() throws IOException, InterruptedException
263254
}
264255

265256
@Test
266-
@LogMessages(messages = {
267-
@LogMessage(messageTemplate = LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES)
268-
})
269257
public void selfCollapsingTest09() throws IOException, InterruptedException {
270258
test("selfCollapsingTest09.html", "selfCollapsingTest09.pdf", "diff_");
271259
}
@@ -291,9 +279,6 @@ public void selfCollapsingTest13() throws IOException, InterruptedException {
291279
}
292280

293281
@Test
294-
@LogMessages(messages = {
295-
@LogMessage(messageTemplate = LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES)
296-
})
297282
public void selfCollapsingTest14() throws IOException, InterruptedException {
298283
test("selfCollapsingTest14.html", "selfCollapsingTest14.pdf", "diff_");
299284
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,9 @@ This file is part of the iText (R) project.
4343
package com.itextpdf.html2pdf.css;
4444

4545
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
46-
import com.itextpdf.io.LogMessageConstant;
47-
import com.itextpdf.test.LogLevelConstants;
48-
import com.itextpdf.test.annotations.LogMessage;
49-
import com.itextpdf.test.annotations.LogMessages;
5046
import com.itextpdf.test.annotations.type.IntegrationTest;
5147

5248
import java.io.IOException;
53-
5449
import org.junit.BeforeClass;
5550
import org.junit.Test;
5651
import org.junit.experimental.categories.Category;
@@ -73,9 +68,6 @@ public void innerOpacityTest() throws IOException, InterruptedException {
7368
}
7469

7570
@Test
76-
@LogMessages(messages = {
77-
@LogMessage(messageTemplate = LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 2, logLevel = LogLevelConstants.WARN)
78-
})
7971
public void nestedInSpanTest() throws IOException, InterruptedException {
8072
convertToPdfAndCompare("nestedInSpanTest", sourceFolder, destinationFolder);
8173
}

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,17 @@ This file is part of the iText (R) project.
5353
import com.itextpdf.styledxmlparser.css.media.MediaType;
5454
import com.itextpdf.styledxmlparser.css.util.CssUtils;
5555
import com.itextpdf.test.ExtendedITextTest;
56-
import com.itextpdf.test.annotations.LogMessage;
57-
import com.itextpdf.test.annotations.LogMessages;
5856
import com.itextpdf.test.annotations.type.IntegrationTest;
57+
58+
import java.io.File;
59+
import java.io.FileInputStream;
60+
import java.io.IOException;
5961
import org.junit.Assert;
6062
import org.junit.BeforeClass;
6163
import org.junit.Ignore;
6264
import org.junit.Test;
6365
import org.junit.experimental.categories.Category;
6466

65-
import java.io.File;
66-
import java.io.FileInputStream;
67-
import java.io.IOException;
68-
6967
@Category(IntegrationTest.class)
7068
public class FloatTest extends ExtendedITextTest {
7169

@@ -371,10 +369,7 @@ public void float58Test() throws IOException, InterruptedException {
371369
runTest("float58Test", "diff58_");
372370
}
373371

374-
@Test
375-
@LogMessages(messages = {
376-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 1),
377-
})
372+
@Test
378373
public void float60Test() throws IOException, InterruptedException {
379374
runTest("float60Test", "diff60_");
380375
}
@@ -504,10 +499,7 @@ public void floatingDivBottomBorderTest() throws IOException, InterruptedExcepti
504499
runTest("floatingDivBottomBorderTest", "diff_BottomBorderTest_");
505500
}
506501

507-
@Test
508-
@LogMessages(messages = {
509-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 1),
510-
})
502+
@Test
511503
public void floatCaption01Test() throws IOException, InterruptedException {
512504
runTest("floatCaption01Test", "diff_floatCaption01Test_");
513505
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ This file is part of the iText (R) project.
2525
import com.itextpdf.html2pdf.ConverterProperties;
2626
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
2727
import com.itextpdf.html2pdf.HtmlConverter;
28-
import com.itextpdf.io.LogMessageConstant;
2928
import com.itextpdf.io.util.UrlUtil;
3029
import com.itextpdf.kernel.pdf.PdfDocument;
3130
import com.itextpdf.kernel.pdf.PdfWriter;
@@ -34,8 +33,6 @@ This file is part of the iText (R) project.
3433
import com.itextpdf.layout.font.FontProvider;
3534
import com.itextpdf.layout.property.Leading;
3635
import com.itextpdf.layout.property.Property;
37-
import com.itextpdf.test.annotations.LogMessage;
38-
import com.itextpdf.test.annotations.LogMessages;
3936
import com.itextpdf.test.annotations.type.IntegrationTest;
4037

4138
import java.io.FileInputStream;
@@ -178,7 +175,6 @@ public void defaultLineHeightTest() {
178175
}
179176

180177
@Test
181-
@LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 2))
182178
public void lineHeightEmptyDivTest() throws IOException, InterruptedException {
183179
testLineHeight("lineHeightEmptyDivTest");
184180
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,7 @@ public void linearGradientOnPageMarginWithAutoWidthAndHeightTest() {
223223

224224
@Test
225225
@LogMessages(messages = {
226-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.CLIP_ELEMENT, count= 2, logLevel = LogLevelConstants.WARN),
227-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count= 2, logLevel = LogLevelConstants.WARN),
228-
})
226+
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.CLIP_ELEMENT, count= 2, logLevel = LogLevelConstants.WARN)})
229227
public void linearGradientOnPageMarginWithPercentWidthAndHeightTest() {
230228
runTest("linearGradientOnPageMarginWithPercentWidthAndHeightTest", new ConverterProperties().setTagWorkerFactory(new PageMarginBoxImagesTagWorkerFactory()));
231229
}

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ This file is part of the iText (R) project.
4444

4545
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
4646
import com.itextpdf.html2pdf.LogMessageConstant;
47-
import com.itextpdf.test.LogLevelConstants;
4847
import com.itextpdf.test.annotations.LogMessage;
4948
import com.itextpdf.test.annotations.LogMessages;
5049
import com.itextpdf.test.annotations.type.IntegrationTest;
5150

5251
import java.io.IOException;
53-
5452
import org.junit.BeforeClass;
5553
import org.junit.Test;
5654
import org.junit.experimental.categories.Category;
@@ -71,9 +69,6 @@ public void pseudoContentWithWidthAndHeightTest() throws IOException, Interrupte
7169
}
7270

7371
@Test
74-
@LogMessages(messages = {
75-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count= 2, logLevel = LogLevelConstants.WARN)
76-
})
7772
public void pseudoContentWithPercentWidthAndHeightTest() throws IOException, InterruptedException {
7873
convertToPdfAndCompare("pseudoContentWithPercentWidthAndHeightTest", SOURCE_FOLDER, DESTINATION_FOLDER);
7974
}
@@ -251,25 +246,16 @@ public void emptyStillShownPseudoTest06() throws IOException, InterruptedExcepti
251246
}
252247

253248
@Test
254-
@LogMessages(messages = {
255-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES),
256-
})
257249
public void emptyStillShownPseudoTest07() throws IOException, InterruptedException {
258250
convertToPdfAndCompare("emptyStillShownPseudoTest07", SOURCE_FOLDER, DESTINATION_FOLDER);
259251
}
260252

261253
@Test
262-
@LogMessages(messages = {
263-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES),
264-
})
265254
public void emptyStillShownPseudoTest08() throws IOException, InterruptedException {
266255
convertToPdfAndCompare("emptyStillShownPseudoTest08", SOURCE_FOLDER, DESTINATION_FOLDER);
267256
}
268257

269258
@Test
270-
@LogMessages(messages = {
271-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 2, logLevel = LogLevelConstants.WARN)
272-
})
273259
public void emptyStillShownPseudoTest09() throws IOException, InterruptedException {
274260
convertToPdfAndCompare("emptyStillShownPseudoTest09", SOURCE_FOLDER, DESTINATION_FOLDER);
275261
}

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,16 @@ This file is part of the iText (R) project.
4444

4545
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
4646
import com.itextpdf.html2pdf.LogMessageConstant;
47-
import com.itextpdf.test.LogLevelConstants;
4847
import com.itextpdf.test.annotations.LogMessage;
4948
import com.itextpdf.test.annotations.LogMessages;
5049
import com.itextpdf.test.annotations.type.IntegrationTest;
51-
import org.junit.Assert;
50+
51+
import java.io.IOException;
5252
import org.junit.BeforeClass;
5353
import org.junit.Ignore;
5454
import org.junit.Test;
5555
import org.junit.experimental.categories.Category;
5656

57-
import java.io.IOException;
58-
5957
@Category(IntegrationTest.class)
6058
public class TextPropertiesTest extends ExtendedHtmlConversionITextTest {
6159

@@ -104,7 +102,6 @@ public void lineHeightTest02() throws IOException, InterruptedException {
104102
}
105103

106104
@Test
107-
@LogMessages(messages = @LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES))
108105
public void lineHeightTest03() throws IOException, InterruptedException {
109106
convertToPdfAndCompare("lineHeightTest03", sourceFolder, destinationFolder);
110107
}
@@ -147,9 +144,6 @@ public void whiteSpaceNowrapBasicTest01() throws IOException, InterruptedExcepti
147144
}
148145

149146
@Test
150-
@LogMessages(messages = {
151-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, logLevel = LogLevelConstants.WARN)
152-
})
153147
public void whiteSpaceNowrapBackgroundTest01() throws IOException, InterruptedException {
154148
convertToPdfAndCompare("whiteSpaceNowrapBackgroundTest01", sourceFolder, destinationFolder);
155149
}
@@ -250,9 +244,6 @@ public void whiteSpaceNowrapInlineBlockTest03() throws IOException, InterruptedE
250244
}
251245

252246
@Test
253-
@LogMessages(messages = {
254-
@LogMessage(messageTemplate = com.itextpdf.io.LogMessageConstant.RECTANGLE_HAS_NEGATIVE_OR_ZERO_SIZES, count = 2, logLevel = LogLevelConstants.WARN)
255-
})
256247
public void whiteSpaceNowrapSequentialTest01() throws IOException, InterruptedException {
257248
// TODO https://wiki.itextsupport.com/display/IT7/HTML-CSS+inline+context+limitations: ignores nowrap on inline elements
258249
convertToPdfAndCompare("whiteSpaceNowrapSequentialTest01", sourceFolder, destinationFolder);

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css21/linebox/LineHeight002Test.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ protected String getHtmlFileName() {
3838
@Test
3939
@Override
4040
@LogMessages(messages = {
41-
@LogMessage(messageTemplate = "Unable to process external css file"),
42-
@LogMessage(messageTemplate = "The background rectangle has negative or zero sizes. It will not be displayed.")
41+
@LogMessage(messageTemplate = "Unable to process external css file")
4342
})
4443
public void test() throws IOException, InterruptedException {
4544
super.test();

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css21/linebox/LineHeight004Test.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ protected String getHtmlFileName() {
3838
@Test
3939
@Override
4040
@LogMessages(messages = {
41-
@LogMessage(messageTemplate = "Unable to process external css file"),
42-
@LogMessage(messageTemplate = "The background rectangle has negative or zero sizes. It will not be displayed.")
41+
@LogMessage(messageTemplate = "Unable to process external css file")
4342
})
4443
public void test() throws IOException, InterruptedException {
4544
super.test();

0 commit comments

Comments
 (0)