Skip to content

Commit e767c93

Browse files
guustysebieguustysebie
committed
Add and update tests for Columns shorthand resolver
DEVSIX-7555
1 parent 0308455 commit e767c93

File tree

62 files changed

+50
-3
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

+50
-3
lines changed

‎src/test/java/com/itextpdf/html2pdf/css/multicol/ColumnCountTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,11 @@ public void overflowOnMulticolContainerTest() throws IOException, InterruptedExc
407407
runTest("overflowOnMulticolContainerTest");
408408
}
409409

410+
@Test
411+
public void shortHandResolverTest01() throws IOException, InterruptedException {
412+
runTest("shortHandResolverTest01");
413+
}
414+
410415
private void runTest(String testName) throws IOException, InterruptedException {
411416
convertToPdfAndCompare(testName,
412417
SOURCE_FOLDER, DESTINATION_FOLDER, false,

‎src/test/java/com/itextpdf/html2pdf/css/w3c/W3CCssTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ This file is part of the iText (R) project.
3131

3232
import java.io.File;
3333
import java.io.IOException;
34-
3534
import org.junit.Assert;
3635
import org.junit.Before;
3736
import org.junit.BeforeClass;

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/AsColumnFlexItemTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@ This file is part of the iText (R) project.
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssMulticolTest;
2626
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
27+
import com.itextpdf.io.logs.IoLogMessageConstant;
2728
import com.itextpdf.test.annotations.LogMessage;
2829
import com.itextpdf.test.annotations.LogMessages;
2930

30-
@LogMessages(messages = @LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET))
31+
@LogMessages(messages = {@LogMessage(messageTemplate = Html2PdfLogMessageConstant.FLEX_PROPERTY_IS_NOT_SUPPORTED_YET),
32+
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE)
33+
})
3134
public class AsColumnFlexItemTest extends W3CCssMulticolTest {
3235
@Override
3336
protected String getHtmlFileName() {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolColumnsInvalid001Test.java‎

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

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssMulticolTest;
26+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
27+
import com.itextpdf.test.annotations.LogMessage;
28+
import com.itextpdf.test.annotations.LogMessages;
2629

30+
@LogMessages(messages = @LogMessage(messageTemplate =
31+
StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION))
2732
public class MulticolColumnsInvalid001Test extends W3CCssMulticolTest {
2833
@Override
2934
protected String getHtmlFileName() {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolColumnsInvalid002Test.java‎

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

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssMulticolTest;
26+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
27+
import com.itextpdf.test.annotations.LogMessage;
28+
import com.itextpdf.test.annotations.LogMessages;
2629

30+
@LogMessages(messages = @LogMessage(messageTemplate =
31+
StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION))
2732
public class MulticolColumnsInvalid002Test extends W3CCssMulticolTest {
2833
@Override
2934
protected String getHtmlFileName() {

‎src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolShorthand001Test.java‎

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

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssMulticolTest;
26+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
27+
import com.itextpdf.test.annotations.LogMessage;
28+
import com.itextpdf.test.annotations.LogMessages;
2629

30+
@LogMessages(messages = @LogMessage(messageTemplate =
31+
StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION))
2732
public class MulticolShorthand001Test extends W3CCssMulticolTest {
2833
@Override
2934
protected String getHtmlFileName() {

‎src/test/resources/com/itextpdf/html2pdf/css/multicol/ColumnCountTest/cmp_shortHandResolverTest01.pdf‎

2.12 KB
Binary file not shown.

‎src/test/resources/com/itextpdf/html2pdf/css/multicol/ColumnCountTest/shortHandResolverTest01.html‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<body>
4+
<h2 style="columns:3em">
5+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
6+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
7+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
8+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
9+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
10+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
11+
est laborum.
12+
</h2>
13+
<p>Some usual text</p>
14+
<h4 style="columns:2">
15+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
16+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
17+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
18+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
19+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
20+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
21+
est laborum.
22+
</h4>
23+
<p>Some usual text</p>
24+
</body>
25+
</html>

‎src/test/resources/com/itextpdf/html2pdf/css/multicol/ColumnGapTest/cmp_basicTest.pdf‎

578 Bytes
Binary file not shown.

‎src/test/resources/com/itextpdf/html2pdf/css/multicol/ColumnGapTest/cmp_gapShorthandTest.pdf‎

307 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)