Skip to content

Commit 5fa6dfd

Browse files
StryhelskiiText-CI
Stryhelski
authored and
iText-CI
committed
Add tests for patterns
Add tests for patterns SEQUENCE_PATTERN, SINGLE_PAGE_PATTERN in PageRange, URL_PATTERN in CssPropertyNormalizer, importantMatcher in CssRuleSet DEVSIX-6466 Autoported commit. Original commit hash: [480f24e47]
1 parent c22e61e commit 5fa6dfd

File tree

5 files changed

+129
-41
lines changed

5 files changed

+129
-41
lines changed

‎itext.tests/itext.kernel.tests/itext/kernel/utils/PageRangeTest.cs‎

Lines changed: 81 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -48,30 +48,30 @@ source product.
4848
namespace iText.Kernel.Utils {
4949
public class PageRangeTest : ExtendedITextTest {
5050
[NUnit.Framework.Test]
51-
public virtual void AddSingle() {
51+
public virtual void AddSingleTest() {
5252
PageRange range = new PageRange();
5353
range.AddSinglePage(5);
5454
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(5), range.GetQualifyingPageNums(10));
5555
}
5656

5757
[NUnit.Framework.Test]
58-
public virtual void AddSingles() {
58+
public virtual void AddSinglesTest() {
5959
PageRange range = new PageRange();
6060
range.AddSinglePage(5);
6161
range.AddSinglePage(1);
6262
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(5, 1), range.GetQualifyingPageNums(7));
6363
}
6464

6565
[NUnit.Framework.Test]
66-
public virtual void AddSequence() {
66+
public virtual void AddSequenceTest() {
6767
PageRange range = new PageRange();
6868
range.AddPageSequence(11, 19);
6969
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(11, 12, 13, 14, 15, 16), range.GetQualifyingPageNums
7070
(16));
7171
}
7272

7373
[NUnit.Framework.Test]
74-
public virtual void AddSequenceAndSingle() {
74+
public virtual void AddSequenceAndSingleTest() {
7575
PageRange range = new PageRange();
7676
range.AddPageSequence(22, 27);
7777
range.AddSinglePage(25);
@@ -80,7 +80,7 @@ public virtual void AddSequenceAndSingle() {
8080
}
8181

8282
[NUnit.Framework.Test]
83-
public virtual void AddSingleAndSequence() {
83+
public virtual void AddSingleAndSequenceTest() {
8484
PageRange range = new PageRange();
8585
range.AddSinglePage(5);
8686
range.AddPageSequence(3, 8);
@@ -89,21 +89,21 @@ public virtual void AddSingleAndSequence() {
8989
}
9090

9191
[NUnit.Framework.Test]
92-
public virtual void AddCustomAfter() {
92+
public virtual void AddCustomAfterTest() {
9393
PageRange range = new PageRange();
9494
range.AddPageRangePart(new PageRange.PageRangePartAfter(3));
9595
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(3, 4, 5), range.GetQualifyingPageNums(5));
9696
}
9797

9898
[NUnit.Framework.Test]
99-
public virtual void AddCustomEven() {
99+
public virtual void AddCustomEvenTest() {
100100
PageRange range = new PageRange();
101101
range.AddPageRangePart(PageRange.PageRangePartOddEven.EVEN);
102102
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(2, 4), range.GetQualifyingPageNums(5));
103103
}
104104

105105
[NUnit.Framework.Test]
106-
public virtual void AddCustomAnd() {
106+
public virtual void AddCustomAndTest() {
107107
PageRange range = new PageRange();
108108
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
109109
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
@@ -114,65 +114,96 @@ public virtual void AddCustomAnd() {
114114
}
115115

116116
[NUnit.Framework.Test]
117-
public virtual void AddSingleConstructor() {
117+
public virtual void AddSingleConstructorTest() {
118118
PageRange range = new PageRange("5");
119119
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(5), range.GetQualifyingPageNums(7));
120120
}
121121

122122
[NUnit.Framework.Test]
123-
public virtual void AddSinglesConstructor() {
123+
public virtual void AddSinglesConstructorTest() {
124124
PageRange range = new PageRange("5, 1");
125125
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(5, 1), range.GetQualifyingPageNums(10));
126126
}
127127

128128
[NUnit.Framework.Test]
129-
public virtual void AddSequenceConstructor() {
129+
public virtual void AddSinglesConstructorWithNegativeNumbersTest() {
130+
PageRange range = new PageRange("-5, -1");
131+
NUnit.Framework.Assert.AreNotEqual(JavaUtil.ArraysAsList(5, 1), range.GetQualifyingPageNums(10));
132+
}
133+
134+
[NUnit.Framework.Test]
135+
public virtual void AddSinglesConstructorWithWhitespacesTest() {
136+
PageRange range = new PageRange(" 5 , 1 ");
137+
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(5, 1), range.GetQualifyingPageNums(10));
138+
}
139+
140+
[NUnit.Framework.Test]
141+
public virtual void AddSinglesConstructorWithLetterTest() {
142+
PageRange range = new PageRange("5, A, 1");
143+
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(5, 1), range.GetQualifyingPageNums(10));
144+
}
145+
146+
[NUnit.Framework.Test]
147+
public virtual void AddSequenceConstructorTest() {
130148
PageRange range = new PageRange("11-19");
131149
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(11, 12, 13, 14, 15, 16), range.GetQualifyingPageNums
132150
(16));
133151
}
134152

135153
[NUnit.Framework.Test]
136-
public virtual void AddSequenceAndSingleConstructor() {
154+
public virtual void AddSequenceConstructorWithWhitespacesTest() {
155+
PageRange range1 = new PageRange(" 11- 19");
156+
PageRange range2 = new PageRange(" 11 -19");
157+
PageRange range3 = new PageRange(" 11 - 19");
158+
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(11, 12, 13, 14, 15, 16), range1.GetQualifyingPageNums
159+
(16));
160+
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(11, 12, 13, 14, 15, 16), range2.GetQualifyingPageNums
161+
(16));
162+
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(11, 12, 13, 14, 15, 16), range3.GetQualifyingPageNums
163+
(16));
164+
}
165+
166+
[NUnit.Framework.Test]
167+
public virtual void AddSequenceAndSingleConstructorTest() {
137168
PageRange range = new PageRange("22-27,25");
138169
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(22, 23, 24, 25, 26, 27, 25), range.GetQualifyingPageNums
139170
(30));
140171
}
141172

142173
[NUnit.Framework.Test]
143-
public virtual void AddSingleAndSequenceConstructor() {
174+
public virtual void AddSingleAndSequenceConstructorTest() {
144175
PageRange range = new PageRange("5, 3-8");
145176
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(5, 3, 4, 5, 6, 7, 8), range.GetQualifyingPageNums(10
146177
));
147178
}
148179

149180
[NUnit.Framework.Test]
150-
public virtual void AddCustomAfterConstructor() {
181+
public virtual void AddCustomAfterConstructorTest() {
151182
PageRange range = new PageRange("3-");
152183
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(3, 4, 5), range.GetQualifyingPageNums(5));
153184
}
154185

155186
[NUnit.Framework.Test]
156-
public virtual void AddCustomEvenConstructor() {
187+
public virtual void AddCustomEvenConstructorTest() {
157188
PageRange range = new PageRange("even");
158189
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(2, 4), range.GetQualifyingPageNums(5));
159190
}
160191

161192
[NUnit.Framework.Test]
162-
public virtual void AddCustomAndConstructor() {
193+
public virtual void AddCustomAndConstructorTest() {
163194
PageRange range = new PageRange("odd & 2-14");
164195
NUnit.Framework.Assert.AreEqual(JavaUtil.ArraysAsList(3, 5, 7, 9, 11, 13), range.GetQualifyingPageNums(15)
165196
);
166197
}
167198

168199
[NUnit.Framework.Test]
169-
public virtual void AddIncorrectCustomAndConstructor() {
200+
public virtual void AddIncorrectCustomAndConstructorTest() {
170201
PageRange range = new PageRange("&");
171202
NUnit.Framework.Assert.AreEqual(new List<Object>(), range.GetQualifyingPageNums(0));
172203
}
173204

174205
[NUnit.Framework.Test]
175-
public virtual void AddIncorrectConstructor() {
206+
public virtual void AddIncorrectConstructorTest() {
176207
PageRange range = new PageRange("");
177208
NUnit.Framework.Assert.AreEqual(new List<Object>(), range.GetQualifyingPageNums(0));
178209
}
@@ -190,13 +221,27 @@ public virtual void IsPageInRangeFalseTest() {
190221
}
191222

192223
[NUnit.Framework.Test]
193-
public virtual void PageRangeEqualsNullTest() {
224+
public virtual void AddSequenceConstructorWithNegativeNumberTest() {
225+
PageRange range = new PageRange("-3-8");
226+
NUnit.Framework.Assert.AreEqual(new List<Object>(), range.GetQualifyingPageNums(3));
227+
}
228+
229+
[NUnit.Framework.Test]
230+
public virtual void AddSequenceConstructorWithLetterTest() {
231+
PageRange range1 = new PageRange("3-F");
232+
PageRange range2 = new PageRange("3-8F");
233+
NUnit.Framework.Assert.AreEqual(new List<Object>(), range1.GetQualifyingPageNums(3));
234+
NUnit.Framework.Assert.AreEqual(new List<Object>(), range2.GetQualifyingPageNums(3));
235+
}
236+
237+
[NUnit.Framework.Test]
238+
public virtual void CheckPageRangeEqualsNullTest() {
194239
PageRange range1 = new PageRange("3-8");
195240
NUnit.Framework.Assert.IsFalse(range1.Equals(null));
196241
}
197242

198243
[NUnit.Framework.Test]
199-
public virtual void PageRangeEqualsAndHashCodeTest() {
244+
public virtual void CheckPageRangeEqualsAndHashCodeTest() {
200245
PageRange range1 = new PageRange("3-8");
201246
PageRange range2 = new PageRange("3-8");
202247
bool result = range1.Equals(range2);
@@ -205,7 +250,7 @@ public virtual void PageRangeEqualsAndHashCodeTest() {
205250
}
206251

207252
[NUnit.Framework.Test]
208-
public virtual void PageRangeNotEqualsAndHashCodeTest() {
253+
public virtual void CheckPageRangeNotEqualsAndHashCodeTest() {
209254
PageRange range1 = new PageRange("3-8");
210255
PageRange range2 = new PageRange("1-2");
211256
bool result = range1.Equals(range2);
@@ -232,13 +277,13 @@ public virtual void IsRangePartSingleInRangeFalseTest() {
232277
}
233278

234279
[NUnit.Framework.Test]
235-
public virtual void RangePartSingleEqualsNullTest() {
280+
public virtual void CheckRangePartSingleEqualsNullTest() {
236281
PageRange.PageRangePartSingle pageRangePartSingle = new PageRange.PageRangePartSingle(10);
237282
NUnit.Framework.Assert.IsFalse(pageRangePartSingle.Equals(null));
238283
}
239284

240285
[NUnit.Framework.Test]
241-
public virtual void RangePartSingleEqualsAndHashCodeTest() {
286+
public virtual void CheckRangePartSingleEqualsAndHashCodeTest() {
242287
PageRange.PageRangePartSingle pageRangePartSingle1 = new PageRange.PageRangePartSingle(10);
243288
PageRange.PageRangePartSingle pageRangePartSingle2 = new PageRange.PageRangePartSingle(10);
244289
bool result = pageRangePartSingle1.Equals(pageRangePartSingle2);
@@ -247,7 +292,7 @@ public virtual void RangePartSingleEqualsAndHashCodeTest() {
247292
}
248293

249294
[NUnit.Framework.Test]
250-
public virtual void RangePartSingleNotEqualsAndHashCodeTest() {
295+
public virtual void CheckRangePartSingleNotEqualsAndHashCodeTest() {
251296
PageRange.PageRangePartSingle pageRangePartSingle1 = new PageRange.PageRangePartSingle(10);
252297
PageRange.PageRangePartSingle pageRangePartSingle2 = new PageRange.PageRangePartSingle(1);
253298
bool result = pageRangePartSingle1.Equals(pageRangePartSingle2);
@@ -256,13 +301,13 @@ public virtual void RangePartSingleNotEqualsAndHashCodeTest() {
256301
}
257302

258303
[NUnit.Framework.Test]
259-
public virtual void RangePartSequenceEqualsNullTest() {
304+
public virtual void CheckRangePartSequenceEqualsNullTest() {
260305
PageRange.PageRangePartSequence pageRangePartSequence = new PageRange.PageRangePartSequence(1, 2);
261306
NUnit.Framework.Assert.IsFalse(pageRangePartSequence.Equals(null));
262307
}
263308

264309
[NUnit.Framework.Test]
265-
public virtual void RangePartSequenceEqualsAndHashCodeTest() {
310+
public virtual void CheckRangePartSequenceEqualsAndHashCodeTest() {
266311
PageRange.PageRangePartSequence pageRangePartSequence = new PageRange.PageRangePartSequence(1, 2);
267312
PageRange.PageRangePartSequence pageRangePartSequence2 = new PageRange.PageRangePartSequence(1, 2);
268313
bool result = pageRangePartSequence.Equals(pageRangePartSequence2);
@@ -271,7 +316,7 @@ public virtual void RangePartSequenceEqualsAndHashCodeTest() {
271316
}
272317

273318
[NUnit.Framework.Test]
274-
public virtual void RangePartSequenceNotEqualsAndHashCodeTest() {
319+
public virtual void CheckRangePartSequenceNotEqualsAndHashCodeTest() {
275320
PageRange.PageRangePartSequence pageRangePartSequence = new PageRange.PageRangePartSequence(1, 2);
276321
PageRange.PageRangePartSequence pageRangePartSequence2 = new PageRange.PageRangePartSequence(3, 4);
277322
bool result = pageRangePartSequence.Equals(pageRangePartSequence2);
@@ -293,13 +338,13 @@ public virtual void IsRangePartAfterInRangeFalseTest() {
293338
}
294339

295340
[NUnit.Framework.Test]
296-
public virtual void RangePartAfterEqualsNullTest() {
341+
public virtual void CheckRangePartAfterEqualsNullTest() {
297342
PageRange.PageRangePartAfter pageRangePartAfter = new PageRange.PageRangePartAfter(10);
298343
NUnit.Framework.Assert.IsFalse(pageRangePartAfter.Equals(null));
299344
}
300345

301346
[NUnit.Framework.Test]
302-
public virtual void RangePartAfterEqualsAndHashCodeTest() {
347+
public virtual void CheckRangePartAfterEqualsAndHashCodeTest() {
303348
PageRange.PageRangePartAfter pageRangePartAfter = new PageRange.PageRangePartAfter(10);
304349
PageRange.PageRangePartAfter pageRangePartAfter2 = new PageRange.PageRangePartAfter(10);
305350
bool result = pageRangePartAfter.Equals(pageRangePartAfter2);
@@ -308,7 +353,7 @@ public virtual void RangePartAfterEqualsAndHashCodeTest() {
308353
}
309354

310355
[NUnit.Framework.Test]
311-
public virtual void RangePartAfterNotEqualsAndHashCodeTest() {
356+
public virtual void CheckRangePartAfterNotEqualsAndHashCodeTest() {
312357
PageRange.PageRangePartAfter pageRangePartAfter = new PageRange.PageRangePartAfter(10);
313358
PageRange.PageRangePartAfter pageRangePartAfter2 = new PageRange.PageRangePartAfter(1);
314359
bool result = pageRangePartAfter.Equals(pageRangePartAfter2);
@@ -329,13 +374,13 @@ public virtual void IsRangePartOddEvenInRangeFalseTest() {
329374
}
330375

331376
[NUnit.Framework.Test]
332-
public virtual void RangePartOddEvenEqualsNullTest() {
377+
public virtual void CheckRangePartOddEvenEqualsNullTest() {
333378
NUnit.Framework.Assert.IsFalse(PageRange.PageRangePartOddEven.EVEN.Equals(null));
334379
NUnit.Framework.Assert.IsFalse(PageRange.PageRangePartOddEven.ODD.Equals(null));
335380
}
336381

337382
[NUnit.Framework.Test]
338-
public virtual void RangePartOddEvenEqualsAndHashCodeTest() {
383+
public virtual void CheckRangePartOddEvenEqualsAndHashCodeTest() {
339384
NUnit.Framework.Assert.IsTrue(PageRange.PageRangePartOddEven.EVEN.Equals(PageRange.PageRangePartOddEven.EVEN
340385
));
341386
NUnit.Framework.Assert.IsTrue(PageRange.PageRangePartOddEven.ODD.Equals(PageRange.PageRangePartOddEven.ODD
@@ -347,7 +392,7 @@ public virtual void RangePartOddEvenEqualsAndHashCodeTest() {
347392
}
348393

349394
[NUnit.Framework.Test]
350-
public virtual void RangePartOddEvenNotEqualsAndHashCodeTest() {
395+
public virtual void CheckRangePartOddEvenNotEqualsAndHashCodeTest() {
351396
NUnit.Framework.Assert.IsFalse(PageRange.PageRangePartOddEven.EVEN.Equals(PageRange.PageRangePartOddEven.ODD
352397
));
353398
NUnit.Framework.Assert.AreNotEqual(PageRange.PageRangePartOddEven.EVEN.GetHashCode(), PageRange.PageRangePartOddEven
@@ -371,15 +416,15 @@ public virtual void IsRangePartAndInRangeFalseTest() {
371416
}
372417

373418
[NUnit.Framework.Test]
374-
public virtual void RangePartAndEqualsNullTest() {
419+
public virtual void CheckRangePartAndEqualsNullTest() {
375420
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
376421
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
377422
PageRange.PageRangePartAnd pageRangePartAnd = new PageRange.PageRangePartAnd(odd, seq);
378423
NUnit.Framework.Assert.IsFalse(pageRangePartAnd.Equals(null));
379424
}
380425

381426
[NUnit.Framework.Test]
382-
public virtual void RangePartAndEqualsAndHashCodeTest() {
427+
public virtual void CheckRangePartAndEqualsAndHashCodeTest() {
383428
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
384429
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
385430
PageRange.PageRangePartAnd pageRangePartAnd = new PageRange.PageRangePartAnd(odd, seq);
@@ -390,7 +435,7 @@ public virtual void RangePartAndEqualsAndHashCodeTest() {
390435
}
391436

392437
[NUnit.Framework.Test]
393-
public virtual void RangePartAndNotEqualsAndHashCodeTest() {
438+
public virtual void CheckRangePartAndNotEqualsAndHashCodeTest() {
394439
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
395440
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
396441
PageRange.PageRangePartAnd pageRangePartAnd = new PageRange.PageRangePartAnd(odd, seq);

‎itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/css/CssRuleSetTest.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using iText.StyledXmlParser.Css.Parse;
4+
using iText.StyledXmlParser.Css.Selector;
5+
using iText.Test;
6+
7+
namespace iText.StyledXmlParser.Css {
8+
public class CssRuleSetTest : ExtendedITextTest {
9+
[NUnit.Framework.Test]
10+
public virtual void AddCssRuleSetWithNormalImportantDeclarationsTest() {
11+
String src = "float:right; clear:right !important;width:22.0em!important; margin:0 0 1.0em 1.0em; " + "background:#f9f9f9; "
12+
+ "border:1px solid #aaa;padding:0.2em ! important;border-spacing:0.4em 0; text-align:center " + "!important; "
13+
+ "line-height:1.4em; font-size:88%! important;";
14+
String[] expectedNormal = new String[] { "float: right", "margin: 0 0 1.0em 1.0em", "background: #f9f9f9",
15+
"border: 1px solid #aaa", "border-spacing: 0.4em 0", "line-height: 1.4em" };
16+
String[] expectedImportant = new String[] { "clear: right", "width: 22.0em", "padding: 0.2em", "text-align: center"
17+
, "font-size: 88%" };
18+
IList<CssDeclaration> declarations = CssRuleSetParser.ParsePropertyDeclarations(src);
19+
CssSelector selector = new CssSelector("h1");
20+
CssRuleSet cssRuleSet = new CssRuleSet(selector, declarations);
21+
IList<CssDeclaration> normalDeclarations = cssRuleSet.GetNormalDeclarations();
22+
for (int i = 0; i < expectedNormal.Length; i++) {
23+
NUnit.Framework.Assert.AreEqual(expectedNormal[i], normalDeclarations[i].ToString());
24+
}
25+
IList<CssDeclaration> importantDeclarations = cssRuleSet.GetImportantDeclarations();
26+
for (int i = 0; i < expectedImportant.Length; i++) {
27+
NUnit.Framework.Assert.AreEqual(expectedImportant[i], importantDeclarations[i].ToString());
28+
}
29+
}
30+
}
31+
}

0 commit comments

Comments
 (0)