Merge branch 'release_branch_DEVSIX-5942' into master-rc

Author: iText-CI

doxyfile

@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "iText 7 7.1.16 API"
+PROJECT_NAME           = "iText 7 7.1.17 API"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version

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

@@ -14,9 +14,9 @@
 
 [assembly: Guid("d015a3aa-613c-45d9-b908-7d47c4b613af")]
 
-[assembly: AssemblyVersion("7.1.16.0")]
-[assembly: AssemblyFileVersion("7.1.16.0")]
-[assembly: AssemblyInformationalVersion("7.1.16")]
+[assembly: AssemblyVersion("7.1.17.0")]
+[assembly: AssemblyFileVersion("7.1.17.0")]
+[assembly: AssemblyInformationalVersion("7.1.17")]
 
 #if !NETSTANDARD2_0
 [assembly: NUnit.Framework.Timeout(300000)]

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

@@ -14,9 +14,9 @@
 
 [assembly: Guid("6fe2f714-6b3e-4b20-8c70-28bfce084ed2")]
 
-[assembly: AssemblyVersion("7.1.16.0")]
-[assembly: AssemblyFileVersion("7.1.16.0")]
-[assembly: AssemblyInformationalVersion("7.1.16")]
+[assembly: AssemblyVersion("7.1.17.0")]
+[assembly: AssemblyFileVersion("7.1.17.0")]
+[assembly: AssemblyInformationalVersion("7.1.17")]
 
 #if !NETSTANDARD2_0
 [assembly: NUnit.Framework.Timeout(300000)]

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

