Skip to content

Commit 7691ca9

Browse files
author
Dmitry Radchuk
committed
Fix area break tests
DEVSIX-7552
1 parent f915ac6 commit 7691ca9

20 files changed

+207
-7
lines changed

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

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ 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;
28+
import com.itextpdf.test.annotations.LogMessage;
29+
import com.itextpdf.test.annotations.LogMessages;
2730
import com.itextpdf.test.annotations.type.IntegrationTest;
2831

2932
import java.io.IOException;
@@ -70,6 +73,19 @@ public void convertPageBreakBeforeAlwaysTest() throws IOException, InterruptedEx
7073
runTest("pageBreakBeforeAlwaysTest");
7174
}
7275

76+
//TODO: DEVSIX-7740 Support page-break inside multicol container
77+
@Test
78+
public void convertPageBreakBeforeInnerElementAlwaysTest() throws IOException, InterruptedException {
79+
runTest("pageBreakBeforeInnerElementAlwaysTest");
80+
}
81+
82+
@Test
83+
@LogMessages(messages = {
84+
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.ELEMENT_DOES_NOT_FIT_CURRENT_AREA)})
85+
public void convertPageBreakBeforeInnerElementDivAlwaysTest() throws IOException, InterruptedException {
86+
runTest("pageBreakBeforeInnerElementDivAlwaysTest");
87+
}
88+
7389
@Test
7490
// TODO DEVSIX-3819 support break-after, break-before, break-inside CSS properties
7591
public void convertBreakBeforeAvoidTest() throws IOException, InterruptedException {
@@ -127,11 +143,17 @@ public void convertBreakBeforePageInsideColumnTest() throws IOException, Interru
127143
}
128144

129145
@Test
130-
@Ignore("TODO DEVSIX-7552 Column-count: support break-inside, break-after and break-before properties")
146+
@LogMessages(messages = {
147+
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.ELEMENT_DOES_NOT_FIT_CURRENT_AREA)})
131148
public void convertPageBreakBeforePageInsideColumnTest() throws IOException, InterruptedException {
132149
runTest("pageBreakBeforePageInsideColumnTest");
133150
}
134151

152+
@Test
153+
public void convertPageBreakBeforePageColumnTest() throws IOException, InterruptedException {
154+
runTest("pageBreakBeforePageColumnTest");
155+
}
156+
135157
@Test
136158
// TODO DEVSIX-3819 support break-after, break-before, break-inside CSS properties
137159
public void convertBreakBeforeLeftTest() throws IOException, InterruptedException {
@@ -194,14 +216,26 @@ public void convertPageBreakAfterAlwaysTest() throws IOException, InterruptedExc
194216
runTest("pageBreakAfterAlwaysTest");
195217
}
196218

219+
//TODO: DEVSIX-7740 Support page-break inside multicol container
220+
@Test
221+
public void convertPageBreakAfterInnerElementAlwaysTest() throws IOException, InterruptedException {
222+
runTest("pageBreakAfterInnerElementAlwaysTest");
223+
}
224+
225+
@Test
226+
@LogMessages(messages = {
227+
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.ELEMENT_DOES_NOT_FIT_CURRENT_AREA)})
228+
public void convertPageBreakAfterInnerElementDivAlwaysTest() throws IOException, InterruptedException {
229+
runTest("pageBreakAfterInnerElementDivAlwaysTest");
230+
}
231+
197232
@Test
198233
// TODO DEVSIX-3819 support break-after, break-before, break-inside CSS properties
199234
public void convertBreakAfterAvoidTest() throws IOException, InterruptedException {
200235
runTest("breakAfterAvoidTest");
201236
}
202237

203238
@Test
204-
// TODO DEVSIX-7552 Column-count: support break-inside, break-after and break-before properties
205239
public void convertPageBreakAfterAvoidTest() throws IOException, InterruptedException {
206240
runTest("pageBreakAfterAvoidTest");
207241
}
@@ -253,10 +287,16 @@ public void convertBreakAfterPageInsideColumnTest() throws IOException, Interrup
253287
}
254288

255289
@Test
256-
@Ignore("TODO DEVSIX-7552 Column-count: support break-inside, break-after and break-before properties")
290+
@LogMessages(messages = {
291+
@LogMessage(messageTemplate = Html2PdfLogMessageConstant.ELEMENT_DOES_NOT_FIT_CURRENT_AREA)})
257292
public void convertPageBreakAfterPageInsideColumnTest() throws IOException, InterruptedException {
258293
runTest("pageBreakAfterPageInsideColumnTest");
259294
}
295+
296+
@Test
297+
public void convertPageBreakAfterPageColumnTest() throws IOException, InterruptedException {
298+
runTest("pageBreakAfterPageColumnTest");
299+
}
260300

261301
@Test
262302
// TODO DEVSIX-3819 support break-after, break-before, break-inside CSS properties
@@ -310,8 +350,8 @@ public void convertBreakInsideAvoidTest() throws IOException, InterruptedExcepti
310350
runTest("breakInsideAvoidTest");
311351
}
312352

353+
//TODO: DEVSIX-7740 Support page-break inside multicol container
313354
@Test
314-
// TODO DEVSIX-7552 Column-count: support break-inside, break-after and break-before properties
315355
public void convertPageBreakInsideAvoidTest() throws IOException, InterruptedException {
316356
runTest("pageBreakInsideAvoidTest");
317357
}
Binary file not shown.

0 commit comments

Comments
 (0)