Skip to content

Commit 9f02382

Browse files
committed
Fix border\margin\padding treating for grid and multicol
DEVSIX-8418
1 parent d36238d commit 9f02382

File tree

188 files changed

+501
-67
lines changed

Some content is hidden

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

188 files changed

+501
-67
lines changed

src/test/java/com/itextpdf/html2pdf/css/grid/GridTemplateCombinedTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public void templateCombinedMinMaxTest() throws IOException, InterruptedExceptio
6666
}
6767

6868
@Test
69-
// TODO DEVSIX-8418 seems margins\paddings don't take into account correctly
7069
public void templateCombinedMixedTest() throws IOException, InterruptedException {
7170
runTest("template-combined-mixed");
7271
}

src/test/java/com/itextpdf/html2pdf/css/grid/GridTemplatesTest.java

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,13 +508,16 @@ public void spanOnlyFrTest() throws IOException, InterruptedException {
508508
runTest("spanOnlyFrTest");
509509
}
510510

511-
//TODO DEVSIX-8418
512511
@Test
513512
public void autoFitOnIntrinsicAreaWithLargeBorderTest() throws IOException, InterruptedException {
514513
runTest("autoFitOnIntrinsicAreaWithLargeBorderTest");
515514
}
516515

517-
//TODO DEVSIX-8418
516+
@Test
517+
public void autoFitWithLargeBorderTest() throws IOException, InterruptedException {
518+
runTest("autoFitWithLargeBorderTest");
519+
}
520+
518521
@Test
519522
public void autoFitOnIntrinsicAreaWithLargeMarginPaddingTest() throws IOException, InterruptedException {
520523
runTest("autoFitOnIntrinsicAreaWithLargeMarginPaddingTest");
@@ -603,6 +606,33 @@ public void shrankTemplateAfterAutoFitTest() throws IOException, InterruptedExce
603606
runTest("shrankTemplateAfterAutoFitTest");
604607
}
605608

