Move XML parsers creation to util methods and fix several tests

Eugene Bochilo · Eugene Bochilo · commit ffccee328303 · 2022-04-15T03:12:35.000+03:00
DEVSIX-6388

Autoported commit.
Original commit hash: [7be06748a]
Manual files:
forms/src/test/java/com/itextpdf/forms/xfa/SecurityTestXmlParserFactory.java
forms/src/test/java/com/itextpdf/forms/xfdf/SecurityTestXmlParserFactory.java
io/src/main/java/com/itextpdf/io/util/XmlUtil.java
io/src/test/java/com/itextpdf/io/source/OutputStreamTest.java
io/src/test/java/com/itextpdf/io/util/XmlUtilTest.java
kernel/src/main/java/com/itextpdf/kernel/utils/DefaultSafeXmlParserFactory.java
kernel/src/test/java/com/itextpdf/kernel/utils/SecurityTestXmlParserFactory.java
kernel/src/test/java/com/itextpdf/kernel/utils/XmlProcessorCreatorSecurityTest.java
kernel/src/test/java/com/itextpdf/kernel/xmp/impl/SecurityTestXmlParserFactory.java
diff --git a/itext.tests/itext.forms.tests/itext/forms/xfa/XfaSecurityTest.cs b/itext.tests/itext.forms.tests/itext/forms/xfa/XfaSecurityTest.cs
@@ -62,7 +62,7 @@ public class XfaSecurityTest : ExtendedITextTest {
 
         [NUnit.Framework.SetUp]
         public virtual void ResetXmlParserFactoryToDefault() {
-            XmlProcessorCreator.SetXmlParserFactory(new DefaultSafeXmlParserFactory());
+            XmlProcessorCreator.SetXmlParserFactory(null);
         }
 
         [NUnit.Framework.Test]
diff --git a/itext.tests/itext.forms.tests/itext/forms/xfdf/XfdfSecurityTest.cs b/itext.tests/itext.forms.tests/itext/forms/xfdf/XfdfSecurityTest.cs
@@ -55,7 +55,7 @@ public class XfdfSecurityTest : ExtendedITextTest {
 
         [NUnit.Framework.Test]
         public virtual void XxeVulnerabilityXfdfTest() {
-            XmlProcessorCreator.SetXmlParserFactory(new DefaultSafeXmlParserFactory());
+            XmlProcessorCreator.SetXmlParserFactory(null);
             using (Stream inputStream = new MemoryStream(XFDF_WITH_XXE.GetBytes(System.Text.Encoding.UTF8))) {
                 Exception e = NUnit.Framework.Assert.Catch(typeof(PdfException), () => XfdfFileUtils.CreateXfdfDocumentFromStream
                     (inputStream));
diff --git a/itext.tests/itext.io.tests/itext/io/source/OutputStreamTest.cs b/itext.tests/itext.io.tests/itext/io/source/OutputStreamTest.cs
@@ -350,16 +350,26 @@ public virtual void ResetExceptionTest() {
 
         [NUnit.Framework.Test]
         public virtual void LocalHighPrecisionOverridesGlobalTest() {
+
+            bool highPrecision = OutputStream<ByteArrayOutputStream>.GetHighPrecision();
+
             //the data is random
             double? numberToWrite = 2.002d;
-            using (ByteArrayOutputStream bytes = new ByteArrayOutputStream()) {
-                using (OutputStream<ByteArrayOutputStream> stream = new OutputStream<ByteArrayOutputStream>(bytes, false)) {
-                    stream.SetLocalHighPrecision(true);
-                    stream.WriteDouble((double)numberToWrite);
-                    stream.Flush();
-                    NUnit.Framework.Assert.AreEqual(numberToWrite.ToString(), Encoding.UTF8.GetString(bytes.ToArray()));
+            try {
+                using (ByteArrayOutputStream bytes = new ByteArrayOutputStream()) {
+                    using (OutputStream<ByteArrayOutputStream> stream =
+                           new OutputStream<ByteArrayOutputStream>(bytes, false)) {
+                        OutputStream<ByteArrayOutputStream>.SetHighPrecision(true);
+                        stream.SetLocalHighPrecision(false);
+                        stream.WriteDouble((double)numberToWrite);
+                        stream.Flush();
+                        NUnit.Framework.Assert.AreEqual("2", Encoding.UTF8.GetString(bytes.ToArray()));
+                    }
                 }
             }
+            finally {
+                OutputStream<ByteArrayOutputStream>.SetHighPrecision(highPrecision);
+            }
         }
     }
 }
diff --git a/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfObjectReleaseTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfObjectReleaseTest.cs
@@ -30,15 +30,15 @@ You should have received a copy of the GNU Affero General Public License
 
 namespace iText.Kernel.Pdf {
     public class PdfObjectReleaseTest : ExtendedITextTest {
-        public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+        public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
             .CurrentContext.TestDirectory) + "/resources/itext/kernel/pdf/PdfObjectReleaseTest/";
 
-        public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+        public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
              + "/test/itext/kernel/pdf/PdfObjectReleaseTest/";
 
         [NUnit.Framework.OneTimeSetUp]
         public static void BeforeClass() {
-            CreateOrClearDestinationFolder(destinationFolder);
+            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
         }
 
         [NUnit.Framework.Test]
@@ -65,58 +65,54 @@ public virtual void ReleaseObjectsInSimpleDocTest() {
         [NUnit.Framework.Test]
         [LogMessage(iText.IO.Logs.IoLogMessageConstant.FORBID_RELEASE_IS_SET)]
         public virtual void ReleaseCatalogTest() {
-            String srcFile = sourceFolder + "releaseObjectsInSimpleDoc.pdf";
-            String release = destinationFolder + "outReleaseObjectsInSimpleDoc.pdf";
+            String srcFile = SOURCE_FOLDER + "releaseObjectsInSimpleDoc.pdf";
+            String release = DESTINATION_FOLDER + "outReleaseObjectsInSimpleDoc.pdf";
             using (PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(release))) {
                 doc.GetCatalog().GetPdfObject().Release();
             }
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(release, srcFile, destinationFolder));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(release, srcFile, DESTINATION_FOLDER));
         }
 
         [NUnit.Framework.Test]
         [LogMessage(iText.IO.Logs.IoLogMessageConstant.FORBID_RELEASE_IS_SET)]
         public virtual void ReleasePagesTest() {
-            String srcFile = sourceFolder + "releaseObjectsInSimpleDoc.pdf";
-            String release = destinationFolder + "outReleaseObjectsInSimpleDoc.pdf";
+            String srcFile = SOURCE_FOLDER + "releaseObjectsInSimpleDoc.pdf";
+            String release = DESTINATION_FOLDER + "outReleaseObjectsInSimpleDoc.pdf";
             using (PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(release))) {
                 doc.GetCatalog().GetPdfObject().GetAsDictionary(PdfName.Pages).Release();
             }
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(release, srcFile, destinationFolder));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(release, srcFile, DESTINATION_FOLDER));
         }
 
         [NUnit.Framework.Test]
         [LogMessage(iText.IO.Logs.IoLogMessageConstant.FORBID_RELEASE_IS_SET)]
         public virtual void ReleaseStructTreeRootTest() {
-            String srcFile = sourceFolder + "releaseObjectsInDocWithStructTreeRoot.pdf";
-            String release = destinationFolder + "outReleaseObjectsInDocWithStructTreeRoot.pdf";
+            String srcFile = SOURCE_FOLDER + "releaseObjectsInDocWithStructTreeRoot.pdf";
+            String release = DESTINATION_FOLDER + "outReleaseObjectsInDocWithStructTreeRoot.pdf";
             using (PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(release))) {
                 doc.GetStructTreeRoot().GetPdfObject().Release();
             }
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(release, srcFile, destinationFolder));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(release, srcFile, DESTINATION_FOLDER));
         }
 
         [NUnit.Framework.Test]
