[RELEASE] Merge branch 'release/7.1.2'

itext · Apr 12, 2018 · a83e371 · a83e371
2 parents 7759842 + 5c9a20f
commit a83e371
Show file tree

Hide file tree

Showing 502 changed files with 15,657 additions and 1,997 deletions.
diff --git a/iTextCore.netstandard.with.svg.sln b/iTextCore.netstandard.with.svg.sln
diff --git a/iTextCore.with.svg.sln b/iTextCore.with.svg.sln
@@ -0,0 +1,140 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.barcodes", "itext\itext.barcodes\itext.barcodes.csproj", "{DCAE8241-E391-418D-BA36-C7C064D7C413}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.font-asian", "itext\itext.font-asian\itext.font-asian.csproj", "{0F10190C-7611-4378-A157-03BF2ED78E30}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.forms", "itext\itext.forms\itext.forms.csproj", "{E2828AC4-3C63-4B2A-B5AD-5F98862775BE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.hyph", "itext\itext.hyph\itext.hyph.csproj", "{56137079-541A-425A-AB97-43AF63793C97}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.io", "itext\itext.io\itext.io.csproj", "{CEE5E7E1-1BF0-4BE1-9941-903262CE2F83}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.kernel", "itext\itext.kernel\itext.kernel.csproj", "{4E7819E8-7555-4E2E-9A01-D8718A2CFDDA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.layout", "itext\itext.layout\itext.layout.csproj", "{42173642-DB52-44D3-9883-3E34C65C53BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdfa", "itext\itext.pdfa\itext.pdfa.csproj", "{9FC2F0B3-A8D2-46DA-8724-72E00E67A8FA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdftest", "itext\itext.pdftest\itext.pdftest.csproj", "{F9880DC4-F015-4413-AF86-66D0E9512774}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.sign", "itext\itext.sign\itext.sign.csproj", "{14A163C0-0054-480D-A096-EDA51DD933EA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.barcodes.tests", "itext.tests\itext.barcodes.tests\itext.barcodes.tests.csproj", "{D015A3AA-613C-45D9-B908-7D47C4B613AF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.forms.tests", "itext.tests\itext.forms.tests\itext.forms.tests.csproj", "{6FE2F714-6B3E-4B20-8C70-28BFCE084ED2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.io.tests", "itext.tests\itext.io.tests\itext.io.tests.csproj", "{52A93D37-60D7-4607-8BB2-724D9C46671B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.kernel.tests", "itext.tests\itext.kernel.tests\itext.kernel.tests.csproj", "{02E54061-EB72-409D-B2C0-307CE66B57E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.layout.tests", "itext.tests\itext.layout.tests\itext.layout.tests.csproj", "{9AD347A8-EA5B-462B-810C-998F04471BB7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdfa.tests", "itext.tests\itext.pdfa.tests\itext.pdfa.tests.csproj", "{B7C0E021-71AC-4C97-9A51-8356F1BD53C7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.sign.tests", "itext.tests\itext.sign.tests\itext.sign.tests.csproj", "{BE15BDF3-B184-4E2F-8459-EBEE3160E19D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.svg", "..\svg\itext\itext.svg\itext.svg.csproj", "{DDEC35D2-5781-471D-5EA1-A6E433EDDB11}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.svg.tests", "..\svg\itext.tests\itext.svg.tests\itext.svg.tests.csproj", "{EA3251AA-1452-3815-1A43-0041AEDEA112}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.styledxmlparser", "..\styled-xml-parser\itext\itext.styledxmlparser\itext.styledxmlparser.csproj", "{8636F290-00DF-403E-B841-E4BFD6D9CE7A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.styledxmlparser.tests", "..\styled-xml-parser\itext.tests\itext.styledxmlparser.tests\itext.styledxmlparser.tests.csproj", "{ED35E7A1-5725-3258-3A99-AB356EDD5844}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DCAE8241-E391-418D-BA36-C7C064D7C413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCAE8241-E391-418D-BA36-C7C064D7C413}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCAE8241-E391-418D-BA36-C7C064D7C413}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCAE8241-E391-418D-BA36-C7C064D7C413}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F10190C-7611-4378-A157-03BF2ED78E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F10190C-7611-4378-A157-03BF2ED78E30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F10190C-7611-4378-A157-03BF2ED78E30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F10190C-7611-4378-A157-03BF2ED78E30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2828AC4-3C63-4B2A-B5AD-5F98862775BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2828AC4-3C63-4B2A-B5AD-5F98862775BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2828AC4-3C63-4B2A-B5AD-5F98862775BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2828AC4-3C63-4B2A-B5AD-5F98862775BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56137079-541A-425A-AB97-43AF63793C97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56137079-541A-425A-AB97-43AF63793C97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56137079-541A-425A-AB97-43AF63793C97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56137079-541A-425A-AB97-43AF63793C97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEE5E7E1-1BF0-4BE1-9941-903262CE2F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEE5E7E1-1BF0-4BE1-9941-903262CE2F83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEE5E7E1-1BF0-4BE1-9941-903262CE2F83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEE5E7E1-1BF0-4BE1-9941-903262CE2F83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E7819E8-7555-4E2E-9A01-D8718A2CFDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E7819E8-7555-4E2E-9A01-D8718A2CFDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E7819E8-7555-4E2E-9A01-D8718A2CFDDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E7819E8-7555-4E2E-9A01-D8718A2CFDDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42173642-DB52-44D3-9883-3E34C65C53BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42173642-DB52-44D3-9883-3E34C65C53BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42173642-DB52-44D3-9883-3E34C65C53BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42173642-DB52-44D3-9883-3E34C65C53BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FC2F0B3-A8D2-46DA-8724-72E00E67A8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FC2F0B3-A8D2-46DA-8724-72E00E67A8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FC2F0B3-A8D2-46DA-8724-72E00E67A8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FC2F0B3-A8D2-46DA-8724-72E00E67A8FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9880DC4-F015-4413-AF86-66D0E9512774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9880DC4-F015-4413-AF86-66D0E9512774}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9880DC4-F015-4413-AF86-66D0E9512774}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9880DC4-F015-4413-AF86-66D0E9512774}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14A163C0-0054-480D-A096-EDA51DD933EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14A163C0-0054-480D-A096-EDA51DD933EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14A163C0-0054-480D-A096-EDA51DD933EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14A163C0-0054-480D-A096-EDA51DD933EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D015A3AA-613C-45D9-B908-7D47C4B613AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D015A3AA-613C-45D9-B908-7D47C4B613AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D015A3AA-613C-45D9-B908-7D47C4B613AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D015A3AA-613C-45D9-B908-7D47C4B613AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FE2F714-6B3E-4B20-8C70-28BFCE084ED2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FE2F714-6B3E-4B20-8C70-28BFCE084ED2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FE2F714-6B3E-4B20-8C70-28BFCE084ED2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FE2F714-6B3E-4B20-8C70-28BFCE084ED2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52A93D37-60D7-4607-8BB2-724D9C46671B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52A93D37-60D7-4607-8BB2-724D9C46671B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52A93D37-60D7-4607-8BB2-724D9C46671B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52A93D37-60D7-4607-8BB2-724D9C46671B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02E54061-EB72-409D-B2C0-307CE66B57E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02E54061-EB72-409D-B2C0-307CE66B57E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02E54061-EB72-409D-B2C0-307CE66B57E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02E54061-EB72-409D-B2C0-307CE66B57E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AD347A8-EA5B-462B-810C-998F04471BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AD347A8-EA5B-462B-810C-998F04471BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AD347A8-EA5B-462B-810C-998F04471BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AD347A8-EA5B-462B-810C-998F04471BB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7C0E021-71AC-4C97-9A51-8356F1BD53C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7C0E021-71AC-4C97-9A51-8356F1BD53C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7C0E021-71AC-4C97-9A51-8356F1BD53C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7C0E021-71AC-4C97-9A51-8356F1BD53C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE15BDF3-B184-4E2F-8459-EBEE3160E19D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE15BDF3-B184-4E2F-8459-EBEE3160E19D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE15BDF3-B184-4E2F-8459-EBEE3160E19D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE15BDF3-B184-4E2F-8459-EBEE3160E19D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDEC35D2-5781-471D-5EA1-A6E433EDDB11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDEC35D2-5781-471D-5EA1-A6E433EDDB11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDEC35D2-5781-471D-5EA1-A6E433EDDB11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDEC35D2-5781-471D-5EA1-A6E433EDDB11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA3251AA-1452-3815-1A43-0041AEDEA112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA3251AA-1452-3815-1A43-0041AEDEA112}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA3251AA-1452-3815-1A43-0041AEDEA112}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA3251AA-1452-3815-1A43-0041AEDEA112}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8636F290-00DF-403E-B841-E4BFD6D9CE7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8636F290-00DF-403E-B841-E4BFD6D9CE7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8636F290-00DF-403E-B841-E4BFD6D9CE7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8636F290-00DF-403E-B841-E4BFD6D9CE7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED35E7A1-5725-3258-3A99-AB356EDD5844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED35E7A1-5725-3258-3A99-AB356EDD5844}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED35E7A1-5725-3258-3A99-AB356EDD5844}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED35E7A1-5725-3258-3A99-AB356EDD5844}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs
@@ -14,9 +14,9 @@
 
 [assembly: Guid("d015a3aa-613c-45d9-b908-7d47c4b613af")]
 
-[assembly: AssemblyVersion("7.1.1.0")]
-[assembly: AssemblyFileVersion("7.1.1.0")]
-[assembly: AssemblyInformationalVersion("7.1.1")]
+[assembly: AssemblyVersion("7.1.2.0")]
+[assembly: AssemblyFileVersion("7.1.2.0")]
+[assembly: AssemblyInformationalVersion("7.1.2")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

diff --git a/itext.tests/itext.barcodes.tests/itext/barcodes/BarcodeMSITest.cs b/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);
         }
 

