Merge branch 'release/7.0.4'

Author: pavel-alay

CONTRIBUTING.md

@@ -169,6 +169,8 @@ We have guidelines on how our git commit messages should be formatted. This lead
 readable messages** that are easy to follow when looking through the **project history**. But also,
 we use the git commit messages to **generate the iText 7 Community change log**.
 
+These guidelines were taken from Chris Beams' blog post [How to Write a Git Commit Message][git-commit].
+
 ### Commit Message Format
 Each commit message consists of a **subject**, a **body** and a **footer**:
 
@@ -180,23 +182,24 @@ Each commit message consists of a **subject**, a **body** and a **footer**:
 <footer>
 ```
 
-Any line of the commit message should not be longer 70 characters! This allows the message to be easier
+Any line of the commit message should not be longer 72 characters! This allows the message to be easier
 to read on GitHub as well as in various git tools.
 
 ### Subject
 The subject contains succinct description of the change:
 
-* use the imperative, present tense: "change" not "changed" nor "changes"
-* don't capitalize first letter
-* no dot (.) at the end
-* describe what the **change** does, not the actions the developer has done
+* [Separate subject from body with a blank line][git-commit-separate]
+* [Limit the subject line to 50 characters][git-commit-limit-50]
+* [Capitalize the subject line][git-commit-capitalize]
+* [Do not end the subject line with a period][git-commit-end]
+* [Use the imperative mood in the subject line][git-commit-imperative]
 
 ### Body
-Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
-The body should include the motivation for the change and contrast this with previous behavior.
+* [Wrap the body at 72 characters][git-commit-wrap-72]
+* [Use the body to explain _what_ and _why_ vs. _how_][git-commit-why-not-how]
 
 ### Footer
-The footer should contain any information about **Breaking Changes** and is also the place to
+The footer contains any information about **Breaking Changes** and is also the place to
 reference JIRA or GitHub issues that this commit **Closes**.
 
 
@@ -228,3 +231,11 @@ We use the [Stack Exchange][stackoverflow] network for free support and [GitHub]
 [mcve]: http://stackoverflow.com/help/mcve
 [support]: http://itextpdf.com/support
 [unit-testing]: http://junit.org/
+[git-commit]: https://chris.beams.io/posts/git-commit/
+[git-commit-separate]: https://chris.beams.io/posts/git-commit/#separate
+[git-commit-limit-50]: https://chris.beams.io/posts/git-commit/#limit-50
+[git-commit-capitalize]: https://chris.beams.io/posts/git-commit/#capitalize
+[git-commit-end]: https://chris.beams.io/posts/git-commit/#end
+[git-commit-imperative]: https://chris.beams.io/posts/git-commit/#imperative
+[git-commit-wrap-72]: https://chris.beams.io/posts/git-commit/#wrap-72
+[git-commit-why-not-how]: https://chris.beams.io/posts/git-commit/#why-not-how

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

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

itext.tests/itext.barcodes.tests/itext/barcodes/BarcodeDataMatrixTest.cs

@@ -95,5 +95,85 @@ public virtual void Barcode02Test() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + filename, sourceFolder
                  + "cmp_" + filename, destinationFolder, "diff_"));
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="iText.Kernel.PdfException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void Barcode03Test() {
+            String filename = "barcodeDataMatrix3.pdf";
+            PdfWriter writer = new PdfWriter(destinationFolder + filename);
+            PdfDocument document = new PdfDocument(writer);
+            PdfPage page1 = document.AddNewPage();
+            PdfCanvas canvas = new PdfCanvas(page1);
+            BarcodeDataMatrix barcode3 = new BarcodeDataMatrix();
+            barcode3.SetWidth(36);
+            barcode3.SetHeight(12);
+            barcode3.SetCode("AbcdFFghijklmnopqrstuWXSQ");
+            barcode3.PlaceBarcode(canvas, Color.BLACK, 10);
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + filename, sourceFolder
+                 + "cmp_" + filename, destinationFolder, "diff_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="iText.Kernel.PdfException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void Barcode04Test() {
+            String filename = "barcodeDataMatrix4.pdf";
+            PdfWriter writer = new PdfWriter(destinationFolder + filename);
+            PdfDocument document = new PdfDocument(writer);
+            PdfPage page1 = document.AddNewPage();
+            PdfCanvas canvas = new PdfCanvas(page1);
+            BarcodeDataMatrix barcode3 = new BarcodeDataMatrix();
+            barcode3.SetWidth(36);
+            barcode3.SetHeight(12);
+            barcode3.SetCode("01AbcdefgAbcdefg123451231231234");
+            barcode3.PlaceBarcode(canvas, Color.BLACK, 10);
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + filename, sourceFolder
+                 + "cmp_" + filename, destinationFolder, "diff_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="iText.Kernel.PdfException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void Barcode05Test() {
+            String filename = "barcodeDataMatrix5.pdf";
+            PdfWriter writer = new PdfWriter(destinationFolder + filename);
+            PdfDocument document = new PdfDocument(writer);
+            PdfPage page1 = document.AddNewPage();
+            PdfCanvas canvas = new PdfCanvas(page1);
+            BarcodeDataMatrix barcode3 = new BarcodeDataMatrix();
+            barcode3.SetWidth(40);
+            barcode3.SetHeight(40);
+            barcode3.SetCode("aaabbbcccdddAAABBBAAABBaaabbbcccdddaaa");
+            barcode3.PlaceBarcode(canvas, Color.BLACK, 10);
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + filename, sourceFolder
+                 + "cmp_" + filename, destinationFolder, "diff_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="iText.Kernel.PdfException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void Barcode06Test() {
+            String filename = "barcodeDataMatrix6.pdf";
+            PdfWriter writer = new PdfWriter(destinationFolder + filename);
+            PdfDocument document = new PdfDocument(writer);
+            PdfPage page1 = document.AddNewPage();
+            PdfCanvas canvas = new PdfCanvas(page1);
+            BarcodeDataMatrix barcode3 = new BarcodeDataMatrix();
+            barcode3.SetWidth(36);
+            barcode3.SetHeight(12);
+            barcode3.SetCode(">>>\r>>>THIS VERY TEXT>>\r>");
+            barcode3.PlaceBarcode(canvas, Color.BLACK, 10);
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + filename, sourceFolder
+                 + "cmp_" + filename, destinationFolder, "diff_"));
+        }
     }
 }

itext.tests/itext.barcodes.tests/resources/itext/barcodes/cmp_barcodeDataMatrix3.pdf

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

itext.tests/itext.barcodes.tests/resources/itext/barcodes/cmp_barcodeDataMatrix4.pdf

@@ -48,6 +48,7 @@ source product.
 using iText.Kernel.Pdf;
 using iText.Kernel.Utils;
 using iText.Test;
+using iText.Test.Attributes;
 
 namespace iText.Forms {
     public class PdfFormFieldTest : ExtendedITextTest {
@@ -114,6 +115,29 @@ public virtual void FormFieldTest03() {
             }
         }
 
+        /// <exception cref="System.IO.IOException"/>
+        [NUnit.Framework.Test]
+        public virtual void UnicodeFormFieldTest() {
+            String filename = sourceFolder + "unicodeFormFieldFile.pdf";
+            PdfDocument pdfDoc = new PdfDocument(new PdfReader(filename));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            IDictionary<String, PdfFormField> formFields = form.GetFormFields();
+            String fieldName = "\u5E10\u53F71";
+            // 帐号1: account number 1
+            NUnit.Framework.Assert.AreEqual(fieldName, formFields.Keys.ToArray(new String[1])[0]);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        [NUnit.Framework.Test]
+        public virtual void UnicodeFormFieldTest2() {
+            String filename = sourceFolder + "unicodeFormFieldFile.pdf";
+            PdfDocument pdfDoc = new PdfDocument(new PdfReader(filename));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            String fieldName = "\u5E10\u53F71";
+            // 帐号1: account number 1
+            NUnit.Framework.Assert.IsNotNull(form.GetField(fieldName));
+        }
+
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
@@ -279,5 +303,24 @@ public virtual void AutoScaleFontSizeInFormFields() {
                 NUnit.Framework.Assert.Fail(errorMessage);
             }
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.NO_FIELDS_IN_ACROFORM)]
+        public virtual void AcroFieldDictionaryNoFields() {
+            String outPdf = destinationFolder + "acroFieldDictionaryNoFields.pdf";
+            String cmpPdf = sourceFolder + "cmp_acroFieldDictionaryNoFields.pdf";
+            PdfWriter writer = new PdfWriter(outPdf);
+            PdfReader reader = new PdfReader(sourceFolder + "acroFieldDictionaryNoFields.pdf");
+            PdfDocument pdfDoc = new PdfDocument(reader, writer);
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            pdfDoc.Close();
+            CompareTool compareTool = new CompareTool();
+            String errorMessage = compareTool.CompareByContent(outPdf, cmpPdf, destinationFolder, "diff_");
+            if (errorMessage != null) {
+                NUnit.Framework.Assert.Fail(errorMessage);
+            }
+        }
     }
 }