-        public virtual void NoForbidReleaseObjectsModifyingTest() {
-            String srcFile = sourceFolder + "noForbidReleaseObjectsModifying.pdf";
-            String stampReleased = sourceFolder + "noForbidReleaseObjectsModified.pdf";
-            using (PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(destinationFolder + "noForbidReleaseObjectsModifying.pdf"
-                ), new StampingProperties().UseAppendMode())) {
+        [LogMessage(iText.IO.Logs.IoLogMessageConstant.FORBID_RELEASE_IS_SET)]
+        public virtual void ReleaseModifiedObjectTest() {
+            String srcFile = SOURCE_FOLDER + "releaseModifiedObject.pdf";
+            String cmpFile = SOURCE_FOLDER + "cmp_releaseModifiedObject.pdf";
+            String outFile = DESTINATION_FOLDER + "releaseModifiedObject.pdf";
+            using (PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(outFile))) {
                 PdfAnnotation annots = doc.GetPage(1).GetAnnotations()[0];
                 annots.SetRectangle(new PdfArray(new Rectangle(100, 100, 80, 50)));
-                annots.GetRectangle().Release();
-            }
-            using (PdfDocument openPrev = new PdfDocument(new PdfReader(stampReleased))) {
-                NUnit.Framework.Assert.IsTrue(new Rectangle(100, 100, 80, 50).EqualsWithEpsilon(openPrev.GetPage(1).GetAnnotations
-                    ()[0].GetRectangle().ToRectangle()));
+                annots.GetPdfObject().Release();
             }
-            NUnit.Framework.Assert.IsNotNull(new CompareTool().CompareByContent(srcFile, stampReleased, destinationFolder
-                ));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFile, cmpFile, DESTINATION_FOLDER));
         }
 
         [NUnit.Framework.Test]
         public virtual void AddingReleasedObjectToDocumentTest() {
-            String srcFile = sourceFolder + "releaseObjectsInSimpleDoc.pdf";
-            PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(sourceFolder + "addingReleasedObjectToDocument.pdf"
+            String srcFile = SOURCE_FOLDER + "releaseObjectsInSimpleDoc.pdf";
+            PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(SOURCE_FOLDER + "addingReleasedObjectToDocument.pdf"
                 ));
             try {
                 PdfObject releasedObj = doc.GetPdfObject(1);
@@ -132,9 +128,9 @@ public virtual void AddingReleasedObjectToDocumentTest() {
 
         private void SinglePdfObjectReleaseTest(String inputFilename, String outStampingFilename, String outStampingReleaseFilename
             ) {
-            String srcFile = sourceFolder + inputFilename;
-            String outPureStamping = destinationFolder + outStampingFilename;
-            String outStampingRelease = destinationFolder + outStampingReleaseFilename;
+            String srcFile = SOURCE_FOLDER + inputFilename;
+            String outPureStamping = DESTINATION_FOLDER + outStampingFilename;
+            String outStampingRelease = DESTINATION_FOLDER + outStampingReleaseFilename;
             PdfDocument doc = new PdfDocument(new PdfReader(srcFile), new PdfWriter(outPureStamping));
             // We open/close document to make sure that the results of release logic and simple overwriting coincide.
             doc.Close();
@@ -146,7 +142,7 @@ private void SinglePdfObjectReleaseTest(String inputFilename, String outStamping
                 }
             }
             stamperRelease.Close();
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outStampingRelease, outPureStamping, destinationFolder
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outStampingRelease, outPureStamping, DESTINATION_FOLDER
                 ));
         }
     }
