Skip to content

Commit b67d82c

Browse files
committed
Add tests for crashed margins collapsing
DEVSIX-8419
1 parent 9f02382 commit b67d82c

File tree

83 files changed

+251
-24
lines changed

Some content is hidden

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

83 files changed

+251
-24
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ This file is part of the iText (R) project.
2424

2525
import com.itextpdf.html2pdf.ConverterProperties;
2626
import com.itextpdf.html2pdf.ExtendedHtmlConversionITextTest;
27+
import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
2728
import com.itextpdf.layout.exceptions.LayoutExceptionMessageConstant;
2829
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
2930
import com.itextpdf.test.LogLevelConstants;
@@ -633,6 +634,13 @@ public void maxHeightFlexRowsTest2() throws IOException, InterruptedException {
633634
runTest("maxHeightFlexRowsTest2");
634635
}
635636

637+
@LogMessages(messages = {
638+
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, logLevel =
639+
LogLevelConstants.WARN)})
640+
public void divNestingTest() throws IOException, InterruptedException {
641+
runTest("divNestingTest");
642+
}
643+
636644
@Test
637645
public void gridLayoutDisablingTest() throws IOException, InterruptedException {
638646
convertToPdfAndCompare("basicColumnFewDivsTest",

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/GridTracksStretchedWithDifferentFlexFactorsSumTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ This file is part of the iText (R) project.
2626
import com.itextpdf.test.annotations.LogMessage;
2727
import com.itextpdf.test.annotations.LogMessages;
2828

29-
import org.junit.jupiter.api.Disabled;
30-
31-
//TODO DEVSIX-8419: Enable and fix after NPE has been fixed
32-
@Disabled("DEVSIX-8419")
3329
@LogMessages(messages = {
3430
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 3)
3531
})

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/alignment/GridAlignContentDistributionTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ This file is part of the iText (R) project.
2727
import com.itextpdf.test.annotations.LogMessage;
2828
import com.itextpdf.test.annotations.LogMessages;
2929

30-
import org.junit.jupiter.api.Disabled;
31-
32-
//TODO DEVSIX-8419: Enable and fix after NPE has been fixed
33-
@Disabled("DEVSIX-8419")
3430
@LogMessages(messages = {
35-
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 4)})
31+
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 4),
32+
})
3633
public class GridAlignContentDistributionTest extends W3CCssGridTest {
3734
@Override
3835
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/alignment/GridAlignContentTest.java

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

30-
import org.junit.jupiter.api.Disabled;
31-
32-
//TODO DEVSIX-8419: Enable and fix after NPE has been fixed
33-
@Disabled("DEVSIX-8419")
3430
@LogMessages(messages = {
3531
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 4)})
3632
public class GridAlignContentTest extends W3CCssGridTest {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/alignment/GridAlignContentVerticalLrTest.java

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

30-
import org.junit.jupiter.api.Disabled;
31-
32-
//TODO DEVSIX-8419: Enable and fix after NPE has been fixed
33-
@Disabled("DEVSIX-8419")
3430
@LogMessages(messages = {
3531
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 4)})
3632
public class GridAlignContentVerticalLrTest extends W3CCssGridTest {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/alignment/GridAlignContentVerticalRlTest.java

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

30-
import org.junit.jupiter.api.Disabled;
31-
32-
//TODO DEVSIX-8419: Enable and fix after NPE has been fixed
33-
@Disabled("DEVSIX-8419")
3430
@LogMessages(messages = {
3531
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 4)})
3632
public class GridAlignContentVerticalRlTest extends W3CCssGridTest {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_grid/grid_model/GridFloat002Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ This file is part of the iText (R) project.
3030
import org.junit.jupiter.api.Disabled;
3131

3232
//TODO DEVSIX-2449 z-index is not supported
33-
//TODO DEVSIX-8419: Enable and fix after NPE has been fixed
34-
@Disabled("DEVSIX-8419")
33+
//TODO DEVSIX-8427: Fix LayoutExceptionMessageConstant.INVALID_CELL_INDEXES exception
34+
@Disabled("DEVSIX-8427")
3535
@LogMessages(messages = {
3636
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, count = 3)})
3737
public class GridFloat002Test extends W3CCssGridTest {

0 commit comments

Comments
 (0)