[RELEASE] Merge branch 'release/7.0.7'

Author: pavel-alay

itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs

@@ -14,9 +14,9 @@
 
 [assembly: Guid("d015a3aa-613c-45d9-b908-7d47c4b613af")]
 
-[assembly: AssemblyVersion("7.0.6.0")]
-[assembly: AssemblyFileVersion("7.0.6.0")]
-[assembly: AssemblyInformationalVersion("7.0.6")]
+[assembly: AssemblyVersion("7.0.7.0")]
+[assembly: AssemblyFileVersion("7.0.7.0")]
+[assembly: AssemblyInformationalVersion("7.0.7")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

itext.tests/itext.barcodes.tests/itext/barcodes/BarcodeMSITest.cs

@@ -41,6 +41,7 @@ source product.
 address: [email protected]
 */
 using System;
+using iText.IO.Util;
 using iText.Kernel.Colors;
 using iText.Kernel.Pdf;
 using iText.Kernel.Pdf.Canvas;
@@ -103,7 +104,7 @@ public virtual void Barcode03Test() {
             byte[] expected = new byte[] { 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 
                 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1 };
             byte[] barcodeBytes = BarcodeMSI.GetBarsMSI("1234");
-            bool isEqual = iText.IO.Util.JavaUtil.ArraysEquals(expected, barcodeBytes);
+            bool isEqual = JavaUtil.ArraysEquals(expected, barcodeBytes);
             NUnit.Framework.Assert.IsTrue(isEqual);
         }
 

itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs

@@ -14,9 +14,9 @@
 
 [assembly: Guid("6fe2f714-6b3e-4b20-8c70-28bfce084ed2")]
 
-[assembly: AssemblyVersion("7.0.6.0")]
-[assembly: AssemblyFileVersion("7.0.6.0")]
-[assembly: AssemblyInformationalVersion("7.0.6")]
+[assembly: AssemblyVersion("7.0.7.0")]
+[assembly: AssemblyFileVersion("7.0.7.0")]
+[assembly: AssemblyInformationalVersion("7.0.7")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

itext.tests/itext.forms.tests/itext/forms/FormFieldFlatteningTest.cs

@@ -69,12 +69,8 @@ public virtual void FormFlatteningTest01() {
             PdfAcroForm form = PdfAcroForm.GetAcroForm(doc, true);
             form.FlattenFields();
             doc.Close();
-            CompareTool compareTool = new CompareTool();
-            String errorMessage = compareTool.CompareByContent(filename, sourceFolder + "cmp_formFlatteningTest01.pdf"
-                , destinationFolder, "diff_");
-            if (errorMessage != null) {
-                NUnit.Framework.Assert.Fail(errorMessage);
-            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(filename, sourceFolder + "cmp_formFlatteningTest01.pdf"
+                , destinationFolder, "diff_"));
         }
 
         /// <exception cref="System.IO.IOException"/>
@@ -94,11 +90,7 @@ public virtual void FormFlatteningTest_DefaultAppearanceGeneration_Rot0() {
                 }
                 form.FlattenFields();
                 doc.Close();
-                CompareTool compareTool = new CompareTool();
-                String errorMessage = compareTool.CompareByContent(dest, cmp, destinationFolder, "diff_");
-                if (errorMessage != null) {
-                    NUnit.Framework.Assert.Fail(errorMessage);
-                }
+                NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(dest, cmp, destinationFolder, "diff_"));
             }
         }
 
@@ -119,11 +111,7 @@ public virtual void FormFlatteningTest_DefaultAppearanceGeneration_Rot90() {
                 }
                 form.FlattenFields();
                 doc.Close();
-                CompareTool compareTool = new CompareTool();
-                String errorMessage = compareTool.CompareByContent(dest, cmp, destinationFolder, "diff_");
-                if (errorMessage != null) {
-                    NUnit.Framework.Assert.Fail(errorMessage);
-                }
+                NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(dest, cmp, destinationFolder, "diff_"));
             }
         }
 
@@ -144,11 +132,7 @@ public virtual void FormFlatteningTest_DefaultAppearanceGeneration_Rot180() {
                 }
                 form.FlattenFields();
                 doc.Close();
-                CompareTool compareTool = new CompareTool();
-                String errorMessage = compareTool.CompareByContent(dest, cmp, destinationFolder, "diff_");
-                if (errorMessage != null) {
-                    NUnit.Framework.Assert.Fail(errorMessage);
-                }
+                NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(dest, cmp, destinationFolder, "diff_"));
             }
         }
 
@@ -169,11 +153,7 @@ public virtual void FormFlatteningTest_DefaultAppearanceGeneration_Rot270() {
                 }
                 form.FlattenFields();
                 doc.Close();
-                CompareTool compareTool = new CompareTool();
-                String errorMessage = compareTool.CompareByContent(dest, cmp, destinationFolder, "diff_");
-                if (errorMessage != null) {
-                    NUnit.Framework.Assert.Fail(errorMessage);
-                }
+                NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(dest, cmp, destinationFolder, "diff_"));
             }
         }
     }