Skip to content

Commit 480f24e

Browse files
author
Stryhelski
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
1 parent d4c6741 commit 480f24e

File tree

4 files changed

+154
-40
lines changed

4 files changed

+154
-40
lines changed

‎kernel/src/test/java/com/itextpdf/kernel/utils/PageRangeTest.java

Lines changed: 84 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ This file is part of the iText (R) project.
5656
public class PageRangeTest extends ExtendedITextTest {
5757

5858
@Test
59-
public void addSingle() {
59+
public void addSingleTest() {
6060
PageRange range = new PageRange();
6161
range.addSinglePage(5);
6262

6363
Assert.assertEquals(Arrays.asList(5), range.getQualifyingPageNums(10));
6464
}
6565

6666
@Test
67-
public void addSingles() {
67+
public void addSinglesTest() {
6868
PageRange range = new PageRange();
6969
range.addSinglePage(5);
7070
range.addSinglePage(1);
@@ -73,15 +73,15 @@ public void addSingles() {
7373
}
7474

7575
@Test
76-
public void addSequence() {
76+
public void addSequenceTest() {
7777
PageRange range = new PageRange();
7878
range.addPageSequence(11, 19);
7979

8080
Assert.assertEquals(Arrays.asList(11, 12, 13, 14, 15, 16), range.getQualifyingPageNums(16));
8181
}
8282

8383
@Test
84-
public void addSequenceAndSingle() {
84+
public void addSequenceAndSingleTest() {
8585
PageRange range = new PageRange();
8686
range.addPageSequence(22, 27);
8787
range.addSinglePage(25);
@@ -90,7 +90,7 @@ public void addSequenceAndSingle() {
9090
}
9191

9292
@Test
93-
public void addSingleAndSequence() {
93+
public void addSingleAndSequenceTest() {
9494
PageRange range = new PageRange();
9595
range.addSinglePage(5);
9696
range.addPageSequence(3, 8);
@@ -99,23 +99,23 @@ public void addSingleAndSequence() {
9999
}
100100

101101
@Test
102-
public void addCustomAfter() {
102+
public void addCustomAfterTest() {
103103
PageRange range = new PageRange();
104104
range.addPageRangePart(new PageRange.PageRangePartAfter(3));
105105

106106
Assert.assertEquals(Arrays.asList(3, 4, 5), range.getQualifyingPageNums(5));
107107
}
108108

109109
@Test
110-
public void addCustomEven() {
110+
public void addCustomEvenTest() {
111111
PageRange range = new PageRange();
112112
range.addPageRangePart(PageRange.PageRangePartOddEven.EVEN);
113113

114114
Assert.assertEquals(Arrays.asList(2, 4), range.getQualifyingPageNums(5));
115115
}
116116

117117
@Test
118-
public void addCustomAnd() {
118+
public void addCustomAndTest() {
119119
PageRange range = new PageRange();
120120
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
121121
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
@@ -126,70 +126,102 @@ public void addCustomAnd() {
126126
}
127127

128128
@Test
129-
public void addSingleConstructor() {
129+
public void addSingleConstructorTest() {
130130
PageRange range = new PageRange("5");
131131

132132
Assert.assertEquals(Arrays.asList(5), range.getQualifyingPageNums(7));
133133
}
134134

135135
@Test
136-
public void addSinglesConstructor() {
136+
public void addSinglesConstructorTest() {
137137
PageRange range = new PageRange("5, 1");
138138

139139
Assert.assertEquals(Arrays.asList(5, 1), range.getQualifyingPageNums(10));
140140
}
141141

142142
@Test
143-
public void addSequenceConstructor() {
143+
public void addSinglesConstructorWithNegativeNumbersTest() {
144+
PageRange range = new PageRange("-5, -1");
145+
146+
Assert.assertNotEquals(Arrays.asList(5, 1), range.getQualifyingPageNums(10));
147+
}
148+
149+
@Test
150+
public void addSinglesConstructorWithWhitespacesTest() {
151+
PageRange range = new PageRange(" 5 , 1 ");
152+
153+
Assert.assertEquals(Arrays.asList(5, 1), range.getQualifyingPageNums(10));
154+
}
155+
156+
@Test
157+
public void addSinglesConstructorWithLetterTest() {
158+
PageRange range = new PageRange("5, A, 1");
159+
160+
Assert.assertEquals(Arrays.asList(5, 1), range.getQualifyingPageNums(10));
161+
}
162+
163+
@Test
164+
public void addSequenceConstructorTest() {
144165
PageRange range = new PageRange("11-19");
145166

146167
Assert.assertEquals(Arrays.asList(11, 12, 13, 14, 15, 16), range.getQualifyingPageNums(16));
147168
}
148169

149170
@Test
150-
public void addSequenceAndSingleConstructor() {
171+
public void addSequenceConstructorWithWhitespacesTest() {
172+
PageRange range1 = new PageRange(" 11- 19");
173+
PageRange range2 = new PageRange(" 11 -19");
174+
PageRange range3 = new PageRange(" 11 - 19");
175+
176+
Assert.assertEquals(Arrays.asList(11, 12, 13, 14, 15, 16), range1.getQualifyingPageNums(16));
177+
Assert.assertEquals(Arrays.asList(11, 12, 13, 14, 15, 16), range2.getQualifyingPageNums(16));
178+
Assert.assertEquals(Arrays.asList(11, 12, 13, 14, 15, 16), range3.getQualifyingPageNums(16));
179+
}
180+
181+
@Test
182+
public void addSequenceAndSingleConstructorTest() {
151183
PageRange range = new PageRange("22-27,25");
152184

153185
Assert.assertEquals(Arrays.asList(22, 23, 24, 25, 26, 27, 25), range.getQualifyingPageNums(30));
154186
}
155187

156188
@Test
157-
public void addSingleAndSequenceConstructor() {
189+
public void addSingleAndSequenceConstructorTest() {
158190
PageRange range = new PageRange("5, 3-8");
159191

160192
Assert.assertEquals(Arrays.asList(5, 3, 4, 5, 6, 7, 8), range.getQualifyingPageNums(10));
161193
}
162194

163195
@Test
164-
public void addCustomAfterConstructor() {
196+
public void addCustomAfterConstructorTest() {
165197
PageRange range = new PageRange("3-");
166198

167199
Assert.assertEquals(Arrays.asList(3, 4, 5), range.getQualifyingPageNums(5));
168200
}
169201

170202
@Test
171-
public void addCustomEvenConstructor() {
203+
public void addCustomEvenConstructorTest() {
172204
PageRange range = new PageRange("even");
173205

174206
Assert.assertEquals(Arrays.asList(2, 4), range.getQualifyingPageNums(5));
175207
}
176208

177209
@Test
178-
public void addCustomAndConstructor() {
210+
public void addCustomAndConstructorTest() {
179211
PageRange range = new PageRange("odd & 2-14");
180212

181213
Assert.assertEquals(Arrays.asList(3, 5, 7, 9, 11, 13), range.getQualifyingPageNums(15));
182214
}
183215

184216
@Test
185-
public void addIncorrectCustomAndConstructor() {
217+
public void addIncorrectCustomAndConstructorTest() {
186218
PageRange range = new PageRange("&");
187219

188220
Assert.assertEquals(new ArrayList<>(), range.getQualifyingPageNums(0));
189221
}
190222

191223
@Test
192-
public void addIncorrectConstructor() {
224+
public void addIncorrectConstructorTest() {
193225
PageRange range = new PageRange("");
194226

195227
Assert.assertEquals(new ArrayList<>(), range.getQualifyingPageNums(0));
@@ -210,14 +242,30 @@ public void isPageInRangeFalseTest() {
210242
}
211243

212244
@Test
213-
public void pageRangeEqualsNullTest() {
245+
public void addSequenceConstructorWithNegativeNumberTest() {
246+
PageRange range = new PageRange("-3-8");
247+
248+
Assert.assertEquals(new ArrayList<>(), range.getQualifyingPageNums(3));
249+
}
250+
251+
@Test
252+
public void addSequenceConstructorWithLetterTest() {
253+
PageRange range1 = new PageRange("3-F");
254+
PageRange range2 = new PageRange("3-8F");
255+
256+
Assert.assertEquals(new ArrayList<>(), range1.getQualifyingPageNums(3));
257+
Assert.assertEquals(new ArrayList<>(), range2.getQualifyingPageNums(3));
258+
}
259+
260+
@Test
261+
public void checkPageRangeEqualsNullTest() {
214262
PageRange range1 = new PageRange("3-8");
215263

216264
Assert.assertFalse(range1.equals(null));
217265
}
218266

219267
@Test
220-
public void pageRangeEqualsAndHashCodeTest() {
268+
public void checkPageRangeEqualsAndHashCodeTest() {
221269
PageRange range1 = new PageRange("3-8");
222270
PageRange range2 = new PageRange("3-8");
223271

@@ -227,7 +275,7 @@ public void pageRangeEqualsAndHashCodeTest() {
227275
}
228276

229277
@Test
230-
public void pageRangeNotEqualsAndHashCodeTest() {
278+
public void checkPageRangeNotEqualsAndHashCodeTest() {
231279
PageRange range1 = new PageRange("3-8");
232280
PageRange range2 = new PageRange("1-2");
233281

@@ -258,14 +306,14 @@ public void isRangePartSingleInRangeFalseTest() {
258306
}
259307

260308
@Test
261-
public void rangePartSingleEqualsNullTest() {
309+
public void checkRangePartSingleEqualsNullTest() {
262310
PageRange.PageRangePartSingle pageRangePartSingle = new PageRange.PageRangePartSingle(10);
263311

264312
Assert.assertFalse(pageRangePartSingle.equals(null));
265313
}
266314

267315
@Test
268-
public void rangePartSingleEqualsAndHashCodeTest() {
316+
public void checkRangePartSingleEqualsAndHashCodeTest() {
269317
PageRange.PageRangePartSingle pageRangePartSingle1 = new PageRange.PageRangePartSingle(10);
270318
PageRange.PageRangePartSingle pageRangePartSingle2 = new PageRange.PageRangePartSingle(10);
271319

@@ -275,7 +323,7 @@ public void rangePartSingleEqualsAndHashCodeTest() {
275323
}
276324

277325
@Test
278-
public void rangePartSingleNotEqualsAndHashCodeTest() {
326+
public void checkRangePartSingleNotEqualsAndHashCodeTest() {
279327
PageRange.PageRangePartSingle pageRangePartSingle1 = new PageRange.PageRangePartSingle(10);
280328
PageRange.PageRangePartSingle pageRangePartSingle2 = new PageRange.PageRangePartSingle(1);
281329

@@ -285,14 +333,14 @@ public void rangePartSingleNotEqualsAndHashCodeTest() {
285333
}
286334

287335
@Test
288-
public void rangePartSequenceEqualsNullTest() {
336+
public void checkRangePartSequenceEqualsNullTest() {
289337
PageRange.PageRangePartSequence pageRangePartSequence = new PageRange.PageRangePartSequence(1, 2);
290338

291339
Assert.assertFalse(pageRangePartSequence.equals(null));
292340
}
293341

294342
@Test
295-
public void rangePartSequenceEqualsAndHashCodeTest() {
343+
public void checkRangePartSequenceEqualsAndHashCodeTest() {
296344
PageRange.PageRangePartSequence pageRangePartSequence = new PageRange.PageRangePartSequence(1, 2);
297345
PageRange.PageRangePartSequence pageRangePartSequence2 = new PageRange.PageRangePartSequence(1, 2);
298346

@@ -302,7 +350,7 @@ public void rangePartSequenceEqualsAndHashCodeTest() {
302350
}
303351

304352
@Test
305-
public void rangePartSequenceNotEqualsAndHashCodeTest() {
353+
public void checkRangePartSequenceNotEqualsAndHashCodeTest() {
306354
PageRange.PageRangePartSequence pageRangePartSequence = new PageRange.PageRangePartSequence(1, 2);
307355
PageRange.PageRangePartSequence pageRangePartSequence2 = new PageRange.PageRangePartSequence(3, 4);
308356

@@ -326,14 +374,14 @@ public void isRangePartAfterInRangeFalseTest() {
326374
}
327375

328376
@Test
329-
public void rangePartAfterEqualsNullTest() {
377+
public void checkRangePartAfterEqualsNullTest() {
330378
PageRange.PageRangePartAfter pageRangePartAfter = new PageRange.PageRangePartAfter(10);
331379

332380
Assert.assertFalse(pageRangePartAfter.equals(null));
333381
}
334382

335383
@Test
336-
public void rangePartAfterEqualsAndHashCodeTest() {
384+
public void checkRangePartAfterEqualsAndHashCodeTest() {
337385
PageRange.PageRangePartAfter pageRangePartAfter = new PageRange.PageRangePartAfter(10);
338386
PageRange.PageRangePartAfter pageRangePartAfter2 = new PageRange.PageRangePartAfter(10);
339387

@@ -343,7 +391,7 @@ public void rangePartAfterEqualsAndHashCodeTest() {
343391
}
344392

345393
@Test
346-
public void rangePartAfterNotEqualsAndHashCodeTest() {
394+
public void checkRangePartAfterNotEqualsAndHashCodeTest() {
347395
PageRange.PageRangePartAfter pageRangePartAfter = new PageRange.PageRangePartAfter(10);
348396
PageRange.PageRangePartAfter pageRangePartAfter2 = new PageRange.PageRangePartAfter(1);
349397

@@ -365,13 +413,13 @@ public void isRangePartOddEvenInRangeFalseTest() {
365413
}
366414

367415
@Test
368-
public void rangePartOddEvenEqualsNullTest() {
416+
public void checkRangePartOddEvenEqualsNullTest() {
369417
Assert.assertFalse(PageRange.PageRangePartOddEven.EVEN.equals(null));
370418
Assert.assertFalse(PageRange.PageRangePartOddEven.ODD.equals(null));
371419
}
372420

373421
@Test
374-
public void rangePartOddEvenEqualsAndHashCodeTest() {
422+
public void checkRangePartOddEvenEqualsAndHashCodeTest() {
375423
Assert.assertTrue(PageRange.PageRangePartOddEven.EVEN.equals(PageRange.PageRangePartOddEven.EVEN));
376424
Assert.assertTrue(PageRange.PageRangePartOddEven.ODD.equals(PageRange.PageRangePartOddEven.ODD));
377425

@@ -382,7 +430,7 @@ public void rangePartOddEvenEqualsAndHashCodeTest() {
382430
}
383431

384432
@Test
385-
public void rangePartOddEvenNotEqualsAndHashCodeTest() {
433+
public void checkRangePartOddEvenNotEqualsAndHashCodeTest() {
386434
Assert.assertFalse(PageRange.PageRangePartOddEven.EVEN.equals(PageRange.PageRangePartOddEven.ODD));
387435

388436
Assert.assertNotEquals(PageRange.PageRangePartOddEven.EVEN.hashCode(),
@@ -408,7 +456,7 @@ public void isRangePartAndInRangeFalseTest() {
408456
}
409457

410458
@Test
411-
public void rangePartAndEqualsNullTest() {
459+
public void checkRangePartAndEqualsNullTest() {
412460
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
413461
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
414462
PageRange.PageRangePartAnd pageRangePartAnd = new PageRange.PageRangePartAnd(odd, seq);
@@ -417,7 +465,7 @@ public void rangePartAndEqualsNullTest() {
417465
}
418466

419467
@Test
420-
public void rangePartAndEqualsAndHashCodeTest() {
468+
public void checkRangePartAndEqualsAndHashCodeTest() {
421469
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
422470
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
423471
PageRange.PageRangePartAnd pageRangePartAnd = new PageRange.PageRangePartAnd(odd, seq);
@@ -429,7 +477,7 @@ public void rangePartAndEqualsAndHashCodeTest() {
429477
}
430478

431479
@Test
432-
public void rangePartAndNotEqualsAndHashCodeTest() {
480+
public void checkRangePartAndNotEqualsAndHashCodeTest() {
433481
PageRange.IPageRangePart odd = PageRange.PageRangePartOddEven.ODD;
434482
PageRange.IPageRangePart seq = new PageRange.PageRangePartSequence(2, 14);
435483
PageRange.PageRangePartAnd pageRangePartAnd = new PageRange.PageRangePartAnd(odd, seq);

‎styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/css/CssRuleSet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ This file is part of the iText (R) project.
5757
public class CssRuleSet extends CssStatement {
5858

5959
/** Pattern to match "important" in a rule declaration. */
60-
private static final Pattern importantMatcher = Pattern.compile(".*!\\s*important$");
60+
private static final Pattern IMPORTANT_MATCHER = Pattern.compile(".*!\\s*important$");
6161

6262
/** The CSS selector. */
6363
private ICssSelector selector;
@@ -163,7 +163,7 @@ public List<CssDeclaration> getImportantDeclarations() {
163163
private static void splitDeclarationsIntoNormalAndImportant(List<CssDeclaration> declarations, List<CssDeclaration> normalDeclarations, List<CssDeclaration> importantDeclarations) {
164164
for (CssDeclaration declaration : declarations) {
165165
int exclIndex = declaration.getExpression().indexOf('!');
166-
if (exclIndex > 0 && importantMatcher.matcher(declaration.getExpression()).matches()) {
166+
if (exclIndex > 0 && IMPORTANT_MATCHER.matcher(declaration.getExpression()).matches()) {
167167
importantDeclarations.add(new CssDeclaration(declaration.getProperty(), declaration.getExpression().substring(0, exclIndex).trim()));
168168
} else {
169169
normalDeclarations.add(declaration);

0 commit comments

Comments
 (0)