@@ -213,7 +213,7 @@ private static void FillTextFieldsThenFlattenThenCompare(String testName) {
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 3)]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 5)]
         public virtual void FlattenReadOnly() {
             //Logging is expected since there are duplicate field names
             //isReadOnly should be true after DEVSIX-2156

itext.tests/itext.forms.tests/itext/forms/PdfFormCopyTest.cs

@@ -50,18 +50,18 @@ source product.
 namespace iText.Forms {
     public class PdfFormCopyTest : ExtendedITextTest {
         public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
-            .CurrentContext.TestDirectory) + "/resources/itext/forms/PdfFormFieldsCopyTest/";
+            .CurrentContext.TestDirectory) + "/resources/itext/forms/PdfFormCopyTest/";
 
         public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
-             + "/test/itext/forms/PdfFormFieldsCopyTest/";
+             + "/test/itext/forms/PdfFormCopyTest/";
 
         [NUnit.Framework.OneTimeSetUp]
         public static void BeforeClass() {
             CreateDestinationFolder(destinationFolder);
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 13)]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 32)]
         public virtual void CopyFieldsTest01() {
             String srcFilename1 = sourceFolder + "appearances1.pdf";
             String srcFilename2 = sourceFolder + "fieldsOn2-sPage.pdf";
@@ -256,7 +256,7 @@ public virtual void CopyFieldsTest06() {
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 13)]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 32)]
         public virtual void CopyFieldsTest07() {
             String srcFilename = sourceFolder + "datasheet.pdf";
             String destFilename = destinationFolder + "copyFields07.pdf";
@@ -274,7 +274,7 @@ public virtual void CopyFieldsTest07() {
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 13)]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 32)]
         public virtual void CopyFieldsTest08() {
             String srcFilename1 = sourceFolder + "appearances1.pdf";
             String srcFilename2 = sourceFolder + "fieldsOn2-sPage.pdf";
@@ -296,7 +296,7 @@ public virtual void CopyFieldsTest08() {
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 26)]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 64)]
         public virtual void CopyFieldsTest09() {
             String srcFilename = sourceFolder + "datasheet.pdf";
             String destFilename = destinationFolder + "copyFields09.pdf";
@@ -417,9 +417,9 @@ public virtual void UnnamedFieldsHierarchyTest() {
         [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 51)]
         public virtual void CopyAndEditTextFields() {
             //TODO: update after DEVSIX-2354
-            String srcFileName = sourceFolder + "/checkPdfFormCopy_Source.pdf";
+            String srcFileName = sourceFolder + "checkPdfFormCopy_Source.pdf";
             String destFilename = destinationFolder + "copyAndEditTextFields.pdf";
-            String cmpFileName = sourceFolder + "/cmp_copyAndEditTextFields.pdf";
+            String cmpFileName = sourceFolder + "cmp_copyAndEditTextFields.pdf";
             PdfDocument srcDoc = new PdfDocument(new PdfReader(srcFileName));
             PdfDocument destDoc = new PdfDocument(new PdfWriter(destFilename));
             PdfPageFormCopier pdfPageFormCopier = new PdfPageFormCopier();
@@ -442,9 +442,9 @@ public virtual void CopyAndEditTextFields() {
         [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 51)]
         public virtual void CopyAndEditCheckboxes() {
             //TODO: update after DEVSIX-2354
-            String srcFileName = sourceFolder + "/checkPdfFormCopy_Source.pdf";
+            String srcFileName = sourceFolder + "checkPdfFormCopy_Source.pdf";
             String destFilename = destinationFolder + "copyAndEditCheckboxes.pdf";
-            String cmpFileName = sourceFolder + "/cmp_copyAndEditCheckboxes.pdf";
+            String cmpFileName = sourceFolder + "cmp_copyAndEditCheckboxes.pdf";
             PdfDocument srcDoc = new PdfDocument(new PdfReader(srcFileName));
             PdfDocument destDoc = new PdfDocument(new PdfWriter(destFilename));
             PdfPageFormCopier pdfPageFormCopier = new PdfPageFormCopier();
@@ -465,9 +465,9 @@ public virtual void CopyAndEditCheckboxes() {
         [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 51)]
         public virtual void CopyAndEditRadioButtons() {
             //TODO: update after DEVSIX-2354
-            String srcFileName = sourceFolder + "/checkPdfFormCopy_Source.pdf";
+            String srcFileName = sourceFolder + "checkPdfFormCopy_Source.pdf";
             String destFilename = destinationFolder + "copyAndEditRadioButtons.pdf";
-            String cmpFileName = sourceFolder + "/cmp_copyAndEditRadioButtons.pdf";
+            String cmpFileName = sourceFolder + "cmp_copyAndEditRadioButtons.pdf";
             PdfDocument srcDoc = new PdfDocument(new PdfReader(srcFileName));
             PdfDocument destDoc = new PdfDocument(new PdfWriter(destFilename));
             PdfPageFormCopier pdfPageFormCopier = new PdfPageFormCopier();
@@ -481,5 +481,102 @@ public virtual void CopyAndEditRadioButtons() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destFilename, cmpFileName, destinationFolder
                 , "diff_"));
         }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD)]
