Skip to content

Commit 3301bc3

Browse files
vitali-prvitali-pr
committed
Get rid of UAVeraPdfValidator
1 parent 4a450b0 commit 3301bc3

File tree

5 files changed

+25
-72
lines changed

5 files changed

+25
-72
lines changed

‎pdftest/src/main/java/com/itextpdf/test/pdfa/UAVeraPdfValidator.java‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎pdfua/src/test/java/com/itextpdf/pdfua/PdfUACanvasTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This file is part of the iText (R) project.
4646
import com.itextpdf.pdfua.exceptions.PdfUAExceptionMessageConstants;
4747
import com.itextpdf.test.ExtendedITextTest;
4848
import com.itextpdf.test.annotations.type.UnitTest;
49-
import com.itextpdf.test.pdfa.UAVeraPdfValidator;
49+
import com.itextpdf.test.pdfa.VeraPdfValidator; // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
5050

5151
import java.io.ByteArrayOutputStream;
5252
import java.io.IOException;
@@ -114,7 +114,7 @@ public void checkPoint_01_005_TextContentIsCorrectlyTaggedAsContent() throws IOE
114114
DESTINATION_FOLDER,
115115
"diff_")
116116
);
117-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
117+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
118118
}
119119

120120
@Test
@@ -165,7 +165,7 @@ public void checkPoint_01_005_TextArtifactIsNotInTagTree() throws IOException, I
165165
Assert.assertNull(new CompareTool().compareByContent(outPdf,
166166
SOURCE_FOLDER + "cmp_01_005_TextArtifactIsNotInTagTree.pdf",
167167
DESTINATION_FOLDER, "diff_"));
168-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
168+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
169169
}
170170

171171
@Test
@@ -236,7 +236,7 @@ public void checkPoint_01_005_TextGlyphLineContentIsArtifact() throws IOExceptio
236236
Assert.assertNull(new CompareTool().compareByContent(outPdf,
237237
SOURCE_FOLDER + "cmp_01_005_TextGlyphLineContentIsArtifact.pdf",
238238
DESTINATION_FOLDER, "diff_"));
239-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
239+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
240240
}
241241

242242
@Test
@@ -267,7 +267,7 @@ public void checkPoint_01_005_TextGlyphLineContentIsContentCorrect() throws IOEx
267267
Assert.assertNull(new CompareTool().compareByContent(outPdf,
268268
SOURCE_FOLDER + "cmp_01_005_TextGlyphLineContentIsContentCorrect.pdf",
269269
DESTINATION_FOLDER, "diff_"));
270-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
270+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
271271
}
272272

273273
@Test
@@ -295,7 +295,7 @@ public void checkPoint_01_005_allowPureBmcInArtifact() throws IOException, Inter
295295
Assert.assertNull(new CompareTool().compareByContent(outPdf,
296296
SOURCE_FOLDER + "cmp_01_005_allowPureBmcInArtifact.pdf",
297297
DESTINATION_FOLDER, "diff_"));
298-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
298+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
299299
}
300300

301301
@Test
@@ -325,7 +325,7 @@ public void checkPoint_01_005_allowNestedPureBmcInArtifact() throws IOException,
325325
Assert.assertNull(new CompareTool().compareByContent(outPdf,
326326
SOURCE_FOLDER + "cmp_01_005_allowNestedPureBmcInArtifact.pdf",
327327
DESTINATION_FOLDER, "diff_"));
328-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
328+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
329329
}
330330

331331
@Test
@@ -383,7 +383,7 @@ public void checkPoint_01_005_LineContentThatIsMarkedAsArtifact() throws IOExcep
383383
Assert.assertNull(new CompareTool().compareByContent(outPdf,
384384
SOURCE_FOLDER + "cmp_01_005_LineContentThatIsMarkedAsArtifact.pdf",
385385
DESTINATION_FOLDER, "diff_"));
386-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
386+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
387387
}
388388

389389
@Test
@@ -421,7 +421,7 @@ public void checkPoint_01_005_RectangleMarkedArtifact() throws IOException, Inte
421421
Assert.assertNull(new CompareTool().compareByContent(outPdf,
422422
SOURCE_FOLDER + "cmp_01_005_RectangleMarkedArtifact.pdf",
423423
DESTINATION_FOLDER, "diff_"));
424-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
424+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
425425
}
426426

427427
@Test
@@ -466,7 +466,7 @@ public void checkPoint_01_005_RectangleMarkedContent() throws IOException, Inter
466466
Assert.assertNull(new CompareTool().compareByContent(outPdf,
467467
SOURCE_FOLDER + "cmp_01_005_RectangleMarkedContent.pdf",
468468
DESTINATION_FOLDER, "diff_"));
469-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
469+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
470470
}
471471

472472
@Test
@@ -492,7 +492,7 @@ public void checkPoint_01_004_bezierMarkedAsContent() throws IOException, Interr
492492
.restoreState();
493493

494494
pdfDoc.close();
495-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
495+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
496496
Assert.assertNull(new CompareTool().compareByContent(outPdf,
497497
SOURCE_FOLDER + "cmp_01_004_bezierCurveShouldBeTagged.pdf",
498498
DESTINATION_FOLDER, "diff_"));
@@ -517,7 +517,7 @@ public void checkPoint_01_004_bezierMarkedAsArtifact() throws IOException, Inter
517517
.restoreState();
518518

