Skip to content

Commit eef022e

Browse files
Dmitry RadchukiText-CI
authored andcommitted
Add negative indexes support in grid layout
DEVSIX-8423 Autoported commit. Original commit hash: [9ec3a26d1]
1 parent ca947a2 commit eef022e

File tree

61 files changed

+539
-30
lines changed

Some content is hidden

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

61 files changed

+539
-30
lines changed

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridItemPlacementTest.cs

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,28 +148,63 @@ public virtual void TwoRowSpans3Test() {
148148
}
149149

150150
[NUnit.Framework.Test]
151-
public virtual void Invalid1Test() {
152-
RunTest("invalid1");
151+
public virtual void SpanToNegativeStartTest() {
152+
RunTest("spanToNegativeStartTest");
153153
}
154154

155155
[NUnit.Framework.Test]
156-
public virtual void Invalid2Test() {
157-
RunTest("invalid2");
156+
public virtual void SpanToNegativeStartWithExplicitTemplatesTest() {
157+
RunTest("spanToNegativeStartWithExplicitTemplatesTest");
158158
}
159159

160160
[NUnit.Framework.Test]
161-
public virtual void Invalid3Test() {
162-
RunTest("invalid3");
161+
public virtual void SpanToNegativeStartWithoutTemplatesTest() {
162+
RunTest("spanToNegativeStartWithoutTemplatesTest");
163163
}
164164

165165
[NUnit.Framework.Test]
166-
public virtual void Invalid4Test() {
167-
RunTest("invalid4");
166+
public virtual void SpanToNegativeStartWithoutTemplatesTest2() {
167+
RunTest("spanToNegativeStartWithoutTemplatesTest2");
168168
}
169169

170170
[NUnit.Framework.Test]
171-
public virtual void Invalid5Test() {
172-
RunTest("invalid5");
171+
public virtual void SpanToNegativeStartWithSingleTemplateTest() {
172+
RunTest("spanToNegativeStartWithSingleTemplateTest");
173+
}
174+
175+
[NUnit.Framework.Test]
176+
public virtual void ColumnSpanExpandsStartToNegativeTest() {
177+
RunTest("columnSpanExpandsStartToNegativeTest");
178+
}
179+
180+
[NUnit.Framework.Test]
181+
public virtual void NegativeIndexOutOfTemplateTest() {
182+
RunTest("negativeIndexOutOfTemplateTest");
183+
}
184+
185+
[NUnit.Framework.Test]
186+
public virtual void NegativeIndexWithImplicitLinesTest() {
187+
RunTest("negativeIndexWithImplicitLinesTest");
188+
}
189+
190+
[NUnit.Framework.Test]
191+
public virtual void NegativeIndexWithoutTemplateTest() {
192+
RunTest("negativeIndexWithoutTemplateTest");
193+
}
194+
195+
[NUnit.Framework.Test]
196+
public virtual void NegativeIndexShorthandTest() {
197+
RunTest("negativeIndexShorthandTest");
198+
}
199+
200+
[NUnit.Framework.Test]
201+
public virtual void NegativeAndPositiveIndexShorthandTest() {
202+
RunTest("negativeAndPositiveIndexShorthandTest");
203+
}
204+
205+
[NUnit.Framework.Test]
206+
public virtual void SpanToNegativeIndexWithoutTemplateTest() {
207+
RunTest("spanToNegativeIndexWithoutTemplateTest");
173208
}
174209

175210
[NUnit.Framework.Test]

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridTemplateColumnTest.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ public virtual void TemplateColumnBasicTest2() {
137137
RunTest("template-cols-without-other-props-2");
138138
}
139139

140+
[NUnit.Framework.Test]
141+
public virtual void TemplateColumnWithFlexAndGapsTest() {
142+
RunTest("template-cols-with-flex-and-gaps");
143+
}
144+
140145
private void RunTest(String testName) {
141146
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
142147
(SOURCE_FOLDER));

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridTemplateNestedTest.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf;
25-
using iText.Test.Attributes;
2625

2726
namespace iText.Html2pdf.Css.Grid {
2827
[NUnit.Framework.Category("IntegrationTest")]
@@ -48,7 +47,6 @@ public virtual void TemplateNestedAreasWithBorderTest() {
4847
RunTest("grid-nested-areas-with-border");
4948
}
5049

51-
[NUnit.Framework.Ignore("DEVSIX-8423")]
5250
[NUnit.Framework.Test]
5351
public virtual void TemplateNestedArticlesTest() {
5452
RunTest("grid-nested-articles");
@@ -79,7 +77,6 @@ public virtual void TemplateNestedMixedContentTest() {
7977
RunTest("grid-nested-mixed-content");
8078
}
8179

82-
[NUnit.Framework.Ignore("DEVSIX-8423")]
8380
[NUnit.Framework.Test]
8481
public virtual void TemplateNestedParagraphsTest() {
8582
RunTest("grid-nested-paragraphs");
@@ -105,26 +102,21 @@ public virtual void TemplateNestedTableMixedContentTest() {
105102
RunTest("grid-nested-table-with-mixed-content");
106103
}
107104

108-
[NUnit.Framework.Ignore("DEVSIX-8423")]
109105
[NUnit.Framework.Test]
110106
public virtual void TemplateNested2LevelsWithAreasTest() {
111107
RunTest("grid-nested-2-levels-areas");
112108
}
113109

114-
[NUnit.Framework.Ignore("DEVSIX-8423")]
115-
[LogMessage(iText.IO.Logs.IoLogMessageConstant.CLIP_ELEMENT, Count = 4)]
116110
[NUnit.Framework.Test]
117111
public virtual void TemplateNested3LevelsFormsTest() {
118112
RunTest("grid-nested-3-forms");
119113
}
120114

121-
[NUnit.Framework.Ignore("DEVSIX-8423")]
122115
[NUnit.Framework.Test]
123116
public virtual void TemplateNested3LevelsTest() {
124117
RunTest("grid-nested-3-levels");
125118
}
126119

127-
[NUnit.Framework.Ignore("DEVSIX-8423")]
128120
[NUnit.Framework.Test]
129121
public virtual void TemplateNested3LevelsMultipleTest() {
130122
RunTest("grid-nested-3-levels-multiple");

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridTemplatesTest.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,11 @@ public virtual void BasicColumnRowStartEndTest() {
131131
RunTest("basicColumnRowStartEndTest");
132132
}
133133

134+
[NUnit.Framework.Test]
135+
public virtual void BasicColumnRowStartEnd1Test() {
136+
RunTest("basicColumnRowStartEnd1Test");
137+
}
138+
134139
[NUnit.Framework.Test]
135140
public virtual void BasicColumnRowStartEnd2Test() {
136141
RunTest("basicColumnRowStartEnd2Test");

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_grid/abspos/GridPaintPositionedChildren001Test.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ 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_grid.Abspos {
27-
[NUnit.Framework.Ignore("DEVSIX-8423")]
2827
public class GridPaintPositionedChildren001Test : W3CCssTest {
2928
protected internal override String GetHtmlFileName() {
3029
return "grid-paint-positioned-children-001.html";

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_grid/abspos/PositionedGridItems025Test.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ You should have received a copy of the GNU Affero General Public License
2525
using iText.Test.Attributes;
2626

2727
namespace iText.Html2pdf.Css.W3c.Css_grid.Abspos {
28-
[NUnit.Framework.Ignore("DEVSIX-8423")]
2928
[LogMessage(iText.IO.Logs.IoLogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, Count = 2)]
3029
public class PositionedGridItems025Test : W3CCssTest {
3130
protected internal override String GetHtmlFileName() {

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_grid/abspos/PositionedGridItemsNegativeIndices001Test.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ 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_grid.Abspos {
27-
[NUnit.Framework.Ignore("DEVSIX-8423")]
2827
public class PositionedGridItemsNegativeIndices001Test : W3CCssTest {
2928
protected internal override String GetHtmlFileName() {
3029
return "positioned-grid-items-negative-indices-001.html";

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_grid/grid_definition/GridAutoRepeatMaxSize002Test.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ You should have received a copy of the GNU Affero General Public License
2626
using iText.Test.Attributes;
2727

2828
namespace iText.Html2pdf.Css.W3c.Css_grid.Grid_definition {
29-
[NUnit.Framework.Ignore("DEVSIX-8423")]
3029
[LogMessage(Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 3)]
3130
public class GridAutoRepeatMaxSize002Test : W3CCssTest {
3231
protected internal override String GetHtmlFileName() {

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_grid/grid_definition/GridAutoRepeatMinMaxSize001Test.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ You should have received a copy of the GNU Affero General Public License
2626
using iText.Test.Attributes;
2727

2828
namespace iText.Html2pdf.Css.W3c.Css_grid.Grid_definition {
29-
[NUnit.Framework.Ignore("DEVSIX-8423")]
3029
[LogMessage(Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 3)]
3130
public class GridAutoRepeatMinMaxSize001Test : W3CCssTest {
3231
protected internal override String GetHtmlFileName() {

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_grid/grid_definition/GridAutoRepeatMinSize001Test.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ You should have received a copy of the GNU Affero General Public License
2626
using iText.Test.Attributes;
2727

2828
namespace iText.Html2pdf.Css.W3c.Css_grid.Grid_definition {
29-
[NUnit.Framework.Ignore("DEVSIX-8423")]
3029
[LogMessage(Html2PdfLogMessageConstant.NO_WORKER_FOUND_FOR_TAG, Count = 3)]
3130
public class GridAutoRepeatMinSize001Test : W3CCssTest {
3231
protected internal override String GetHtmlFileName() {

0 commit comments

Comments
 (0)