Skip to content

Commit 8f794fa

Browse files
Kate IvanovaiText-CI
Kate Ivanova
authored and
iText-CI
committed
Change structural comparison instead of visual.
DEVSIX-2903
1 parent 26bed2b commit 8f794fa

File tree

255 files changed

+470
-461
lines changed

Some content is hidden

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

255 files changed

+470
-461
lines changed

‎svg/src/test/java/com/itextpdf/svg/converter/SvgConverterIntegrationTest.java

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void basicIntegrationTest() throws IOException, InterruptedException {
145145

146146
new PdfCanvas(doc.getPage(1)).addXObject(form, new Rectangle(100, 100, 100, 100));
147147
doc.close();
148-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_"));
148+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff_"));
149149
}
150150

151151
@Test
@@ -170,7 +170,7 @@ public void nonExistingTagIntegrationTest() {
170170
@LogMessage(messageTemplate = SvgLogMessageConstant.UNMAPPEDTAG, count = 32),
171171
})
172172
public void convertFileWithAllIgnoredTags() throws IOException, InterruptedException {
173-
convertAndCompareSinglePageVisually(sourceFolder, destinationFolder, "ignored_tags");
173+
convertAndCompareSinglePage(sourceFolder, destinationFolder, "ignored_tags");
174174
}
175175

176176
/**
@@ -179,7 +179,7 @@ public void convertFileWithAllIgnoredTags() throws IOException, InterruptedExcep
179179
*/
180180
@Test
181181
public void convertChartWithSomeIgnoredTags() throws IOException, InterruptedException {
182-
convertAndCompareSinglePageVisually(sourceFolder, destinationFolder, "chart_snippet");
182+
convertAndCompareSinglePage(sourceFolder, destinationFolder, "chart_snippet");
183183
}
184184

185185
@Test
@@ -267,7 +267,7 @@ public void addToExistingDoc() throws IOException, InterruptedException {
267267

268268
@Test
269269
public void singlePageHelloWorldTest() throws IOException, InterruptedException {
270-
convertAndCompareSinglePageVisually(sourceFolder, destinationFolder, "hello_world");
270+
convertAndCompareSinglePage(sourceFolder, destinationFolder, "hello_world");
271271
}
272272

273273
@Test
@@ -276,7 +276,7 @@ public void twoArgTest() throws IOException, InterruptedException {
276276
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
277277
FileOutputStream fos = new FileOutputStream(destinationFolder + name + ".pdf");
278278
SvgConverter.createPdf(fis, fos);
279-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + name + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_"));
279+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + name + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_"));
280280
}
281281

282282
@Test
@@ -288,7 +288,7 @@ public void drawOnSpecifiedPositionX() throws IOException, InterruptedException
288288
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
289289
drawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
290290

291-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
291+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
292292
}
293293

294294
@Test
@@ -300,7 +300,7 @@ public void drawOnSpecifiedPositionY() throws IOException, InterruptedException
300300
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
301301
drawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
302302

303-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
303+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
304304
}
305305

306306
@Test
@@ -312,7 +312,7 @@ public void drawOnSpecifiedPositionXY() throws IOException, InterruptedException
312312
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
313313
drawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
314314

315-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
315+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
316316

317317
}
318318

@@ -325,7 +325,7 @@ public void drawOnSpecifiedPositionNegativeX() throws IOException, InterruptedEx
325325
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
326326
drawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
327327

328-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
328+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
329329
}
330330

331331
@Test
@@ -337,7 +337,7 @@ public void drawOnSpecifiedPositionNegativeY() throws IOException, InterruptedEx
337337
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
338338
drawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
339339

340-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
340+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
341341

342342
}
343343

@@ -350,7 +350,7 @@ public void drawOnSpecifiedPositionNegativeXY() throws IOException, InterruptedE
350350
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
351351
drawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
352352

353-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
353+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
354354

355355
}
356356

@@ -363,7 +363,7 @@ public void drawOnSpecifiedPositionPartialOnPage() throws IOException, Interrupt
363363
FileInputStream fis = new FileInputStream(sourceFolder + name + ".svg");
364364
drawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
365365

366-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
366+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
367367

368368
}
369369

@@ -384,7 +384,7 @@ public void convertToXObjectStringPdfDocumentConverterProps() throws IOException
384384

385385
doc.close();
386386

387-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
387+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
388388
}
389389

390390
@Test
@@ -404,7 +404,7 @@ public void convertToXObjectStreamPdfDocumentConverterProps() throws IOException
404404

405405
doc.close();
406406

407-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
407+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
408408
}
409409

