Skip to content

Commit 1ac89a8

Browse files
author
dmitry.radchuk
committed
Add column count multipage tests
DEVSIX-7584
1 parent 084928a commit 1ac89a8

File tree

66 files changed

+120
-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.

66 files changed

+120
-5
lines changed

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

Lines changed: 19 additions & 3 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.layout.logs.LayoutLogMessageConstant;
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;
@@ -109,18 +112,21 @@ public void convertBasicSectionTest() throws IOException, InterruptedException {
109112
runTest("basicSectionTest");
110113
}
111114

112-
//TODO: DEVSIX-7584 add multipage support
113115
@Test
114116
public void convertBasicDivMultiPageDocumentsTest() throws IOException, InterruptedException {
115117
runTest("basicDivMultiPageTest");
116118
}
117119

118-
//TODO: DEVSIX-7584 add multipage support
119120
@Test
120121
public void convertBasicFormMultiPageDocumentsTest() throws IOException, InterruptedException {
121122
runTest("basicFormMultiPageTest");
122123
}
123124

125+
@Test
126+
public void convertBigFormMultiPageDocumentsTest() throws IOException, InterruptedException {
127+
runTest("bigFormMultiPageTest");
128+
}
129+
124130
@Test
125131
public void convertBasicDisplayPropertyTest() throws IOException, InterruptedException {
126132
runTest("basicDisplayPropertyTest");
@@ -134,6 +140,7 @@ public void convertBasicDisplayPropertyWithNestedColumnsTest() throws IOExceptio
134140

135141
//TODO: DEVSIX-7556
136142
@Test
143+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
137144
public void convertBasicFloatPropertyTest() throws IOException, InterruptedException {
138145
runTest("basicFloatPropertyTest");
139146
}
@@ -143,7 +150,6 @@ public void convertBasicFlexPropertyTest() throws IOException, InterruptedExcept
143150
runTest("basicFlexPropertyTest");
144151
}
145152

146-
//TODO: DEVSIX-7587 adjust approximate height calculation
147153
@Test
148154
public void convertImagesWithDifferentColValuesTest() throws IOException, InterruptedException {
149155
runTest("imagesWithDifferentColValuesTest");
@@ -229,4 +235,14 @@ private void runTest(String testName) throws IOException, InterruptedException {
229235
SOURCE_FOLDER, DESTINATION_FOLDER, false,
230236
new ConverterProperties().setMulticolEnabled(true).setBaseUri(SOURCE_FOLDER));
231237
}
238+
239+
@Test
240+
public void imagesMultipageTest() throws IOException, InterruptedException {
241+
runTest("imagesMultipageTest");
242+
}
243+
244+
@Test
245+
public void imagesWithParagraphMultipageTest() throws IOException, InterruptedException {
246+
runTest("imagesWithParagraphMultipageTest");
247+
}
232248
}

src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolSpanFloat002Test.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ This file is part of the iText (R) project.
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssMulticolTest;
2626

27+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
28+
import com.itextpdf.test.annotations.LogMessage;
29+
import com.itextpdf.test.annotations.LogMessages;
2730
import org.junit.Ignore;
2831

29-
@Ignore("DEVSIX-7609")
32+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
3033
public class MulticolSpanFloat002Test extends W3CCssMulticolTest {
3134
@Override
3235
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolSpanFloat003Test.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ This file is part of the iText (R) project.
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssMulticolTest;
2626

27+
import com.itextpdf.layout.logs.LayoutLogMessageConstant;
28+
import com.itextpdf.test.annotations.LogMessage;
29+
import com.itextpdf.test.annotations.LogMessages;
2730
import org.junit.Ignore;
2831

29-
@Ignore("DEVSIX-7609")
32+
@LogMessages(messages = {@LogMessage(messageTemplate = LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
3033
public class MulticolSpanFloat003Test extends W3CCssMulticolTest {
3134
@Override
3235
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolZeroHeight001Test.java

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

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssMulticolTest;
26+
import org.junit.Ignore;
2627

28+
@Ignore("DEVSIX-7588")
2729
public class MulticolZeroHeight001Test extends W3CCssMulticolTest {
2830
@Override
2931
protected String getHtmlFileName() {
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head> </head>
4+
5+
<body>
6+
<h2>Basic Form multipage test</h2>
7+
<div style="width: 400px; height: 850px; background-color: green"></div>
8+
<h3>
9+
Form with Columnized Layout, column-count: 3, nested Paragraph with
10+
column-count 2
11+
</h3>
12+
<form style="column-count: 3">
13+
<label for="name">Name:</label>
14+
<input type="text" id="name" name="name" required />
15+
<br />
16+
17+
<label for="email">Email:</label>
18+
<input type="email" id="email" name="email" required />
19+
<br />
20+
21+
<label for="phone">Phone:</label>
22+
<input type="text" id="phone" name="phone" required />
23+
<br />
24+
25+
<label for="address">Address:</label>
26+
<input type="text" id="address" name="address" required />
27+
<br />
28+
29+
<label for="city">City:</label>
30+
<input type="text" id="city" name="city" required />
31+
<br />
32+
33+
<label for="country">Country:</label>
34+
<select id="country" name="country" required>
35+
<option value="">Select country</option>
36+
<option value="usa">USA</option>
37+
<option value="uk">UK</option>
38+
<option value="canada">Canada</option>
39+
</select>
40+
<br />
41+
42+
<label for="message">Message:</label>
43+
<textarea id="message" name="message" required></textarea>
44+
<br />
45+
<p style="column-count: 2">
46+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse id
47+
pulvinar est, ac facilisis dui. Morbi vel justo vel odio iaculis
48+
lacinia. Nullam fringilla neque in augue vehicula, nec luctus felis
49+
accumsan. Sed eleifend diam vel tellus posuere, nec blandit erat
50+
convallis. Nulla facilisi. Duis tincidunt metus id nisl rhoncus, at
51+
ullamcorper nisi porttitor. Integer vestibulum turpis vitae varius
52+
pharetra. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
53+
Suspendisse id pulvinar est, ac facilisis dui. Morbi vel justo vel odio
54+
iaculis lacinia. Nullam fringilla neque in augue vehicula, nec luctus
55+
felis accumsan. Sed eleifend diam vel tellus posuere, nec blandit erat
56+
convallis. Nulla facilisi. Duis tincidunt metus id nisl rhoncus, at
57+
ullamcorper nisi porttitor. Integer vestibulum turpis vitae varius
58+
pharetra.
59+
</p>
60+
61+
<input type="submit" value="Submit" />
62+
</form>
63+
</body>
64+
</html>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)