609+
@Test
610+
public void minHeightTest() throws IOException, InterruptedException {
611+
runTest("minHeightTest");
612+
}
613+
614+
@Test
615+
public void minHeightFlexRowsTest() throws IOException, InterruptedException {
616+
runTest("minHeightFlexRowsTest");
617+
}
618+
619+
@Test
620+
// TODO DEVSIX-8426 Fix working with min\max-height\width on grid container
621+
public void maxHeightTest() throws IOException, InterruptedException {
622+
runTest("maxHeightTest");
623+
}
624+
625+
@Test
626+
// TODO DEVSIX-8426 Fix working with min\max-height\width on grid container
627+
public void maxHeightFlexRowsTest() throws IOException, InterruptedException {
628+
runTest("maxHeightFlexRowsTest");
629+
}
630+
631+
@Test
632+
public void maxHeightFlexRowsTest2() throws IOException, InterruptedException {
633+
runTest("maxHeightFlexRowsTest2");
634+
}
635+
606636
@Test
607637
public void gridLayoutDisablingTest() throws IOException, InterruptedException {
608638
convertToPdfAndCompare("basicColumnFewDivsTest",

src/test/java/com/itextpdf/html2pdf/css/multicol/ColumnWidthTest.java

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

3232
import java.io.IOException;
3333
import org.junit.jupiter.api.BeforeAll;
34-
import org.junit.jupiter.api.Test;
3534
import org.junit.jupiter.api.Tag;
35+
import org.junit.jupiter.api.Test;
3636

3737
@Tag("IntegrationTest")
3838
public class ColumnWidthTest extends ExtendedHtmlConversionITextTest {
@@ -284,6 +284,31 @@ public void columnWidthPercentageTest() throws IOException, InterruptedException
284284
runTest("columnWidthPercentageTest");
285285
}
286286

287+
@Test
288+
public void bigPaddingsTest() throws IOException, InterruptedException {
289+
runTest("bigPaddingsTest");
290+
}
291+
292+
@Test
293+
public void bigBordersTest() throws IOException, InterruptedException {
294+
runTest("bigBordersTest");
295+
}
296+
297+
@Test
298+
public void bigMarginsTest() throws IOException, InterruptedException {
299+
runTest("bigMarginsTest");
300+
}
301+
302+
@Test
303+
public void bigMargingsPaddingsBordersTest() throws IOException, InterruptedException {
304+
runTest("bigMargingsPaddingsBordersTest");
305+
}
306+
307+
@Test
308+
public void bigBordersWithoutWidtConstraintTest() throws IOException, InterruptedException {
309+
runTest("bigBordersWithoutWidtConstraintTest");
310+
}
311+
287312

288313
private void runTest(String testName) throws IOException, InterruptedException {
289314
convertToPdfAndCompare(testName,

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/DescendantStaticPosition002Test.java

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

2525
import com.itextpdf.html2pdf.css.w3c.css_grid.W3CCssGridTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
27-
import com.itextpdf.test.annotations.LogMessage;
28-
import com.itextpdf.test.annotations.LogMessages;
2926

30-
@LogMessages(messages = {
31-
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 6)
32-
})
3327
public class DescendantStaticPosition002Test extends W3CCssGridTest {
3428
@Override
3529
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/GridAbsposStaticposAlignSelf001Test.java

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

2525
import com.itextpdf.html2pdf.css.w3c.css_grid.W3CCssGridTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
27-
import com.itextpdf.test.annotations.LogMessage;
28-
import com.itextpdf.test.annotations.LogMessages;
2926

3027
//TODO DEVSIX-5166 change after align-self is supported is supported
31-
@LogMessages(messages = {
32-
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 11)
33-
})
3428
public class GridAbsposStaticposAlignSelf001Test extends W3CCssGridTest {
3529
@Override
3630
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/GridAbsposStaticposAlignSelfImg001Test.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ This file is part of the iText (R) project.
2929

3030
//TODO DEVSIX-5166 change after align-self is supported
3131
@LogMessages(messages = {
32-
@LogMessage(messageTemplate = IoLogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, count = 26),
33-
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 13)
32+
@LogMessage(messageTemplate = IoLogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, count = 26)
3433
})
3534
public class GridAbsposStaticposAlignSelfImg001Test extends W3CCssGridTest {
3635
@Override

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/GridAbsposStaticposAlignSelfVertWM001Test.java

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

2525
import com.itextpdf.html2pdf.css.w3c.css_grid.W3CCssGridTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
27-
import com.itextpdf.test.annotations.LogMessage;
28-
import com.itextpdf.test.annotations.LogMessages;
2926

3027
//TODO DEVSIX-5166 change after align-self is supported
31-
@LogMessages(messages = {
32-
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 13)
33-
})
3428
public class GridAbsposStaticposAlignSelfVertWM001Test extends W3CCssGridTest {
3529
@Override
3630
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/GridAbsposStaticposAlignSelfVertWM004Test.java

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

2525
import com.itextpdf.html2pdf.css.w3c.css_grid.W3CCssGridTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
27-
import com.itextpdf.test.annotations.LogMessage;
28-
import com.itextpdf.test.annotations.LogMessages;
2926

3027
//TODO DEVSIX-5166 change after align-self is supported
31-
@LogMessages(messages = {
32-
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 13)
33-
})
3428
public class GridAbsposStaticposAlignSelfVertWM004Test extends W3CCssGridTest {
3529
@Override
3630
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/GridAbsposStaticposJustifySelf001Test.java

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

2525
import com.itextpdf.html2pdf.css.w3c.css_grid.W3CCssGridTest;
26-
import com.itextpdf.io.logs.IoLogMessageConstant;
27-
import com.itextpdf.test.annotations.LogMessage;
28-
import com.itextpdf.test.annotations.LogMessages;
2926

3027
//TODO DEVSIX-5163: Support more justify-content values
31-
@LogMessages(messages = {
32-
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 13)
33-
})
3428
public class GridAbsposStaticposJustifySelf001Test extends W3CCssGridTest {
3529
@Override
3630
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/abspos/GridAbsposStaticposJustifySelfImg001Test.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ This file is part of the iText (R) project.
2929

3030
//TODO DEVSIX-5163: Support more justify-content values
3131
@LogMessages(messages = {
32-
@LogMessage(messageTemplate = IoLogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, count = 26),
33-
@LogMessage(messageTemplate = IoLogMessageConstant.RECTANGLE_HAS_NEGATIVE_SIZE, count = 13)
32+
@LogMessage(messageTemplate = IoLogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, count = 26)
3433
})
3534
public class GridAbsposStaticposJustifySelfImg001Test extends W3CCssGridTest {
3635
@Override

0 commit comments

Comments
 (0)