410410
@Test
@@ -419,7 +419,7 @@ public void convertToImageStreamDocument() throws IOException, InterruptedExcept
419419
Document doc = new Document(pdfDocument);
420420
doc.add(image);
421421
doc.close();
422-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_"));
422+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_"));
423423
}
424424

425425
@Test
@@ -436,7 +436,7 @@ public void convertToImageStreamDocumentConverterProperties() throws IOException
436436
Document doc = new Document(pdfDocument);
437437
doc.add(image);
438438
doc.close();
439-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_"));
439+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_"));
440440
}
441441

442442

@@ -452,7 +452,7 @@ public void drawOnPageStringPage() throws IOException, InterruptedException {
452452

453453
doc.close();
454454

455-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
455+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
456456
}
457457

458458
@Test
@@ -469,7 +469,7 @@ public void drawOnPageStringPageConverterProps() throws IOException, Interrupted
469469

470470
doc.close();
471471

472-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
472+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
473473
}
474474

475475
@Test
@@ -484,7 +484,7 @@ public void drawOnPageStreamPage() throws IOException, InterruptedException {
484484

485485
doc.close();
486486

487-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
487+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
488488
}
489489

490490
@Test
@@ -501,7 +501,7 @@ public void drawOnPageStreamPageConverterProperties() throws IOException, Interr
501501

502502
doc.close();
503503

504-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
504+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
505505
}
506506

507507
@Test
@@ -515,7 +515,7 @@ public void drawOnDocumentStringPdfDocumentInt() throws IOException, Interrupted
515515

516516
doc.close();
517517

518-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
518+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
519519
}
520520

521521
@Test
@@ -532,7 +532,7 @@ public void drawOnDocumentStringPdfDocumentIntConverterProperties() throws IOExc
532532

533533
doc.close();
534534

535-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
535+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
536536
}
537537

538538
@Test
@@ -548,7 +548,7 @@ public void drawOnDocumentStreamPdfDocumentIntConverterProperties() throws IOExc
548548

549549
doc.close();
550550

551-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
551+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
552552
}
553553

554554
@Test
@@ -562,7 +562,7 @@ public void drawOnCanvasStringPdfCanvasConverter() throws IOException, Interrupt
562562

563563
doc.close();
564564

565-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
565+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
566566

567567
}
568568

@@ -579,7 +579,7 @@ public void drawOnCanvasStringPdfCanvasConverterProps() throws IOException, Inte
579579

580580
doc.close();
581581

582-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
582+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
583583
}
584584

585585
@Test
@@ -594,7 +594,7 @@ public void drawOnCanvasStreamPdfCanvas() throws IOException, InterruptedExcepti
594594

595595
doc.close();
596596

597-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
597+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
598598
}
599599

600600
@Test
@@ -611,7 +611,7 @@ public void drawOnCanvasStreamPdfCanvasConverterProps() throws IOException, Inte
611611

612612
doc.close();
613613