diff --git a/itext.tests/itext.kernel.tests/itext/kernel/utils/XmlProcessorCreatorSecurityTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/utils/XmlProcessorCreatorSecurityTest.cs
@@ -86,7 +86,7 @@ public class XmlProcessorCreatorSecurityTest : ExtendedITextTest
         [SetUp]
         public virtual void ResetXmlParserFactoryToDefault()
         {
-            XmlProcessorCreator.SetXmlParserFactory(new DefaultSafeXmlParserFactory());
+            XmlProcessorCreator.SetXmlParserFactory(null);
         }
 
         [Test]
diff --git a/itext.tests/itext.kernel.tests/itext/kernel/xmp/impl/XMPMetaParserSecurityTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/xmp/impl/XMPMetaParserSecurityTest.cs
@@ -40,7 +40,7 @@ public class XMPMetaParserSecurityTest : ExtendedITextTest {
 
         [NUnit.Framework.SetUp]
         public virtual void ResetXmlParserFactoryToDefault() {
-            XmlProcessorCreator.SetXmlParserFactory(new DefaultSafeXmlParserFactory());
+            XmlProcessorCreator.SetXmlParserFactory(null);
         }
 
         [NUnit.Framework.Test]
diff --git a/itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfObjectReleaseTest/cmp_releaseModifiedObject.pdf b/itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfObjectReleaseTest/cmp_releaseModifiedObject.pdf
diff --git a/itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfObjectReleaseTest/releaseModifiedObject.pdf b/itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfObjectReleaseTest/releaseModifiedObject.pdf
diff --git a/itext.tests/itext.layout.tests/itext/layout/ListAlignmentDirectionTest.cs b/itext.tests/itext.layout.tests/itext/layout/ListAlignmentDirectionTest.cs
@@ -59,15 +59,17 @@ public class ListAlignmentDirectionTest : ExtendedITextTest {
 
         private BaseDirection? listBaseDirection;
 
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
+        }
+
         public ListAlignmentDirectionTest(Object itemTextAlignment, Object itemBaseDirection, Object listTextAlignment
             , Object listBaseDirection) {
             this.itemTextAlignment = (TextAlignment?)itemTextAlignment;
             this.itemBaseDirection = (BaseDirection?)itemBaseDirection;
             this.listTextAlignment = (TextAlignment?)listTextAlignment;
             this.listBaseDirection = (BaseDirection?)listBaseDirection;
-            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
-            // Create an HTML for this test
-            CreateHtml();
         }
 
         public ListAlignmentDirectionTest(Object[] array)
@@ -102,6 +104,8 @@ public static ICollection<NUnit.Framework.TestFixtureData> AlignItemsAndJustifyC
         public virtual void AlignmentDirectionTest() {
             // TODO DEVSIX-5727 direction of the first list-item should define the symbol indent's side. Once the issue
             // is fixed, the corresponding cmps should be updated.
+            // Create an HTML for this test
+            CreateHtml();
             String fileName = MessageFormatUtil.Format(RESULTANT_FILE_NAME_PATTERN, FormatTextAlignment(itemTextAlignment
                 ), FormatBaseDirection(itemBaseDirection), FormatTextAlignment(listTextAlignment), FormatBaseDirection
                 (listBaseDirection));
diff --git a/itext.tests/itext.layout.tests/itext/layout/ListItemPositionAlignmentTest.cs b/itext.tests/itext.layout.tests/itext/layout/ListItemPositionAlignmentTest.cs
@@ -62,16 +62,18 @@ public class ListItemPositionAlignmentTest : ExtendedITextTest {
 
         private int? comparisonPdfId;
 
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
+        }
+
         public ListItemPositionAlignmentTest(Object listBaseDirection, Object listItemBaseDirection, Object listSymbolAlignment
             , Object listSymbolPosition, Object comparisonPdfId) {
             this.listBaseDirection = (BaseDirection?)listBaseDirection;
             this.listItemBaseDirection = (BaseDirection?)listItemBaseDirection;
             this.listSymbolAlignment = (ListSymbolAlignment)listSymbolAlignment;
             this.listSymbolPosition = (ListSymbolPosition)listSymbolPosition;
             this.comparisonPdfId = (int?)comparisonPdfId;
-            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
-            // Create an HTML for this test
-            CreateHtml();
         }
 
         public ListItemPositionAlignmentTest(Object[] array)
@@ -108,6 +110,8 @@ public static ICollection<NUnit.Framework.TestFixtureData> BaseDirectionAndSymbo
         [NUnit.Framework.Test]
         [LogMessage(iText.IO.Logs.IoLogMessageConstant.TYPOGRAPHY_NOT_FOUND, Count = 8)]
         public virtual void DefaultListIemPositionAlignmentTest() {
+            // Create an HTML for this test
+            CreateHtml();
             String fileName = MessageFormatUtil.Format(RESULTANT_FILE_NAME_PATTERN, FormatSymbolPosition(listSymbolPosition
                 ), FormatSymbolAlignment(listSymbolAlignment), FormatBaseDirection(listItemBaseDirection), FormatBaseDirection
                 (listBaseDirection));
diff --git a/itext.tests/itext.layout.tests/itext/layout/renderer/LineHeightHelperIntegrationTest.cs b/itext.tests/itext.layout.tests/itext/layout/renderer/LineHeightHelperIntegrationTest.cs
@@ -52,7 +52,7 @@ public virtual void CourierTest() {
             String cmpPdf = CMP + "cmp_" + name;
             String outPdf = DESTINATION + name;
             TestFont(PdfFontFactory.CreateFont(StandardFonts.COURIER), outPdf);
-            new CompareTool().CompareByContent(outPdf, cmpPdf, DESTINATION);
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, DESTINATION));
         }
 
         [NUnit.Framework.Test]
@@ -61,7 +61,7 @@ public virtual void HelveticaTest() {
             String cmpPdf = CMP + "cmp_" + name;
             String outPdf = DESTINATION + name;
             TestFont(PdfFontFactory.CreateFont(StandardFonts.HELVETICA), outPdf);
-            new CompareTool().CompareByContent(outPdf, cmpPdf, DESTINATION);
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, DESTINATION));
         }
 
         [NUnit.Framework.Test]
