Skip to content

Commit 78bf75b

Browse files
author
Alexandr Fedorov
committed
Flex: take into account collapsing margins for FlexContainerRenderer
DEVSIX-9456
1 parent a75a968 commit 78bf75b

File tree

92 files changed

+51
-5
lines changed

Some content is hidden

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

92 files changed

+51
-5
lines changed

src/test/java/com/itextpdf/html2pdf/css/flex/FlexColumnReverseTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,9 @@ public void columnReversePagingMultiColumnTest() throws IOException, Interrupted
369369
}
370370

371371
@Test
372+
@LogMessages(messages = {
373+
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.ELEMENT_DOES_NOT_FIT_CURRENT_AREA)
374+
})
372375
public void columnReversePagingLargeElementTest() throws IOException, InterruptedException {
373376
convertToPdfAndCompare("column-reverse-paging-large-element", SOURCE_FOLDER, DESTINATION_FOLDER);
374377
}

src/test/java/com/itextpdf/html2pdf/css/flex/FlexContainerTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ public static void beforeClass() {
4545
createOrClearDestinationFolder(DESTINATION_FOLDER);
4646
}
4747

48+
@Test
49+
public void itemsHigherThanContainerTest() throws IOException, InterruptedException {
50+
convertToPdfAndCompare("itemsHigherThanContainer", SOURCE_FOLDER, DESTINATION_FOLDER);
51+
}
52+
4853
@Test
4954
public void aBasicTest() throws IOException, InterruptedException {
5055
convertToPdfAndCompare("aBasic", SOURCE_FOLDER, DESTINATION_FOLDER);

src/test/java/com/itextpdf/html2pdf/css/flex/FlexJustifyContentTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ public void flexEndFlexWrapFlexDirOnPageSplitTest() throws IOException, Interrup
184184
}
185185

186186
@Test
187-
// TODO DEVSIX-9456 Flex: in column direction take into account margins while calculating justify-content shift
188187
public void flexEndDirColumnWrapLongTest() throws IOException, InterruptedException {
189188
convertToPdfAndCompare("flexEndDirColumnWrapLong", SOURCE_FOLDER, DESTINATION_FOLDER);
190189
}
@@ -388,7 +387,6 @@ public void spaceAroundWrapLongTest() throws IOException, InterruptedException {
388387

389388
@Test
390389
// TODO DEVSIX-9446 Support continuous container logic for flex
391-
// TODO DEVSIX-9456 Flex: in column direction take into account margins while calculating justify-content shift
392390
public void spaceAroundColumnWrapLongTest() throws IOException, InterruptedException {
393391
convertToPdfAndCompare("spaceAroundColumnWrapLong", SOURCE_FOLDER, DESTINATION_FOLDER);
394392
}
@@ -461,7 +459,6 @@ public void spaceBetweenAlignSelfTest() throws IOException, InterruptedException
461459

462460
@Test
463461
// TODO DEVSIX-9446 Support continuous container logic for flex
464-
// TODO DEVSIX-9456 Flex: in column direction take into account margins while calculating justify-content shift
465462
public void spaceBetweenColumnReverseWrapLongTest() throws IOException, InterruptedException {
466463
convertToPdfAndCompare("spaceBetweenColumnReverseWrapLong", SOURCE_FOLDER, DESTINATION_FOLDER);
467464
}
@@ -517,7 +514,6 @@ public void spaceEvenlyMarginAutoOverrideTest() throws IOException, InterruptedE
517514

518515
@Test
519516
// TODO DEVSIX-9446 Support continuous container logic for flex
520-
// TODO DEVSIX-9456 Flex: in column direction take into account margins while calculating justify-content shift
521517
public void spaceEvenlyColumnReverseWrapLongTest() throws IOException, InterruptedException {
522518
convertToPdfAndCompare("spaceEvenlyColumnReverseWrapLong", SOURCE_FOLDER, DESTINATION_FOLDER);
523519
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ public void longGridTest() throws IOException, InterruptedException {
305305
}
306306

307307
@Test
308-
//TODO DEVSIX-9402: Update cmp's
309308
public void orderOnItemsTest() throws IOException, InterruptedException {
310309
convertToPdfAndCompare("orderOnItems", SOURCE_FOLDER, DESTINATION_FOLDER);
311310
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)