diff --git a/itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs
@@ -14,9 +14,9 @@
 
 [assembly: Guid("6fe2f714-6b3e-4b20-8c70-28bfce084ed2")]
 
-[assembly: AssemblyVersion("7.1.1.0")]
-[assembly: AssemblyFileVersion("7.1.1.0")]
-[assembly: AssemblyInformationalVersion("7.1.1")]
+[assembly: AssemblyVersion("7.1.2.0")]
+[assembly: AssemblyFileVersion("7.1.2.0")]
+[assembly: AssemblyInformationalVersion("7.1.2")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

diff --git a/itext.tests/itext.forms.tests/itext/forms/FormFieldFlatteningTest.cs b/itext.tests/itext.forms.tests/itext/forms/FormFieldFlatteningTest.cs
@@ -69,8 +69,22 @@ public virtual void FormFlatteningTest01() {
             PdfAcroForm form = PdfAcroForm.GetAcroForm(doc, true);
             form.FlattenFields();
             doc.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(filename, sourceFolder + "cmp_formFlatteningTest01.pdf"
+                , destinationFolder, "diff_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void FormFlatteningChoiceFieldTest01() {
+            String srcFilename = sourceFolder + "formFlatteningSourceChoiceField.pdf";
+            String filename = destinationFolder + "formFlatteningChoiceFieldTest01.pdf";
+            PdfDocument doc = new PdfDocument(new PdfReader(srcFilename), new PdfWriter(filename));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(doc, true);
+            form.FlattenFields();
+            doc.Close();
             CompareTool compareTool = new CompareTool();
-            String errorMessage = compareTool.CompareByContent(filename, sourceFolder + "cmp_formFlatteningTest01.pdf"
+            String errorMessage = compareTool.CompareByContent(filename, sourceFolder + "cmp_formFlatteningChoiceFieldTest01.pdf"
                 , destinationFolder, "diff_");
             if (errorMessage != null) {
                 NUnit.Framework.Assert.Fail(errorMessage);
@@ -94,11 +108,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 +129,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 +150,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 +171,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_"));
             }
         }
     }

diff --git a/itext.tests/itext.forms.tests/itext/forms/PdfFormFieldTest.cs b/itext.tests/itext.forms.tests/itext/forms/PdfFormFieldTest.cs
@@ -360,5 +360,26 @@ public virtual void RegenerateAppearance2() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + output, sourceFolder 
                 + "cmp_" + output, destinationFolder, "diff"));
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void MultilineTextFieldWithAlignmentTest() {
+            String outPdf = destinationFolder + "multilineTextFieldWithAlignment.pdf";
+            String cmpPdf = sourceFolder + "cmp_multilineTextFieldWithAlignment.pdf";
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outPdf));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            Rectangle rect = new Rectangle(210, 600, 150, 100);
+            PdfTextFormField field = PdfFormField.CreateMultilineText(pdfDoc, rect, "fieldName", "some value\nsecond line\nthird"
+                );
+            field.SetJustification(PdfTextFormField.ALIGN_RIGHT);
+            form.AddField(field);
+            pdfDoc.Close();
+            CompareTool compareTool = new CompareTool();
+            String errorMessage = compareTool.CompareByContent(outPdf, cmpPdf, destinationFolder, "diff_");
+            if (errorMessage != null) {
+                NUnit.Framework.Assert.Fail(errorMessage);
+            }
+        }
     }
 }
