Fix logging logic for multithreaded testing; fix layout tests to allow parallel execution; avoid parallel verapdf validations

DEVSIX-9032 Autoported commit. Original commit hash: [a8f916922] Manual files: barcodes/src/test/resources/junit-platform.properties commons/src/test/resources/junit-platform.properties forms/src/test/resources/junit-platform.properties io/src/test/resources/junit-platform.properties kernel/src/test/resources/junit-platform.properties layout/src/test/resources/junit-platform.properties pdfa/src/test/resources/junit-platform.properties pdftest/src/main/java/com/itextpdf/test/LogListener.java pdftest/src/main/java/com/itextpdf/test/pdfa/VeraPdfValidator.java pdftest/src/test/resources/junit-platform.properties pdfua/src/test/resources/junit-platform.properties pom.xml sharpenConfiguration.xml sign/src/test/resources/junit-platform.properties styled-xml-parser/src/test/resources/junit-platform.properties svg/src/test/resources/junit-platform.properties
3 months ago · 114ea4e114
6 changed files with 249 additions and 291 deletions
--- a/itext.tests/itext.layout.tests/itext/layout/BorderTest.cs
+++ b/itext.tests/itext.layout.tests/itext/layout/BorderTest.cs
@ -44,18 +44,6 @@ namespace iText.Layout {

        public const String cmpPrefix = "cmp_";

-//\cond DO_NOT_DOCUMENT
-        internal String fileName;
-//\endcond
-
-//\cond DO_NOT_DOCUMENT
-        internal String outFileName;
-//\endcond
-
-//\cond DO_NOT_DOCUMENT
-        internal String cmpFileName;
-//\endcond
-
        [NUnit.Framework.OneTimeSetUp]
        public static void BeforeClass() {
            CreateDestinationFolder(destinationFolder);
@ -63,8 +51,8 @@ namespace iText.Layout {

        [NUnit.Framework.Test]
        public virtual void SimpleBordersTest() {
-            fileName = "simpleBordersTest.pdf";
-            Document doc = CreateDocument();
+            String fileName = "simpleBordersTest.pdf";
+            Document doc = CreateDocument(fileName);
            List list = new List();
            ListItem solidBorderItem = new ListItem("solid");
            solidBorderItem.SetBorder(new SolidBorder(ColorConstants.RED, 6)).SetMarginBottom(5);
@ -87,7 +75,7 @@ namespace iText.Layout {
            roundDotsBorderItem.SetBorderLeft(new RoundDotsBorder(ColorConstants.BLUE, 5));
            list.Add(roundDotsBorderItem);
            doc.Add(list);
-            CloseDocumentAndCompareOutputs(doc);
+            CloseDocumentAndCompareOutputs(doc, fileName);
        }

        [NUnit.Framework.Test]
@ -113,8 +101,8 @@ namespace iText.Layout {

        [NUnit.Framework.Test]
        public virtual void Borders3DTest() {
-            fileName = "borders3DTest.pdf";
-            Document doc = CreateDocument();
+            String fileName = "borders3DTest.pdf";
+            Document doc = CreateDocument(fileName);
            List list = new List();
            ListItem grooveBorderItem = new ListItem("groove");
            grooveBorderItem.SetBorder(new GrooveBorder(2)).SetMarginBottom(5).SetWidth(100);
@ -165,13 +153,13 @@ namespace iText.Layout {
            outsetBorderItem.SetBorder(new OutsetBorder(blueRgb, 8)).SetMarginBottom(5);
            list.Add(outsetBorderItem);
            doc.Add(list);
-            CloseDocumentAndCompareOutputs(doc);
+            CloseDocumentAndCompareOutputs(doc, fileName);
        }

        [NUnit.Framework.Test]
        public virtual void BorderSidesTest() {
-            fileName = "borderSidesTest.pdf";
-            Document doc = CreateDocument();
+            String fileName = "borderSidesTest.pdf";
+            Document doc = CreateDocument(fileName);
            String text = "<p class=\"none\"  >No border.</p>\n" + "<p class=\"dotted\">A dotted border.</p>\n" + "<p class=\"dashed\">A dashed border.</p>\n"
                 + "<p class=\"solid\" >A solid border.</p>\n" + "<p class=\"double\">A double border.</p>\n" + "<p class=\"groove\">A groove border.</p>\n"
                 + "<p class=\"ridge\" >A ridge border.</p>\n" + "<p class=\"inset\" >An inset border.</p>\n" + "<p class=\"outset\">An outset border.</p>\n"
@ -187,13 +175,13 @@ namespace iText.Layout {
            doc.Add(new Paragraph(text).SetBorderBottom(new RoundDotsBorder(DeviceCmyk.CYAN, 3)));
            doc.Add(new Paragraph(text).SetBorderLeft(new DashedBorder(DeviceGray.BLACK, 5)));
            doc.Add(new Paragraph(text).SetBorder(new DottedBorder(DeviceGray.BLACK, 1)));
-            CloseDocumentAndCompareOutputs(doc);
+            CloseDocumentAndCompareOutputs(doc, fileName);
        }

        [NUnit.Framework.Test]
        public virtual void BorderBoxTest() {
-            fileName = "borderBoxTest.pdf";
-            Document doc = CreateDocument();
+            String fileName = "borderBoxTest.pdf";
+            Document doc = CreateDocument(fileName);
            String textBefore = "At the mid-oceanic ridges, two tectonic plates diverge from one another as new oceanic crust is formed by the cooling and "
                 + "solidifying of hot molten rock. Because the crust is very thin at these ridges due to the pull of the tectonic plates, the release of "
                 + "pressure leads to adiabatic expansion and the partial melting of the mantle, causing volcanism and creating new oceanic crust. Most divergent "
@ -222,13 +210,13 @@ namespace iText.Layout {
            doc.Add(p);
            doc.Add(new Paragraph(textAfter).SetBorder(new DottedBorder(ColorConstants.BLACK, 3)).SetBorderRight(new DottedBorder
                (ColorConstants.BLACK, 12)));
-            CloseDocumentAndCompareOutputs(doc);
+            CloseDocumentAndCompareOutputs(doc, fileName);
        }

        [NUnit.Framework.Test]
        public virtual void BorderOutlineTest() {
-            fileName = "borderOutlineTest.pdf";
-            Document doc = CreateDocument();
+            String fileName = "borderOutlineTest.pdf";
+            Document doc = CreateDocument(fileName);
            String textBefore = "At the mid-oceanic ridges, two tectonic plates diverge from one another as new oceanic crust is formed by the cooling and "
                 + "solidifying of hot molten rock. Because the crust is very thin at these ridges due to the pull of the tectonic plates, the release of "
                 + "pressure leads to adiabatic expansion and the partial melting of the mantle, causing volcanism and creating new oceanic crust. Most divergent "
@ -249,14 +237,14 @@ namespace iText.Layout {
            p.SetMargins(25, 60, 70, 80);
            p.SetProperty(Property.OUTLINE, new DoubleBorder(ColorConstants.RED, 25));
            doc.Add(p);
-            CloseDocumentAndCompareOutputs(doc);
+            CloseDocumentAndCompareOutputs(doc, fileName);
        }

        [NUnit.Framework.Test]
        [LogMessage(LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, Count = 1)]
        public virtual void RotatedBordersTest() {
-            fileName = "rotatedBordersTest.pdf";
-            Document doc = CreateDocument();
+            String fileName = "rotatedBordersTest.pdf";
+            Document doc = CreateDocument(fileName);
            doc.SetMargins(0, 0, 0, 0);
            Paragraph p = new Paragraph("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas porttitor congue massa. Fusce posuere, magna sed pulvinar ultricies, purus lectus malesuada libero, sit amet commodo magna eros quis urna.\n"
                 + "Nunc viverra imperdiet enim. Fusce est. Vivamus a tellus.\n" + "Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Proin pharetra nonummy pede. Mauris et orci.\n"
@ -269,17 +257,18 @@ namespace iText.Layout {
            img.SetRotationAngle(Math.PI / 6);
            doc.Add(img);
            doc.Close();
-            CloseDocumentAndCompareOutputs(doc);
+            CloseDocumentAndCompareOutputs(doc, fileName);
        }

-        private Document CreateDocument() {
-            outFileName = destinationFolder + fileName;
-            cmpFileName = sourceFolder + cmpPrefix + fileName;
+        private static Document CreateDocument(String fileName) {
+            String outFileName = destinationFolder + fileName;
            PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outFileName));
            return new Document(pdfDocument);
        }

-        private void CloseDocumentAndCompareOutputs(Document document) {
+        private static void CloseDocumentAndCompareOutputs(Document document, String fileName) {
+            String cmpFileName = sourceFolder + cmpPrefix + fileName;
+            String outFileName = destinationFolder + fileName;
            document.Close();
            String compareResult = new CompareTool().CompareByContent(outFileName, cmpFileName, destinationFolder, "diff"
                );
--- a/itext.tests/itext.layout.tests/itext/layout/TableBorderTest.cs
+++ b/itext.tests/itext.layout.tests/itext/layout/TableBorderTest.cs
--- a/itext.tests/itext.layout.tests/itext/layout/properties/BackgroundImageTest.cs
+++ b/itext.tests/itext.layout.tests/itext/layout/properties/BackgroundImageTest.cs
@ -87,7 +87,7 @@ namespace iText.Layout.Properties {
                Build();
            NUnit.Framework.Assert.AreEqual(BackgroundBox.BORDER_BOX, backgroundImage.GetBackgroundClip());
            NUnit.Framework.Assert.AreEqual(BackgroundBox.PADDING_BOX, backgroundImage.GetBackgroundOrigin());
-            BackgroundImageGenericTest("backgroundImage", backgroundImage);
+            BackgroundImageGenericTest("backgroundImageClipOriginDefaults", backgroundImage);
        }

        [NUnit.Framework.Test]
@ -97,7 +97,7 @@ namespace iText.Layout.Properties {
                SetBackgroundClip(BackgroundBox.CONTENT_BOX).SetBackgroundOrigin(BackgroundBox.CONTENT_BOX).Build();
            NUnit.Framework.Assert.AreEqual(BackgroundBox.CONTENT_BOX, backgroundImage.GetBackgroundClip());
            NUnit.Framework.Assert.AreEqual(BackgroundBox.CONTENT_BOX, backgroundImage.GetBackgroundOrigin());
-            BackgroundImageGenericTest("backgroundImage", backgroundImage);
+            BackgroundImageGenericTest("backgroundImageClipOrigin", backgroundImage);
        }

        [NUnit.Framework.Test]
--- a/itext.tests/itext.layout.tests/resources/itext/layout/BackgroundImageTest/cmp_backgroundImageClipOrigin.pdf
+++ b/itext.tests/itext.layout.tests/resources/itext/layout/BackgroundImageTest/cmp_backgroundImageClipOrigin.pdf
@ -0,0 +1,15 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
+labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit
+esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur
+adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
+minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
+laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
+voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
--- a/itext.tests/itext.layout.tests/resources/itext/layout/BackgroundImageTest/cmp_backgroundImageClipOriginDefaults.pdf
+++ b/itext.tests/itext.layout.tests/resources/itext/layout/BackgroundImageTest/cmp_backgroundImageClipOriginDefaults.pdf
@ -0,0 +1,15 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
+labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit
+esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur
+adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
+minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
+laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
+voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
--- a/2
+++ b/2
@ -1 +1 @@
-0ebe12bf9b6d8a5a11e8e6e4c726f8a44664ecd8
+f6eba7755212f32d966a29388cf7de780a567ec8