Skip to content

Commit 502284b

Browse files
Dmitry RadchukiText-CI
authored andcommitted
Update tests after flex calculations improvements
DEVSIX-8985 Autoported commit. Original commit hash: [bce2c1a25]
1 parent 25f158d commit 502284b

16 files changed

+87
-6
lines changed

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/DisplayFlexTest.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ You should have received a copy of the GNU Affero General Public License
3333
using iText.Layout.Properties;
3434
using iText.Layout.Renderer;
3535
using iText.StyledXmlParser.Resolver.Font;
36+
using iText.Test;
3637
using iText.Test.Attributes;
3738

3839
namespace iText.Html2pdf.Css {
@@ -499,18 +500,24 @@ public virtual void SplitWrappedFlexContainersTest10() {
499500
ConvertToPdfAndCompare("wrappedRowRtlFlexStartSplit", SOURCE_FOLDER, DESTINATION_FOLDER);
500501
}
501502

503+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT, LogLevel = LogLevelConstants
504+
.ERROR, Count = 3)]
502505
[NUnit.Framework.Test]
503506
public virtual void EndlessColumnFlexContainerWithPercentFlexBasisTest() {
504507
ConvertToPdfAndCompare("endlessColumnFlexContainerWithPercentFlexBasis", SOURCE_FOLDER, DESTINATION_FOLDER
505508
);
506509
}
507510

511+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT, LogLevel = LogLevelConstants
512+
.ERROR, Count = 3)]
508513
[NUnit.Framework.Test]
509514
public virtual void DefiniteMainSizeColumnFlexContainerWithPercentFlexBasisTest() {
510515
ConvertToPdfAndCompare("definiteMainSizeColumnFlexContainerWithPercentFlexBasis", SOURCE_FOLDER, DESTINATION_FOLDER
511516
);
512517
}
513518

519+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT, LogLevel = LogLevelConstants
520+
.ERROR, Count = 3)]
514521
[NUnit.Framework.Test]
515522
public virtual void ImageStretchColumnFlexContainerTest() {
516523
ConvertToPdfAndCompare("imageStretchColumnFlexContainer", SOURCE_FOLDER, DESTINATION_FOLDER);

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/FlexColumnTest.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,5 +238,25 @@ public virtual void ColumnJustifyContentStartMaxSizeTest() {
238238
public virtual void ColumnJustifyContentStartMinSizeTest() {
239239
ConvertToPdfAndCompare("FlexDirColumnJustifyContentStartMinSize", sourceFolder, destinationFolder);
240240
}
241+
242+
[NUnit.Framework.Test]
243+
public virtual void ColumnRelativeWidthHrChildTest() {
244+
ConvertToPdfAndCompare("ColumnRelativeWidthHrChild", sourceFolder, destinationFolder);
245+
}
246+
247+
[NUnit.Framework.Test]
248+
public virtual void ColumnRelativeWidthInInlineBlockHrChildTest() {
249+
ConvertToPdfAndCompare("ColumnRelativeWidthInInlineBlockHrChild", sourceFolder, destinationFolder);
250+
}
251+
252+
[NUnit.Framework.Test]
253+
public virtual void ColumnRelativeWidthDivWithContentChildTest() {
254+
ConvertToPdfAndCompare("ColumnRelativeWidthDivWithContentChild", sourceFolder, destinationFolder);
255+
}
256+
257+
[NUnit.Framework.Test]
258+
public virtual void ColumnFixedWidthDivWithContentChildTest() {
259+
ConvertToPdfAndCompare("ColumnFixedWidthDivWithContentChild", sourceFolder, destinationFolder);
260+
}
241261
}
242262
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_flexbox/FlexAspectRatioImgColumn007Test.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf.Css.W3c;
25-
using iText.Layout.Logs;
26-
using iText.Test.Attributes;
2725

2826
namespace iText.Html2pdf.Css.W3c.Css_flexbox {
29-
[LogMessage(LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)]
27+
// TODO DEVSIX-5269 ImageRenderer#getMinMaxWidth does not return initial image width
3028
public class FlexAspectRatioImgColumn007Test : W3CCssTest {
31-
// TODO DEVSIX-5269 ImageRenderer#getMinMaxWidth does not return initial image width
3229
protected internal override String GetHtmlFileName() {
3330
return "flex-aspect-ratio-img-column-007.html";
3431
}
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>
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>
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>
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>

0 commit comments

Comments
 (0)