diff --git a/...sts/resources/itext/forms/FormFieldFlatteningTest/cmp_formFlatteningChoiceFieldTest01.pdf b/...sts/resources/itext/forms/FormFieldFlatteningTest/cmp_formFlatteningChoiceFieldTest01.pdf
diff --git a/...s.tests/resources/itext/forms/FormFieldFlatteningTest/formFlatteningSourceChoiceField.pdf b/...s.tests/resources/itext/forms/FormFieldFlatteningTest/formFlatteningSourceChoiceField.pdf
diff --git a/...text.forms.tests/resources/itext/forms/FormFieldsTaggingTest/cmp_taggedPdfWithForms01.pdf b/...text.forms.tests/resources/itext/forms/FormFieldsTaggingTest/cmp_taggedPdfWithForms01.pdf
diff --git a/...text.forms.tests/resources/itext/forms/FormFieldsTaggingTest/cmp_taggedPdfWithForms04.pdf b/...text.forms.tests/resources/itext/forms/FormFieldsTaggingTest/cmp_taggedPdfWithForms04.pdf
diff --git a/...text.forms.tests/resources/itext/forms/FormFieldsTaggingTest/cmp_taggedPdfWithForms06.pdf b/...text.forms.tests/resources/itext/forms/FormFieldsTaggingTest/cmp_taggedPdfWithForms06.pdf
diff --git a/....tests/resources/itext/forms/PdfEncryptionTest/cmp_encryptAes256Pdf2PermissionsTest01.pdf b/....tests/resources/itext/forms/PdfEncryptionTest/cmp_encryptAes256Pdf2PermissionsTest01.pdf
diff --git a/....tests/resources/itext/forms/PdfEncryptionTest/cmp_encryptAes256Pdf2PermissionsTest02.pdf b/....tests/resources/itext/forms/PdfEncryptionTest/cmp_encryptAes256Pdf2PermissionsTest02.pdf
diff --git a/....forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_autoScaleFontSizeInFormFields.pdf b/....forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_autoScaleFontSizeInFormFields.pdf
diff --git a/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_buttonFieldTest01.pdf b/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_buttonFieldTest01.pdf
diff --git a/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_buttonFieldTest02.pdf b/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_buttonFieldTest02.pdf
diff --git a/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_choiceFieldTest01.pdf b/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_choiceFieldTest01.pdf
diff --git a/itext.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_formFieldTest02.pdf b/itext.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/cmp_formFieldTest02.pdf
diff --git a/...orms.tests/resources/itext/forms/PdfFormFieldTest/cmp_multilineTextFieldWithAlignment.pdf b/...orms.tests/resources/itext/forms/PdfFormFieldTest/cmp_multilineTextFieldWithAlignment.pdf
diff --git a/...t.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/regenerateAppearance.pdf b/...t.tests/itext.forms.tests/resources/itext/forms/PdfFormFieldTest/regenerateAppearance.pdf
diff --git a/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields06.pdf b/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields06.pdf
diff --git a/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields07.pdf b/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields07.pdf
diff --git a/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields09.pdf b/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields09.pdf
diff --git a/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields10.pdf b/....tests/itext.forms.tests/resources/itext/forms/PdfFormFieldsCopyTest/cmp_copyFields10.pdf
diff --git a/.../itext.forms.tests/resources/itext/forms/Utf8FormsTest/cmp_writeUtf8FieldNameAndValue.pdf b/.../itext.forms.tests/resources/itext/forms/Utf8FormsTest/cmp_writeUtf8FieldNameAndValue.pdf
diff --git a/.../itext.forms.tests/resources/itext/forms/xfa/XFAFormTest/cmp_createEmptyXFAFormTest01.pdf b/.../itext.forms.tests/resources/itext/forms/xfa/XFAFormTest/cmp_createEmptyXFAFormTest01.pdf
diff --git a/.../itext.forms.tests/resources/itext/forms/xfa/XFAFormTest/cmp_createEmptyXFAFormTest02.pdf b/.../itext.forms.tests/resources/itext/forms/xfa/XFAFormTest/cmp_createEmptyXFAFormTest02.pdf
diff --git a/...t.tests/itext.forms.tests/resources/itext/forms/xfa/XFAFormTest/cmp_createXFAFormTest.pdf b/...t.tests/itext.forms.tests/resources/itext/forms/xfa/XFAFormTest/cmp_createXFAFormTest.pdf
diff --git a/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs
@@ -15,9 +15,9 @@
 
 [assembly: Guid("a53a5dd3-787b-4563-8778-1d76bdad57ba")]
 
-[assembly: AssemblyVersion("7.1.1.0")]
-[assembly: AssemblyFileVersion("7.1.1.0")]
-[assembly: AssemblyInformationalVersion("7.1.1")]
+[assembly: AssemblyVersion("7.1.2.0")]
+[assembly: AssemblyFileVersion("7.1.2.0")]
+[assembly: AssemblyInformationalVersion("7.1.2")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

diff --git a/itext.tests/itext.io.tests/itext.io.tests.csproj b/itext.tests/itext.io.tests/itext.io.tests.csproj
@@ -37,6 +37,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="itext\**\*.cs" />