Skip to content

Commit 3b4513d

Browse files
Dmitry RadchukiText-CI
authored andcommitted
Remove multicolEnabled property and add continuousContainerEnabled property
DEVSIX-7594 Autoported commit. Original commit hash: [cead00efa]
1 parent d688703 commit 3b4513d

File tree

276 files changed

+514
-344
lines changed

Some content is hidden

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

276 files changed

+514
-344
lines changed
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/*
2+
This file is part of the iText (R) project.
3+
Copyright (c) 1998-2023 Apryse Group NV
4+
Authors: Apryse Software.
5+
6+
This program is offered under a commercial and under the AGPL license.
7+
For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below.
8+
9+
AGPL licensing:
10+
This program is free software: you can redistribute it and/or modify
11+
it under the terms of the GNU Affero General Public License as published by
12+
the Free Software Foundation, either version 3 of the License, or
13+
(at your option) any later version.
14+
15+
This program is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
GNU Affero General Public License for more details.
19+
20+
You should have received a copy of the GNU Affero General Public License
21+
along with this program. If not, see <https://www.gnu.org/licenses/>.
22+
*/
23+
using System;
24+
using iText.Html2pdf;
25+
26+
namespace iText.Html2pdf.Css {
27+
[NUnit.Framework.Category("IntegrationTest")]
28+
public class ContinuousContainerTest : ExtendedHtmlConversionITextTest {
29+
public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
30+
.CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/ContinuousContainerTest/";
31+
32+
public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
33+
+ "/test/itext/html2pdf/css/ContinuousContainerTest/";
34+
35+
[NUnit.Framework.OneTimeSetUp]
36+
public static void BeforeClass() {
37+
CreateOrClearDestinationFolder(DESTINATION_FOLDER);
38+
}
39+
40+
[NUnit.Framework.Test]
41+
public virtual void SimpleDivTest() {
42+
RunTest("divTest");
43+
}
44+
45+
[NUnit.Framework.Test]
46+
public virtual void NestedDivTest() {
47+
RunTest("nestedDivTest");
48+
}
49+
50+
[NUnit.Framework.Test]
51+
public virtual void ParagraphTest() {
52+
RunTest("paragraphTest");
53+
}
54+
55+
[NUnit.Framework.Test]
56+
public virtual void TableTest() {
57+
// TODO DEVSIX-7567 Support continuous container for tables (td)
58+
RunTest("tableTest");
59+
}
60+
61+
[NUnit.Framework.Test]
62+
public virtual void ListTest() {
63+
RunTest("listTest");
64+
}
65+
66+
private void RunTest(String testName) {
67+
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetContinuousContainerEnabled
68+
(true));
69+
}
70+
}
71+
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/BreakTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ public virtual void ConvertBreakInsideAvoidColumnTest() {
333333
}
334334

335335
private void RunTest(String testName) {
336-
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
337-
(true).SetBaseUri(SOURCE_FOLDER));
336+
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
337+
(SOURCE_FOLDER));
338338
}
339339
}
340340
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnCountTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@ public virtual void ShortHandResolverTest01() {
399399
}
400400

401401
private void RunTest(String testName) {
402-
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
403-
(true).SetBaseUri(SOURCE_FOLDER));
402+
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
403+
(SOURCE_FOLDER));
404404
}
405405
}
406406
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnGapTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public virtual void ConvertGapShorthandTest() {
103103
}
104104

105105
private void RunTest(String testName) {
106-
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
107-
(true).SetBaseUri(SOURCE_FOLDER));
106+
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
107+
(SOURCE_FOLDER));
108108
}
109109
}
110110
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnRuleTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ public virtual void ConvertRuleShorthandTest() {
128128
}
129129

130130
private void RunTest(String testName) {
131-
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
132-
(true).SetBaseUri(SOURCE_FOLDER));
131+
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
132+
(SOURCE_FOLDER));
133133
}
134134
}
135135
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnWidthTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ public virtual void ColumnWidthPercentageTest() {
278278
}
279279

280280
private void RunTest(String testName) {
281-
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
282-
(true).SetBaseUri(SOURCE_FOLDER));
281+
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
282+
(SOURCE_FOLDER));
283283
}
284284
}
285285
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnsTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public virtual void ConvertOutsidePageContentTest() {
103103
}
104104

105105
private void RunTest(String testName) {
106-
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetMulticolEnabled
107-
(true).SetBaseUri(SOURCE_FOLDER));
106+
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
107+
(SOURCE_FOLDER));
108108
}
109109
}
110110
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/W3CCssMulticolTest.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_multicol/AbsposAfterSpannerStaticPosTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You should have received a copy of the GNU Affero General Public License
2424
using iText.Html2pdf.Css.W3c;
2525

2626
namespace iText.Html2pdf.Css.W3c.Css_multicol {
27-
public class AbsposAfterSpannerStaticPosTest : W3CCssMulticolTest {
27+
public class AbsposAfterSpannerStaticPosTest : W3CCssTest {
2828
protected internal override String GetHtmlFileName() {
2929
return "abspos-after-spanner-static-pos.html";
3030
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_multicol/AbsposAfterSpannerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You should have received a copy of the GNU Affero General Public License
2424
using iText.Html2pdf.Css.W3c;
2525

2626
namespace iText.Html2pdf.Css.W3c.Css_multicol {
27-
public class AbsposAfterSpannerTest : W3CCssMulticolTest {
27+
public class AbsposAfterSpannerTest : W3CCssTest {
2828
protected internal override String GetHtmlFileName() {
2929
return "abspos-after-spanner.html";
3030
}

0 commit comments

Comments
 (0)