Make some of the layout tests tagged, update cmps

DEVSIX-1652

Author: yulian-gaponenko

layout/src/test/java/com/itextpdf/layout/AreaBreakTest.java

@@ -110,6 +110,7 @@ public void pageBreakTest03() throws IOException, InterruptedException {
         String outFileName = destinationFolder + "pageBreak3.pdf";
         String cmpFileName = sourceFolder + "cmp_pageBreak3.pdf";
         PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
+        pdfDocument.setTagged();
 
         Document document = new Document(pdfDocument);
         document.setRenderer(new ColumnDocumentRenderer(document, new Rectangle[] {new Rectangle(30, 30, 200, 600), new Rectangle(300, 30, 200, 600)}));
@@ -230,6 +231,8 @@ public void areaBreakInsideDiv03Test() throws IOException, InterruptedException
         String cmpFileName = sourceFolder + "cmp_areaBreakInsideDiv03.pdf";
         PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
 
+        pdfDocument.setTagged();
+
         Document document = new Document(pdfDocument);
         Div div = new Div().add(new Paragraph("Hello")).add(new AreaBreak()).add(new Paragraph("World"));
         div.setNextRenderer(new DivRendererWithAreas(div));

layout/src/test/java/com/itextpdf/layout/DefaultLayoutTest.java

@@ -79,6 +79,7 @@ public void multipleAdditionsOfSameModelElementTest() throws IOException, Interr
         String outFileName = destinationFolder + "multipleAdditionsOfSameModelElementTest1.pdf";
         String cmpFileName = sourceFolder + "cmp_multipleAdditionsOfSameModelElementTest1.pdf";
         PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
+        pdfDocument.setTagged();
 
         Document document = new Document(pdfDocument);
 
@@ -172,7 +173,7 @@ public void textWithWhitespacesTest01() throws IOException, InterruptedException
 
     @Test
     @LogMessages(messages = {
-            @LogMessage(count = 2, messageTemplate = LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)
+            @LogMessage(count = 1, messageTemplate = LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)
     })
     public void addParagraphOnShortPage1() throws IOException, InterruptedException {
         String outFileName = destinationFolder + "addParagraphOnShortPage1.pdf";

layout/src/test/java/com/itextpdf/layout/FloatTest.java

@@ -317,7 +317,7 @@ public void inlineFloatingImageToNextPage() throws IOException, InterruptedExcep
         String outFile = destinationFolder + "inlineFloatingImageToNextPage.pdf";
         String imageSrc = sourceFolder + "itis.jpg";
 
-        Document document = new Document(new PdfDocument(new PdfWriter(outFile)));
+        Document document = new Document(new PdfDocument(new PdfWriter(outFile)).setTagged());
 
         Image img1 = new Image(ImageDataFactory.create(imageSrc)).scaleToFit(100, 100);
         Image img2 = new Image(ImageDataFactory.create(imageSrc)).scaleAbsolute(100, 500);
@@ -446,10 +446,11 @@ public void floatsOnCanvas() throws IOException, InterruptedException {
         String cmpFileName = sourceFolder + "cmp_floatsOnCanvas.pdf";
         String outFile = destinationFolder + "floatsOnCanvas.pdf";
 
-        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFile));
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFile)).setTagged();
         PdfPage page = pdfDoc.addNewPage();
         PdfCanvas pdfCanvas = new PdfCanvas(page);
         Canvas canvas = new Canvas(pdfCanvas, pdfDoc, page.getPageSize().applyMargins(36, 36, 36, 36, false));
+        canvas.enableAutoTagging(page);
 
         Div div = new Div().setBackgroundColor(ColorConstants.RED);
         Div fDiv = new Div().setBackgroundColor(ColorConstants.BLUE).setWidth(200).setHeight(200);
@@ -485,7 +486,7 @@ public void floatFixedHeightContentNotFit() throws IOException, InterruptedExcep
         String cmpFileName = sourceFolder + "cmp_floatFixedHeightContentNotFit.pdf";
         String outFile = destinationFolder + "floatFixedHeightContentNotFit.pdf";
 
-        Document document = new Document(new PdfDocument(new PdfWriter(outFile)));
+        Document document = new Document(new PdfDocument(new PdfWriter(outFile)).setTagged());
 
         Div div = new Div().setBorder(new SolidBorder(ColorConstants.RED, 2));
         div.add(new Paragraph("Floating div.")).add(new Paragraph(text));
