Skip to content

Commit bce2c1a

Browse files
author
Dmitry Radchuk
committed
Update tests after flex calculations improvements
DEVSIX-8985
1 parent eeafe31 commit bce2c1a

14 files changed

+90
-3
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ This file is part of the iText (R) project.
4141
import com.itextpdf.layout.properties.UnitValue;
4242
import com.itextpdf.layout.renderer.FlexContainerRenderer;
4343
import com.itextpdf.styledxmlparser.resolver.font.BasicFontProvider;
44+
import com.itextpdf.test.LogLevelConstants;
4445
import com.itextpdf.test.annotations.LogMessage;
4546
import com.itextpdf.test.annotations.LogMessages;
4647

@@ -567,16 +568,28 @@ public void splitWrappedFlexContainersTest10() throws IOException, InterruptedEx
567568
convertToPdfAndCompare("wrappedRowRtlFlexStartSplit", SOURCE_FOLDER, DESTINATION_FOLDER);
568569
}
569570

571+
@LogMessages(messages = {
572+
@LogMessage(messageTemplate = IoLogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT,
573+
logLevel = LogLevelConstants.ERROR, count = 3)
574+
})
570575
@Test
571576
public void endlessColumnFlexContainerWithPercentFlexBasisTest() throws IOException, InterruptedException {
572577
convertToPdfAndCompare("endlessColumnFlexContainerWithPercentFlexBasis", SOURCE_FOLDER, DESTINATION_FOLDER);
573578
}
574579

580+
@LogMessages(messages = {
581+
@LogMessage(messageTemplate = IoLogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT,
582+
logLevel = LogLevelConstants.ERROR, count = 3)
583+
})
575584
@Test
576585
public void definiteMainSizeColumnFlexContainerWithPercentFlexBasisTest() throws IOException, InterruptedException {
577586
convertToPdfAndCompare("definiteMainSizeColumnFlexContainerWithPercentFlexBasis", SOURCE_FOLDER, DESTINATION_FOLDER);
578587
}
579588

589+
@LogMessages(messages = {
590+
@LogMessage(messageTemplate = IoLogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT,
591+
logLevel = LogLevelConstants.ERROR, count = 3)
592+
})
580593
@Test
581594
public void imageStretchColumnFlexContainerTest() throws IOException, InterruptedException {
582595
convertToPdfAndCompare("imageStretchColumnFlexContainer", SOURCE_FOLDER, DESTINATION_FOLDER);

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,4 +224,24 @@ public void ColumnJustifyContentStartMaxSizeTest() throws IOException, Interrupt
224224
public void ColumnJustifyContentStartMinSizeTest() throws IOException, InterruptedException {
225225
convertToPdfAndCompare("FlexDirColumnJustifyContentStartMinSize", sourceFolder, destinationFolder);
226226
}
227+
228+
@Test
229+
public void ColumnRelativeWidthHrChildTest() throws IOException, InterruptedException {
230+
convertToPdfAndCompare("ColumnRelativeWidthHrChild", sourceFolder, destinationFolder);
231+
}
232+
233+
@Test
234+
public void ColumnRelativeWidthInInlineBlockHrChildTest() throws IOException, InterruptedException {
235+
convertToPdfAndCompare("ColumnRelativeWidthInInlineBlockHrChild", sourceFolder, destinationFolder);
236+
}
237+
238+
@Test
239+
public void ColumnRelativeWidthDivWithContentChildTest() throws IOException, InterruptedException {
240+
convertToPdfAndCompare("ColumnRelativeWidthDivWithContentChild", sourceFolder, destinationFolder);
241+
}
242+
243+
@Test
244+
public void ColumnFixedWidthDivWithContentChildTest() throws IOException, InterruptedException {
245+
convertToPdfAndCompare("ColumnFixedWidthDivWithContentChild", sourceFolder, destinationFolder);
246+
}
227247
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ This file is part of the iText (R) project.
2828
import com.itextpdf.test.annotations.LogMessages;
2929

3030

31-
@LogMessages(messages = {
32-
@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)
33-
})
3431
// TODO DEVSIX-5269 ImageRenderer#getMinMaxWidth does not return initial image width
3532
public class FlexAspectRatioImgColumn007Test extends W3CCssTest {
3633
@Override

‎src/test/resources/com/itextpdf/html2pdf/css/FlexColumnTest/ColumnFixedWidthDivWithContentChild.html‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Hr as flex child test</title>
6+
</head>
7+
<body>
8+
<div style="display:flex;flex-direction:column">
9+
<div style="height:50px;background-color:#87CEEB;width:350px">
10+
<p>Some useless content</p>
11+
</div>
12+
</div>
13+
</body>
14+
</html>

‎src/test/resources/com/itextpdf/html2pdf/css/FlexColumnTest/ColumnRelativeWidthDivWithContentChild.html‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Hr as flex child test</title>
6+
</head>
7+
<body>
8+
<div style="display:flex;flex-direction:column">
9+
<div style="height:50px;background-color:#87CEEB;width:75%">
10+
<p>Some useless content</p>
11+
</div>
12+
</div>
13+
</body>
14+
</html>

‎src/test/resources/com/itextpdf/html2pdf/css/FlexColumnTest/ColumnRelativeWidthHrChild.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Hr as flex child test</title>
6+
</head>
7+
<body>
8+
<div style="display:flex;flex-direction:column">
9+
<hr style="height:10px;margin:0;background-color:#FF0000;width:75%" />
10+
</div>
11+
<div>
12+
<hr style="height:10px;margin:0;background-color:#FF0000;width:75%" />
13+
</div>
14+
</body>
15+
</html>

‎src/test/resources/com/itextpdf/html2pdf/css/FlexColumnTest/ColumnRelativeWidthInInlineBlockHrChild.html‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Hr as flex child test</title>
6+
</head>
7+
<body>
8+
<div style="display: inline-block">
9+
<div style="display:flex;flex-direction:column">
10+
<hr style="height:10px;background-color:#FF0000;width:75%" />
11+
</div>
12+
</div>
13+
</body>
14+
</html>

‎src/test/resources/com/itextpdf/html2pdf/css/FlexColumnTest/cmp_ColumnFixedWidthDivWithContentChild.pdf‎

1.26 KB
Binary file not shown.

‎src/test/resources/com/itextpdf/html2pdf/css/FlexColumnTest/cmp_ColumnRelativeWidthDivWithContentChild.pdf‎

1.26 KB
Binary file not shown.

‎src/test/resources/com/itextpdf/html2pdf/css/FlexColumnTest/cmp_ColumnRelativeWidthHrChild.pdf‎

1.32 KB
Binary file not shown.

0 commit comments

Comments
 (0)