519519
pdfDoc.close();
520-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
520+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
521521
Assert.assertNull(new CompareTool().compareByContent(outPdf,
522522
SOURCE_FOLDER + "cmp_01_004_bezierMarkedAsArtifact.pdf",
523523
DESTINATION_FOLDER, "diff_"));
@@ -562,7 +562,7 @@ public void checkPoint_01_005_RandomOperationsWithoutActuallyAddingContent()
562562
Assert.assertNull(new CompareTool().compareByContent(outPdf,
563563
SOURCE_FOLDER + "cmp_01_005_RandomOperationsWithoutActuallyAddingContent.pdf",
564564
DESTINATION_FOLDER, "diff_"));
565-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
565+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
566566
}
567567

568568
@Test
@@ -628,7 +628,7 @@ public void checkPoint_validRoleAddedInsideMarkedContent() throws IOException, I
628628
SOURCE_FOLDER + "cmp_validRoleAddedInsideMarkedContent.pdf",
629629
DESTINATION_FOLDER, "diff_")
630630
);
631-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
631+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
632632
}
633633

634634
@Test
@@ -666,7 +666,7 @@ public void checkPoint_validRoleAddedInsideMarkedContentMultiple() throws IOExce
666666
.closeTag();
667667
pdfDoc.close();
668668

669-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
669+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
670670
Assert.assertNull(new CompareTool().compareByContent(outPdf,
671671
SOURCE_FOLDER + "cmp_validRoleAddedInsideMarkedContentMultiple.pdf",
672672
DESTINATION_FOLDER, "diff_")
@@ -711,7 +711,7 @@ public void checkPoint_validRoleAddedInsideMarkedContentMCR_IN_MCR() throws IOEx
711711
.closeTag();
712712
pdfDoc.close();
713713

714-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
714+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
715715
Assert.assertNull(new CompareTool().compareByContent(outPdf,
716716
SOURCE_FOLDER + "cmp_validRoleAddedInsideMarkedContentMCR_IN_MCR.pdf",
717717
DESTINATION_FOLDER, "diff_")

‎pdfua/src/test/java/com/itextpdf/pdfua/PdfUALayoutTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This file is part of the iText (R) project.
4242
import com.itextpdf.layout.element.Table;
4343
import com.itextpdf.test.ExtendedITextTest;
4444
import com.itextpdf.test.annotations.type.IntegrationTest;
45-
import com.itextpdf.test.pdfa.UAVeraPdfValidator;
45+
import com.itextpdf.test.pdfa.VeraPdfValidator; // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
4646

4747
import java.io.IOException;
4848
import org.junit.Assert;
@@ -76,7 +76,7 @@ public void simpleParagraphTest() throws IOException, InterruptedException {
7676
doc.close();
7777

7878
Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, DESTINATION_FOLDER, "diff_"));
79-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
79+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
8080
}
8181

8282
@Test
@@ -97,7 +97,7 @@ public void simpleBorderTest() throws IOException, InterruptedException {
9797
}
9898

9999
Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, DESTINATION_FOLDER, "diff"));
100-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
100+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
101101
}
102102

103103
@Test
@@ -116,6 +116,6 @@ public void simpleTableTest() throws IOException, InterruptedException {
116116
doc.close();
117117

118118
Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, DESTINATION_FOLDER, "diff_"));
119-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
119+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
120120
}
121121
}

‎pdfua/src/test/java/com/itextpdf/pdfua/PdfUARoleMappingTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ This file is part of the iText (R) project.
5050
import com.itextpdf.test.annotations.LogMessage;
5151
import com.itextpdf.test.annotations.LogMessages;
5252
import com.itextpdf.test.annotations.type.IntegrationTest;
53-
import com.itextpdf.test.pdfa.UAVeraPdfValidator;
53+
import com.itextpdf.test.pdfa.VeraPdfValidator; // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
5454

5555
import java.io.IOException;
5656
import org.junit.Assert;
@@ -196,7 +196,7 @@ public void standardMappingViaTagTreePointer_02_001_Test() throws IOException, I
196196
pdfDoc.close();
197197

198198
Assert.assertNull(new CompareTool().compareByContent(outPdf, cmpPdf, DESTINATION_FOLDER, "diff_"));
199-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
199+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
200200
}
201201

202202
@Test

‎pdfua/src/test/java/com/itextpdf/pdfua/PdfUATest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This file is part of the iText (R) project.
4949
import com.itextpdf.test.AssertUtil;
5050
import com.itextpdf.test.ExtendedITextTest;
5151
import com.itextpdf.test.annotations.type.IntegrationTest;
52-
import com.itextpdf.test.pdfa.UAVeraPdfValidator;
52+
import com.itextpdf.test.pdfa.VeraPdfValidator; // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
5353

5454
import java.io.ByteArrayOutputStream;
5555
import java.io.IOException;
@@ -113,7 +113,7 @@ public void emptyPageDocument() throws IOException, InterruptedException {
113113
}
114114
Assert.assertNull(new CompareTool().compareByContent(outPdf, SOURCE_FOLDER + "cmp_emptyPageDocument.pdf",
115115
DESTINATION_FOLDER, "diff_"));
116-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
116+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
117117
}
118118

119119
@Test
@@ -179,6 +179,6 @@ public void manualPdfUaCreation() throws IOException, InterruptedException {
179179

180180
Assert.assertNull(new CompareTool().compareByContent(outPdf, SOURCE_FOLDER + "cmp_manualPdfUaCreation.pdf",
181181
DESTINATION_FOLDER, "diff_"));
182-
Assert.assertNull(new UAVeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
182+
Assert.assertNull(new VeraPdfValidator().validate(outPdf)); // Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf/ua validation on Android)
183183
}
184184
}

0 commit comments

Comments
 (0)