@@ -543,7 +544,7 @@ public void clearanceApplyingPageSplit02() throws IOException, InterruptedExcept
         String cmpFileName = sourceFolder + "cmp_clearanceApplyingPageSplit02.pdf";
         String outFile = destinationFolder + "clearanceApplyingPageSplit02.pdf";
 
-        Document document = new Document(new PdfDocument(new PdfWriter(outFile)));
+        Document document = new Document(new PdfDocument(new PdfWriter(outFile)).setTagged());
 
         document.add(new Paragraph(text + text));
 
@@ -571,7 +572,7 @@ public void clearanceApplyingPageSplit03() throws IOException, InterruptedExcept
         String cmpFileName = sourceFolder + "cmp_clearanceApplyingPageSplit03.pdf";
         String outFile = destinationFolder + "clearanceApplyingPageSplit03.pdf";
 
-        Document document = new Document(new PdfDocument(new PdfWriter(outFile)));
+        Document document = new Document(new PdfDocument(new PdfWriter(outFile)).setTagged());
 
         document.add(new Paragraph(text + text));
 

layout/src/test/java/com/itextpdf/layout/ListTest.java

@@ -236,7 +236,7 @@ public void addListOnShortPage2() throws IOException, InterruptedException {
         String outFileName = destinationFolder + "addListOnShortPage2.pdf";
         String cmpFileName = sourceFolder + "cmp_addListOnShortPage2.pdf";
 
-        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName)).setTagged();
         Document doc = new Document(pdfDoc, new PageSize(500, 130));
         List list = new List(ListNumberingType.DECIMAL);
 
@@ -363,7 +363,7 @@ public void listOverflowTest03() throws IOException, InterruptedException {
     public void listEmptyItemTest01() throws IOException, InterruptedException {
         String outFileName = destinationFolder + "listEmptyItemTest01.pdf";
         String cmpFileName = sourceFolder + "cmp_listEmptyItemTest01.pdf";
-        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
+        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName)).setTagged();
 
         Document document = new Document(pdfDocument);
 

layout/src/test/java/com/itextpdf/layout/PreLayoutTest.java

@@ -82,7 +82,7 @@ public static void beforeClass() {
     public void preLayoutTest01() throws IOException, InterruptedException {
         String outFileName = destinationFolder + "preLayoutTest01.pdf";
         String cmpFileName = sourceFolder + "cmp_preLayoutTest01.pdf";
-        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
+        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName)).setTagged();
 
         Document document = new Document(pdfDocument, PageSize.Default, false);
 
@@ -162,7 +162,7 @@ public void preLayoutTest02() throws IOException, InterruptedException {
     public void columnDocumentRendererRelayoutTest() throws IOException, InterruptedException {
         String outFileName = destinationFolder + "columnDocumentRendererRelayoutTest.pdf";
         String cmpFileName = sourceFolder + "cmp_columnDocumentRendererRelayoutTest.pdf";
-        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName)).setTagged();
 
         Document document = new Document(pdfDoc, PageSize.Default, false);
         Rectangle column1 = new Rectangle(40, 40, 200, 720);

layout/src/test/java/com/itextpdf/layout/TabsTest.java

@@ -219,7 +219,7 @@ public void anchorTabStopsTest02() throws IOException, InterruptedException {
         String outFileName = destinationFolder + fileName;
         String cmpFileName = sourceFolder + "cmp_" + fileName;
 
-        Document doc = initDocument(outFileName);
+        Document doc = initDocument(outFileName, true);
 
         float tabInterval = doc.getPdfDocument().getDefaultPageSize().getWidth() / 2;
 
@@ -398,7 +398,13 @@ public void tabsInParagraphTest01() throws IOException, InterruptedException {
     }
 
     private Document initDocument(String outFileName) throws FileNotFoundException {
+        return initDocument(outFileName, false);
+    }
+    private Document initDocument(String outFileName, boolean tagged) throws FileNotFoundException {
         PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));
+        if (tagged) {
+            pdfDoc.setTagged();
+        }
         pdfDoc.setDefaultPageSize(PageSize.A4.rotate());
         return new Document(pdfDoc);
     }
@@ -435,7 +441,9 @@ private void addTabbedTextToParagraph(Paragraph p, String text, float[] position
         for (String line : text.split("\n")) {
             for (String chunk : line.split("\t")) {
                 for (String piece : chunk.split("#")) {
-                    p.add(piece);
+                    if (!piece.isEmpty()) {
+                        p.add(piece);
+                    }
                 }
                 p.add(new Tab());
             }