Skip to content

Commit 5d3dadf

Browse files
aleks-ivanovaleks-ivanov
committed
Merge branch 'develop' into devsecops
2 parents 0f2b5f2 + 45c8c3d commit 5d3dadf

File tree

249 files changed

+1884
-7
lines changed

Some content is hidden

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

249 files changed

+1884
-7
lines changed

‎itext.tests/itext.svg.tests/itext/svg/css/BackgroundTest.cs

Lines changed: 441 additions & 0 deletions
Large diffs are not rendered by default.

‎itext.tests/itext.svg.tests/itext/svg/css/OutlineTest.cs

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/*
2+
This file is part of the iText (R) project.
3+
Copyright (c) 1998-2025 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.Svg.Renderers;
25+
using iText.Test;
26+
27+
namespace iText.Svg.Css {
28+
[NUnit.Framework.Category("IntegrationTest")]
29+
public class OutlineTest : SvgIntegrationTest {
30+
//TODO DEVSIX-4044: Update cmp files
31+
private static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
32+
.CurrentContext.TestDirectory) + "/resources/itext/svg/css/OutlineTest/";
33+
34+
private static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
35+
+ "/test/itext/svg/css/OutlineTest/";
36+
37+
[NUnit.Framework.OneTimeSetUp]
38+
public static void BeforeClass() {
39+
ITextTest.CreateDestinationFolder(DESTINATION_FOLDER);
40+
}
41+
42+
[NUnit.Framework.Test]
43+
public virtual void OutlineShortHandTest() {
44+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineShortHand");
45+
}
46+
47+
[NUnit.Framework.Test]
48+
public virtual void OutlineColorTest() {
49+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineColor");
50+
}
51+
52+
[NUnit.Framework.Test]
53+
public virtual void OutlineWidthGlobalTest() {
54+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineWidthGlobal");
55+
}
56+
57+
[NUnit.Framework.Test]
58+
public virtual void OutlineOffsetTest() {
59+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineOffset");
60+
}
61+
62+
[NUnit.Framework.Test]
63+
public virtual void OutlineStylesTest() {
64+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineStyles");
65+
}
66+
67+
[NUnit.Framework.Test]
68+
public virtual void OutlineWidthTest() {
69+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineWidth");
70+
}
71+
72+
[NUnit.Framework.Test]
73+
public virtual void OutlineSimpleTopLevelTest() {
74+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineSimpleTopLevel");
75+
}
76+
77+
[NUnit.Framework.Test]
78+
public virtual void OutlineWidthSeparateTest() {
79+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineWidthSeparate");
80+
}
81+
82+
[NUnit.Framework.Test]
83+
public virtual void OutlineStylesSeparateTest() {
84+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineStylesSeparate");
85+
}
86+
87+
[NUnit.Framework.Test]
88+
public virtual void OutlineOffsetSeparateTest() {
89+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineOffsetSeparate");
90+
}
91+
92+
[NUnit.Framework.Test]
93+
public virtual void OutlineWidthGlobalSeparateTest() {
94+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineWidthGlobalSeparate");
95+
}
96+
97+
[NUnit.Framework.Test]
98+
public virtual void OutlineShortHandSeparateTest() {
99+
ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "outlineShortHandSeparate");
100+
}
101+
}
102+
}

‎itext.tests/itext.svg.tests/itext/svg/css/SvgStyleResolverIntegrationTest.cs

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,38 +155,56 @@ public virtual void GoogleFontsTest() {
155155

156156
[NUnit.Framework.Test]
157157
public virtual void SvgWithExternalCSStoSingleDefaultPage() {
158-
// TODO: update cmp files when DEVSIX-2286 resolved
158+
// TODO: update cmp files when DEVSIX-4396 resolved
159+
// TODO: update cmp files when DEVSIX-6405 resolved
160+
// TODO: update cmp files when DEVSIX-8821 resolved
161+
// TODO: update cmp files when DEVSIX-8822 resolved
162+
// TODO: update cmp files when DEVSIX-8832 resolved
159163
ConvertAndCompare(sourceFolder, destinationFolder, "externalCss");
160164
}
161165

162166
[NUnit.Framework.Test]
163167
public virtual void SvgWithInternalCSStoSingleDefaultPage() {
164-
// TODO: update cmp files when DEVSIX-2286 resolved
168+
// TODO: update cmp files when DEVSIX-4396 resolved
169+
// TODO: update cmp files when DEVSIX-6405 resolved
170+
// TODO: update cmp files when DEVSIX-8821 resolved
171+
// TODO: update cmp files when DEVSIX-8822 resolved
172+
// TODO: update cmp files when DEVSIX-8832 resolved
165173
ConvertAndCompare(sourceFolder, destinationFolder, "internalCss");
166174
}
167175

168176
[NUnit.Framework.Test]
169177
public virtual void SvgWithInternalCSSWithoutOverlapTest() {
170-
// TODO: update cmp files when DEVSIX-2286 resolved
178+
// TODO: update cmp files when DEVSIX-8822 resolved
179+
// TODO: update cmp files when DEVSIX-8832 resolved
171180
ConvertAndCompare(sourceFolder, destinationFolder, "internalCssNoOverlap");
172181
}
173182

174183
[NUnit.Framework.Test]
175184
public virtual void SvgWithExternalCSStoCustomPage() {
176-
// TODO: update cmp files when DEVSIX-2286 resolved
185+
// TODO: update cmp files when DEVSIX-4396 resolved
186+
// TODO: update cmp files when DEVSIX-6405 resolved
187+
// TODO: update cmp files when DEVSIX-8821 resolved
188+
// TODO: update cmp files when DEVSIX-8822 resolved
189+
// TODO: update cmp files when DEVSIX-8832 resolved
177190
// Take a note this method differs from the one used in Default Page test
178191
ConvertAndCompare(sourceFolder, destinationFolder, "externalCss_custom", PageSize.A3.Rotate());
179192
}
180193

181194
[NUnit.Framework.Test]
182195
public virtual void SvgWithInternalCSStoCustomPage() {
183-
// TODO: update cmp files when DEVSIX-2286 resolved
196+
// TODO: update cmp files when DEVSIX-4396 resolved
197+
// TODO: update cmp files when DEVSIX-6405 resolved
198+
// TODO: update cmp files when DEVSIX-8821 resolved
199+
// TODO: update cmp files when DEVSIX-8822 resolved
200+
// TODO: update cmp files when DEVSIX-8832 resolved
184201
ConvertAndCompare(sourceFolder, destinationFolder, "internalCss_custom", PageSize.A3.Rotate());
185202
}
186203

187204
[NUnit.Framework.Test]
188205
public virtual void MultipleSVGtagsWithDiffStylesFromExternalCSS() {
189-
// TODO: update cmp files when DEVSIX-2286 resolved
206+
// TODO: update cmp files when DEVSIX-8823 resolved
207+
// TODO: update cmp files when DEVSIX-8832 resolved
190208
ConvertAndCompare(sourceFolder, destinationFolder, "externalCss_palette", PageSize.A3.Rotate());
191209
}
192210

‎itext.tests/itext.svg.tests/itext/svg/processors/impl/font/FontFaceTest.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ public virtual void FontSelectorTest01() {
8888
ConvertAndCompare(sourceFolder, destinationFolder, "fontSelectorTest01");
8989
}
9090

91+
[NUnit.Framework.Test]
92+
public virtual void FontSelectorMissingFontWithSize() {
93+
ConvertAndCompare(sourceFolder, destinationFolder, "fontSelectorMissingWithFontSize");
94+
}
95+
9196
[NUnit.Framework.Test]
9297
public virtual void FontFaceGrammarTest() {
9398
ConvertAndCompare(sourceFolder, destinationFolder, "fontFaceGrammarTest");

‎itext.tests/itext.svg.tests/itext/svg/renderers/StrokeTest.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,34 @@ public virtual void StrokeTextTest() {
109109
public virtual void StrokeTspanTest() {
110110
ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeTspan");
111111
}
112+
113+
[NUnit.Framework.Test]
114+
public virtual void StrokeObjectsOverlap1Test() {
115+
ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroup");
116+
}
117+
118+
[NUnit.Framework.Test]
119+
public virtual void StrokeObjectsOverlap2Test() {
120+
//TODO DEVSIX-7338: Update cmp file
121+
ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroup2");
122+
}
123+
124+
[NUnit.Framework.Test]
125+
public virtual void StrokeObjectsOverlap3Test() {
126+
//TODO DEVSIX-7338: Update cmp file
127+
ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroupNoInsideStroke");
128+
}
129+
130+
[NUnit.Framework.Test]
131+
public virtual void StrokeObjectsOverlap4Test() {
132+
//TODO DEVSIX-7338: Update cmp file
133+
ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroupNoInsideStroke2");
134+
}
135+
136+
[NUnit.Framework.Test]
137+
public virtual void StrokeObjectsOverlap5Test() {
138+
//TODO DEVSIX-7338: Update cmp file
139+
ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeOnGroupNoInsideStroke3");
140+
}
112141
}
113142
}

‎itext.tests/itext.svg.tests/itext/svg/renderers/impl/ClipPathSvgNodeRendererIntegrationTest.cs

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ You should have received a copy of the GNU Affero General Public License
2121
along with this program. If not, see <https://www.gnu.org/licenses/>.
2222
*/
2323
using System;
24+
using iText.Svg.Processors;
2425
using iText.Svg.Processors.Impl;
2526
using iText.Svg.Renderers;
2627
using iText.Test;
@@ -132,5 +133,54 @@ public virtual void ClipPathUrlTopLevelTest() {
132133
public virtual void ClipPathUrl2ndLevelTest() {
133134
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathUrl2ndLevel");
134135
}
136+
137+
[NUnit.Framework.Test]
138+
public virtual void ClipPathTextSimpleTest() {
139+
//TODO DEVSIX-2588: Update cmp files
140+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathText");
141+
}
142+
143+
[NUnit.Framework.Test]
144+
public virtual void ClipPathTextBoldTest() {
145+
//TODO DEVSIX-2588: Update cmp files
146+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathTextBold");
147+
}
148+
149+
[NUnit.Framework.Test]
150+
public virtual void ClipPathTextMultiObjectsTest() {
151+
//TODO DEVSIX-2588: Update cmp files
152+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathTextMultiObjects");
153+
}
154+
155+
[NUnit.Framework.Test]
156+
public virtual void ClipPathTextMultiObjects2Test() {
157+
//TODO DEVSIX-2588: Update cmp files
158+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathTextMultiObjects2");
159+
}
160+
161+
[NUnit.Framework.Test]
162+
public virtual void ClipPathTextMultiObjects3Test() {
163+
//TODO DEVSIX-2588: Update cmp files
164+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathTextMultiObjects3");
165+
}
166+
167+
[NUnit.Framework.Test]
168+
public virtual void ClipPathTextLinearGradientTest() {
169+
//TODO DEVSIX-2588: Update cmp files
170+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathTextLinearGrad");
171+
}
172+
173+
[NUnit.Framework.Test]
174+
public virtual void ClipPathTextPatternTest() {
175+
//TODO DEVSIX-2588: Update cmp files
176+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathTextPattern");
177+
}
178+
179+
[NUnit.Framework.Test]
180+
public virtual void ClipPathTextImageTest() {
181+
//TODO DEVSIX-2588: Update cmp files
182+
ISvgConverterProperties properties = new SvgConverterProperties().SetBaseUri(sourceFolder);
183+
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathTextImage", properties);
184+
}
135185
}
136186
}

0 commit comments

Comments
 (0)