+        public virtual void MergeMergedFieldAndMergedFieldTest() {
+            String srcFileName1 = sourceFolder + "fieldMergedWithWidget.pdf";
+            String destFilename = destinationFolder + "mergeMergedFieldAndMergedFieldTest.pdf";
+            String cmpFileName = sourceFolder + "cmp_mergeMergedFieldAndMergedFieldTest.pdf";
+            using (PdfWriter writer = new PdfWriter(destFilename)) {
+                using (PdfDocument resultPdfDocument = new PdfDocument(writer)) {
+                    using (PdfReader reader1 = new PdfReader(srcFileName1)) {
+                        using (PdfDocument sourceDoc1 = new PdfDocument(reader1)) {
+                            PdfAcroForm.GetAcroForm(resultPdfDocument, true);
+                            PdfPageFormCopier formCopier = new PdfPageFormCopier();
+                            sourceDoc1.CopyPagesTo(1, sourceDoc1.GetNumberOfPages(), resultPdfDocument, formCopier);
+                            sourceDoc1.CopyPagesTo(1, sourceDoc1.GetNumberOfPages(), resultPdfDocument, formCopier);
+                        }
+                    }
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destFilename, cmpFileName, destinationFolder
+                , "diff_"));
+        }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, Count = 2)]
+        public virtual void MergeMergedFieldAndTwoWidgetsTest() {
+            String srcFileName1 = sourceFolder + "fieldMergedWithWidget.pdf";
+            String srcFileName2 = sourceFolder + "fieldTwoWidgets.pdf";
+            String destFilename = destinationFolder + "mergeMergedFieldAndTwoWidgetsTest.pdf";
+            String cmpFileName = sourceFolder + "cmp_mergeMergedFieldAndTwoWidgetsTest.pdf";
+            using (PdfWriter writer = new PdfWriter(destFilename)) {
+                using (PdfDocument resultPdfDocument = new PdfDocument(writer)) {
+                    using (PdfReader reader1 = new PdfReader(srcFileName1)) {
+                        using (PdfDocument sourceDoc1 = new PdfDocument(reader1)) {
+                            using (PdfReader reader2 = new PdfReader(srcFileName2)) {
+                                using (PdfDocument sourceDoc2 = new PdfDocument(reader2)) {
+                                    PdfAcroForm.GetAcroForm(resultPdfDocument, true);
+                                    PdfPageFormCopier formCopier = new PdfPageFormCopier();
+                                    sourceDoc1.CopyPagesTo(1, sourceDoc1.GetNumberOfPages(), resultPdfDocument, formCopier);
+                                    sourceDoc2.CopyPagesTo(1, sourceDoc2.GetNumberOfPages(), resultPdfDocument, formCopier);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destFilename, cmpFileName, destinationFolder
+                , "diff_"));
+        }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD)]
+        public virtual void MergeTwoWidgetsAndMergedFieldTest() {
+            String srcFileName1 = sourceFolder + "fieldMergedWithWidget.pdf";
+            String srcFileName2 = sourceFolder + "fieldTwoWidgets.pdf";
+            String destFilename = destinationFolder + "mergeTwoWidgetsAndMergedFieldTest.pdf";
+            String cmpFileName = sourceFolder + "cmp_mergeTwoWidgetsAndMergedFieldTest.pdf";
+            using (PdfWriter writer = new PdfWriter(destFilename)) {
+                using (PdfDocument resultPdfDocument = new PdfDocument(writer)) {
+                    using (PdfReader reader1 = new PdfReader(srcFileName1)) {
+                        using (PdfDocument sourceDoc1 = new PdfDocument(reader1)) {
+                            using (PdfReader reader2 = new PdfReader(srcFileName2)) {
+                                using (PdfDocument sourceDoc2 = new PdfDocument(reader2)) {
+                                    PdfAcroForm.GetAcroForm(resultPdfDocument, true);
+                                    PdfPageFormCopier formCopier = new PdfPageFormCopier();
+                                    sourceDoc2.CopyPagesTo(1, sourceDoc2.GetNumberOfPages(), resultPdfDocument, formCopier);
+                                    sourceDoc1.CopyPagesTo(1, sourceDoc1.GetNumberOfPages(), resultPdfDocument, formCopier);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destFilename, cmpFileName, destinationFolder
+                , "diff_"));
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void MergeTwoWidgetsAndTwoWidgetsTest() {
+            String srcFileName2 = sourceFolder + "fieldTwoWidgets.pdf";
+            String destFilename = destinationFolder + "mergeTwoWidgetsAndTwoWidgetsTest.pdf";
+            String cmpFileName = sourceFolder + "cmp_mergeTwoWidgetsAndTwoWidgetsTest.pdf";
+            using (PdfWriter writer = new PdfWriter(destFilename)) {
+                using (PdfDocument resultPdfDocument = new PdfDocument(writer)) {
+                    using (PdfReader reader2 = new PdfReader(srcFileName2)) {
+                        using (PdfDocument sourceDoc2 = new PdfDocument(reader2)) {
+                            PdfAcroForm.GetAcroForm(resultPdfDocument, true);
+                            PdfPageFormCopier formCopier = new PdfPageFormCopier();
+                            sourceDoc2.CopyPagesTo(1, sourceDoc2.GetNumberOfPages(), resultPdfDocument, formCopier);
+                            sourceDoc2.CopyPagesTo(1, sourceDoc2.GetNumberOfPages(), resultPdfDocument, formCopier);
+                        }
+                    }
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destFilename, cmpFileName, destinationFolder
+                , "diff_"));
+        }
     }
 }