Skip to content

Commit 4dbc244

Browse files
committed
Add markers support
DEVSIX-2860 Autoported commit. Original commit hash: [598150e58] Manual files: svg/src/main/java/com/itextpdf/svg/utils/SvgCssUtils.java
1 parent 0cf1104 commit 4dbc244

File tree

135 files changed

+3863
-346
lines changed

Some content is hidden

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

135 files changed

+3863
-346
lines changed

itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/css/util/CssUtilsTest.cs

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,28 +130,28 @@ public virtual void ParseAbsoluteLengthFromUnknownType() {
130130

131131
[NUnit.Framework.Test]
132132
public virtual void ValidateMetricValue() {
133-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsMetricValue("1px"));
134-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsMetricValue("1in"));
135-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsMetricValue("1cm"));
136-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsMetricValue("1mm"));
137-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsMetricValue("1pc"));
138-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsMetricValue("1em"));
139-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsMetricValue("1rem"));
140-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsMetricValue("1ex"));
141-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsMetricValue("1pt"));
142-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsMetricValue("1inch"));
143-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsMetricValue("+1m"));
133+
NUnit.Framework.Assert.IsTrue(CssUtils.IsMetricValue("1px"));
134+
NUnit.Framework.Assert.IsTrue(CssUtils.IsMetricValue("1in"));
135+
NUnit.Framework.Assert.IsTrue(CssUtils.IsMetricValue("1cm"));
136+
NUnit.Framework.Assert.IsTrue(CssUtils.IsMetricValue("1mm"));
137+
NUnit.Framework.Assert.IsTrue(CssUtils.IsMetricValue("1pc"));
138+
NUnit.Framework.Assert.IsFalse(CssUtils.IsMetricValue("1em"));
139+
NUnit.Framework.Assert.IsFalse(CssUtils.IsMetricValue("1rem"));
140+
NUnit.Framework.Assert.IsFalse(CssUtils.IsMetricValue("1ex"));
141+
NUnit.Framework.Assert.IsTrue(CssUtils.IsMetricValue("1pt"));
142+
NUnit.Framework.Assert.IsFalse(CssUtils.IsMetricValue("1inch"));
143+
NUnit.Framework.Assert.IsFalse(CssUtils.IsMetricValue("+1m"));
144144
}
145145

146146
[NUnit.Framework.Test]
147147
public virtual void ValidateNumericValue() {
148-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsNumericValue("1"));
149-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsNumericValue("12"));
150-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsNumericValue("1.2"));
151-
NUnit.Framework.Assert.AreEqual(true, CssUtils.IsNumericValue(".12"));
152-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsNumericValue("12f"));
153-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsNumericValue("f1.2"));
154-
NUnit.Framework.Assert.AreEqual(false, CssUtils.IsNumericValue(".12f"));
148+
NUnit.Framework.Assert.IsTrue(CssUtils.IsNumericValue("1"));
149+
NUnit.Framework.Assert.IsTrue(CssUtils.IsNumericValue("12"));
150+
NUnit.Framework.Assert.IsTrue(CssUtils.IsNumericValue("1.2"));
151+
NUnit.Framework.Assert.IsTrue(CssUtils.IsNumericValue(".12"));
152+
NUnit.Framework.Assert.IsFalse(CssUtils.IsNumericValue("12f"));
153+
NUnit.Framework.Assert.IsFalse(CssUtils.IsNumericValue("f1.2"));
154+
NUnit.Framework.Assert.IsFalse(CssUtils.IsNumericValue(".12f"));
155155
}
156156

157157
[NUnit.Framework.Test]
@@ -260,5 +260,27 @@ public virtual void ParseAbsoluteLength12qTest() {
260260
// the difference between java and .net. So the test verifies this fix
261261
NUnit.Framework.Assert.AreEqual(8.503937f, CssUtils.ParseAbsoluteLength("12q"), 0f);
262262
}
263+
264+
[NUnit.Framework.Test]
265+
public virtual void TestIsAngleCorrectValues() {
266+
NUnit.Framework.Assert.IsTrue(CssUtils.IsAngleValue("10deg"));
267+
NUnit.Framework.Assert.IsTrue(CssUtils.IsAngleValue("-20grad"));
268+
NUnit.Framework.Assert.IsTrue(CssUtils.IsAngleValue("30.5rad"));
269+
NUnit.Framework.Assert.IsTrue(CssUtils.IsAngleValue("0rad"));
270+
}
271+
272+
[NUnit.Framework.Test]
273+
public virtual void TestIsAngleNullValue() {
274+
NUnit.Framework.Assert.IsFalse(CssUtils.IsAngleValue(null));
275+
}
276+
277+
[NUnit.Framework.Test]
278+
public virtual void TestIsAngleIncorrectValues() {
279+
NUnit.Framework.Assert.IsFalse(CssUtils.IsAngleValue("deg"));
280+
NUnit.Framework.Assert.IsFalse(CssUtils.IsAngleValue("-20,6grad"));
281+
NUnit.Framework.Assert.IsFalse(CssUtils.IsAngleValue("0"));
282+
NUnit.Framework.Assert.IsFalse(CssUtils.IsAngleValue("10in"));
283+
NUnit.Framework.Assert.IsFalse(CssUtils.IsAngleValue("10px"));
284+
}
263285
}
264286
}

itext.tests/itext.svg.tests/itext/svg/renderers/SvgDrawContextTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ public virtual void TearDown() {
7575
}
7676

7777
[NUnit.Framework.Test]
78-
public virtual void DrawContextEmptyStackPeekTest() {
78+
public virtual void DrawContextEmptyDequeGetFirstTest() {
7979
NUnit.Framework.Assert.That(() => {
8080
context.GetCurrentCanvas();
8181
}
82-
, NUnit.Framework.Throws.InstanceOf<InvalidOperationException>())
82+
, NUnit.Framework.Throws.InstanceOf<NullReferenceException>())
8383
;
8484
}
8585

8686
[NUnit.Framework.Test]
87-
public virtual void DrawContextEmptyStackPopTest() {
87+
public virtual void DrawContextEmptyDequePopTest() {
8888
NUnit.Framework.Assert.That(() => {
8989
context.PopCanvas();
9090
}
91-
, NUnit.Framework.Throws.InstanceOf<InvalidOperationException>())
91+
, NUnit.Framework.Throws.InstanceOf<NullReferenceException>())
9292
;
9393
}
9494

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public virtual void ClipPathCssProperty() {
127127

128128
[NUnit.Framework.Test]
129129
[LogMessage(SvgLogMessageConstant.UNMAPPEDTAG, Count = 27)]
130-
[LogMessage(iText.StyledXmlParser.LogMessageConstant.ERROR_RESOLVING_PARENT_STYLES, Count = 27)]
131130
public virtual void ClipPathRulesCombined() {
132131
//TODO: update after DEVSIX-2377
133132
ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "clipPathRulesCombined");

0 commit comments

Comments
 (0)