614-
Assert.assertNull(new CompareTool().compareVisually(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
614+
Assert.assertNull(new CompareTool().compareByContent(destinationFolder + destName + ".pdf", sourceFolder + "cmp_" + destName + ".pdf", destinationFolder, "diff_"));
615615
}
616616

617617
private static void drawOnSpecifiedPositionDocument(InputStream svg, String dest, int x, int y) throws IOException {

‎svg/src/test/java/com/itextpdf/svg/css/DefaultStyleInheritanceIntegrationTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@ public static void beforeClass() {
6565
//Css inheritance
6666
@Test
6767
public void simpleGroupInheritanceTest() throws IOException, InterruptedException {
68-
convertAndCompareVisually(sourceFolder,destinationFolder,"simpleGroupInheritance");
68+
convertAndCompare(sourceFolder,destinationFolder,"simpleGroupInheritance");
6969
}
7070
//Inheritance in use tags
7171
@Test
7272
public void useFillInheritanceTest() throws IOException, InterruptedException {
73-
convertAndCompareVisually(sourceFolder,destinationFolder,"useFillInheritance");
73+
convertAndCompare(sourceFolder,destinationFolder,"useFillInheritance");
7474
}
7575
//Inheritance and g-tags
7676
@Test
7777
public void groupInheritanceTest() throws IOException, InterruptedException {
78-
convertAndCompareVisually(sourceFolder,destinationFolder,"groupInheritance");
78+
convertAndCompare(sourceFolder,destinationFolder,"groupInheritance");
7979
}
8080

8181
@Test
8282
public void useInheritanceNotOverridingTest() throws IOException, InterruptedException {
83-
convertAndCompareVisually(sourceFolder,destinationFolder,"useInheritanceNotOverriding");
83+
convertAndCompare(sourceFolder,destinationFolder,"useInheritanceNotOverriding");
8484
}
8585

8686
}

‎svg/src/test/java/com/itextpdf/svg/css/SvgStyleResolverIntegrationTest.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@ This file is part of the iText (R) project.
4343
package com.itextpdf.svg.css;
4444

4545

46-
import com.itextpdf.kernel.geom.PageSize;
4746
import com.itextpdf.styledxmlparser.node.IDocumentNode;
4847
import com.itextpdf.styledxmlparser.node.impl.jsoup.JsoupXmlParser;
4948
import com.itextpdf.svg.processors.impl.DefaultSvgProcessor;
50-
import com.itextpdf.svg.processors.impl.SvgConverterProperties;
5149
import com.itextpdf.svg.renderers.IBranchSvgNodeRenderer;
5250
import com.itextpdf.svg.renderers.ISvgNodeRenderer;
5351
import com.itextpdf.svg.renderers.SvgIntegrationTest;
@@ -193,53 +191,53 @@ public void stylesOfSvgTagProcessingTest() {
193191
@Test
194192
//TODO DEVSIX-2058
195193
public void fontResolverIntegrationTest() throws com.itextpdf.io.IOException, InterruptedException, java.io.IOException {
196-
convertAndCompareVisually(sourceFolder, destinationFolder, "fontssvg");
194+
convertAndCompare(sourceFolder, destinationFolder, "fontssvg");
197195
}
198196

199197
@Test
200198
public void validLocalFontTest() throws com.itextpdf.io.IOException, InterruptedException, java.io.IOException {
201-
convertAndCompareVisually(sourceFolder, destinationFolder, "validLocalFontTest");
199+
convertAndCompare(sourceFolder, destinationFolder, "validLocalFontTest");
202200
}
203201

204202
@Test
205203
public void fontWeightTest() throws com.itextpdf.io.IOException, InterruptedException, java.io.IOException {
206-
convertAndCompareVisually(sourceFolder, destinationFolder, "fontWeightTest");
204+
convertAndCompare(sourceFolder, destinationFolder, "fontWeightTest");
207205
}
208206

209207
@Test
210208
//TODO DEVSIX-2264: that test shall fail after the fix.
211209
public void googleFontsTest() throws com.itextpdf.io.IOException, InterruptedException, java.io.IOException {
212-
convertAndCompareVisually(sourceFolder, destinationFolder, "googleFontsTest");
210+
convertAndCompare(sourceFolder, destinationFolder, "googleFontsTest");
213211
}
214212

215213
@Test
216214
// TODO: update cmp files when DEVSIX-2286 resolved
217215
public void svgWithExternalCSStoSingleDefaultPage() throws IOException,InterruptedException {
218-
convertAndCompareVisually(sourceFolder, destinationFolder, "externalCss");
216+
convertAndCompare(sourceFolder, destinationFolder, "externalCss");
219217
}
220218

221219
@Test
222220
// TODO: update cmp files when DEVSIX-2286 resolved
223221
public void svgWithInternalCSStoSingleDefaultPage() throws IOException,InterruptedException {
224-
convertAndCompareVisually(sourceFolder, destinationFolder, "internalCss");
222+
convertAndCompare(sourceFolder, destinationFolder, "internalCss");
225223
}
226224

227225
@Test
228226
// TODO: update cmp files when DEVSIX-2286 resolved
229227
public void svgWithExternalCSStoCustomPage() throws IOException,InterruptedException {
230228
// Take a note this method differs from the one used in Default Page test
231-
convertAndCompareVisually(sourceFolder, destinationFolder, "internalCss");
229+
convertAndCompare(sourceFolder, destinationFolder, "internalCss");
232230
}
233231

234232
@Test
235233
// TODO: update cmp files when DEVSIX-2286 resolved
236234
public void svgWithInternalCSStoCustomPage() throws IOException,InterruptedException {
237-
convertAndCompareVisually(sourceFolder, destinationFolder, "internalCss_custom");
235+
convertAndCompare(sourceFolder, destinationFolder, "internalCss_custom");
238236
}
239237

240238
@Test
241239
// TODO: update cmp files when DEVSIX-2286 resolved
242240
public void multipleSVGtagsWithDiffStylesFromExternalCSS() throws IOException,InterruptedException {
243-
convertAndCompareVisually(sourceFolder, destinationFolder, "externalCss_palette");
241+
convertAndCompare(sourceFolder, destinationFolder, "externalCss_palette");
244242
}
245243
}

0 commit comments

Comments
 (0)