Merge branch 'release/1.1.0.1' into 7.0-master

Author: pavel-alay

itext.tests/itext.cleanup.tests/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("iText Group NV")]
 [assembly: AssemblyProduct("iText")]
-[assembly: AssemblyCopyright("Copyright (c) 1998-2017 iText Group NV")]
+[assembly: AssemblyCopyright("Copyright (c) 1998-2018 iText Group NV")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

itext.tests/itext.cleanup.tests/itext/pdfcleanup/BigDocumentAutoCleanUpTest.cs

@@ -86,7 +86,7 @@ public virtual void RedactLipsum() {
             autoSweep.CleanUp(pdf);
             pdf.Close();
             // compare
-            CompareByContent(cmp, output, outputPath, "diff_redactLipsum_");
+            CompareResults(cmp, output, outputPath, "diff_redactLipsum_");
         }
 
         /// <exception cref="System.IO.IOException"/>
@@ -108,7 +108,7 @@ public virtual void RedactTonySoprano() {
             autoSweep.CleanUp(pdf);
             pdf.Close();
             // compare
-            CompareByContent(cmp, output, outputPath, "diff_redactTonySoprano_");
+            CompareResults(cmp, output, outputPath, "diff_redactTonySoprano_");
         }
 
         /// <exception cref="System.IO.IOException"/>
@@ -126,7 +126,7 @@ public virtual void RedactIPhoneUserManualMatchColor() {
             autoSweep.CleanUp(pdf);
             pdf.Close();
             // compare
-            CompareByContent(cmp, output, outputPath, "diff_redactIPhoneUserManualMatchColor_");
+            CompareResults(cmp, output, outputPath, "diff_redactIPhoneUserManualMatchColor_");
         }
 
         /// <exception cref="System.IO.IOException"/>
@@ -144,12 +144,12 @@ public virtual void RedactIPhoneUserManual() {
             autoSweep.CleanUp(pdf);
             pdf.Close();
             // compare
-            CompareByContent(cmp, output, outputPath, "diff_redactIPhoneUserManual_");
+            CompareResults(cmp, output, outputPath, "diff_redactIPhoneUserManual_");
         }
 
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
-        private void CompareByContent(String cmp, String output, String targetDir, String diffPrefix) {
+        private void CompareResults(String cmp, String output, String targetDir, String diffPrefix) {
             CompareTool cmpTool = new CompareTool();
             String errorMessage = cmpTool.CompareVisually(output, cmp, targetDir, diffPrefix + "_");
             if (errorMessage != null) {

itext.tests/itext.cleanup.tests/itext/pdfcleanup/PdfCleanUpToolTest.cs

@@ -504,6 +504,71 @@ public virtual void CleanUpTest39() {
             CompareByContent(cmp, output, outputPath, "diff_39");
         }
 
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void CleanUpTest40() {
+            String input = inputPath + "emptyTj01.pdf";
+            String output = outputPath + "emptyTj01.pdf";
+            String cmp = inputPath + "cmp_emptyTj01.pdf";
+            IList<PdfCleanUpLocation> cleanUpLocations = iText.IO.Util.JavaUtil.ArraysAsList(new PdfCleanUpLocation(1, 
+                new Rectangle(70f, 555f, 200f, 5f), ColorConstants.ORANGE));
+            CleanUp(input, output, cleanUpLocations);
+            CompareByContent(cmp, output, outputPath, "diff_40");
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void CleanUpTest41() {
+            String input = inputPath + "newLines01.pdf";
+            String output = outputPath + "newLines01.pdf";
+            String cmp = inputPath + "cmp_newLines01.pdf";
+            IList<PdfCleanUpLocation> cleanUpLocations = iText.IO.Util.JavaUtil.ArraysAsList(new PdfCleanUpLocation(1, 
+                new Rectangle(70f, 555f, 200f, 10f), ColorConstants.ORANGE));
+            CleanUp(input, output, cleanUpLocations);
+            CompareByContent(cmp, output, outputPath, "diff_41");
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void CleanUpTest42() {
+            String input = inputPath + "newLines02.pdf";
+            String output = outputPath + "newLines02.pdf";
+            String cmp = inputPath + "cmp_newLines02.pdf";
+            IList<PdfCleanUpLocation> cleanUpLocations = iText.IO.Util.JavaUtil.ArraysAsList(new PdfCleanUpLocation(1, 
+                new Rectangle(36f, 733f, 270f, 5f), ColorConstants.ORANGE));
+            CleanUp(input, output, cleanUpLocations);
+            CompareByContent(cmp, output, outputPath, "diff_42");
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void CleanUpTest43() {
+            String input = inputPath + "newLines03.pdf";
+            String output = outputPath + "newLines03.pdf";
+            String cmp = inputPath + "cmp_newLines03.pdf";
+            IList<PdfCleanUpLocation> cleanUpLocations = iText.IO.Util.JavaUtil.ArraysAsList(new PdfCleanUpLocation(1, 
+                new Rectangle(36f, 733f, 230f, 5f), ColorConstants.ORANGE));
+            CleanUp(input, output, cleanUpLocations);
+            CompareByContent(cmp, output, outputPath, "diff_43");
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void CleanUpTest44() {
+            String input = inputPath + "emptyTj02.pdf";
+            String output = outputPath + "emptyTj02.pdf";
+            String cmp = inputPath + "cmp_emptyTj02.pdf";
+            IList<PdfCleanUpLocation> cleanUpLocations = iText.IO.Util.JavaUtil.ArraysAsList(new PdfCleanUpLocation(1, 
+                new Rectangle(70f, 565f, 200f, 5f), ColorConstants.ORANGE));
+            CleanUp(input, output, cleanUpLocations);
+            CompareByContent(cmp, output, outputPath, "diff_44");
+        }
+
         /// <exception cref="System.IO.IOException"/>
         private void CleanUp(String input, String output, IList<PdfCleanUpLocation> cleanUpLocations) {
             PdfDocument pdfDocument = new PdfDocument(new PdfReader(input), new PdfWriter(output));