@@ -70,7 +70,7 @@ public virtual void TimesRomanTest() {
             String cmpPdf = CMP + "cmp_" + name;
             String outPdf = DESTINATION + name;
             TestFont(PdfFontFactory.CreateFont(StandardFonts.TIMES_ROMAN), outPdf);
-            new CompareTool().CompareByContent(outPdf, cmpPdf, DESTINATION);
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, DESTINATION));
         }
 
         private void TestFont(PdfFont font, String outPdf) {
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/LineHeightHelperIntegrationTest/cmp_courierTest.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/LineHeightHelperIntegrationTest/cmp_courierTest.pdf
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/LineHeightHelperIntegrationTest/cmp_helveticaTest.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/LineHeightHelperIntegrationTest/cmp_helveticaTest.pdf
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/LineHeightHelperIntegrationTest/cmp_timesRomanTest.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/LineHeightHelperIntegrationTest/cmp_timesRomanTest.pdf
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-e3c011fd25e9c5f3ff579483db29f81f760c4c1e
+7be06748ab2412a802453dfc440c1d0e21f06855

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public class XfaSecurityTest : ExtendedITextTest {`
`62`	`62`
`63`	`63`	`[NUnit.Framework.SetUp]`
`64`	`64`	`public virtual void ResetXmlParserFactoryToDefault() {`
`65`		`- XmlProcessorCreator.SetXmlParserFactory(new DefaultSafeXmlParserFactory());`
	`65`	`+ XmlProcessorCreator.SetXmlParserFactory(null);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[NUnit.Framework.Test]`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public class XmlProcessorCreatorSecurityTest : ExtendedITextTest`
`86`	`86`	`[SetUp]`
`87`	`87`	`public virtual void ResetXmlParserFactoryToDefault()`
`88`	`88`	`{`
`89`		`- XmlProcessorCreator.SetXmlParserFactory(new DefaultSafeXmlParserFactory());`
	`89`	`+ XmlProcessorCreator.SetXmlParserFactory(null);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class XMPMetaParserSecurityTest : ExtendedITextTest {`
`40`	`40`
`41`	`41`	`[NUnit.Framework.SetUp]`
`42`	`42`	`public virtual void ResetXmlParserFactoryToDefault() {`
`43`		`- XmlProcessorCreator.SetXmlParserFactory(new DefaultSafeXmlParserFactory());`
	`43`	`+ XmlProcessorCreator.SetXmlParserFactory(null);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`[NUnit.Framework.Test]`