Merge branch 'release/2.0.0'

Author: pavel-alay

itext.tests/itext.html2pdf.tests/Properties/AssemblyInfo.cs

@@ -15,9 +15,9 @@
 
 [assembly: Guid("ae4e5743-0665-4705-9a33-07ea57cdd269")]
 
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
-[assembly: AssemblyInformationalVersion("1.0.2")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

itext.tests/itext.html2pdf.tests/itext.html2pdf.tests.csproj

@@ -41,7 +41,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="org\jsoup\**\*.cs" />
     <Compile Include="itext\html2pdf\**\*.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

itext.tests/itext.html2pdf.tests/itext/html2pdf/BackgroundTest.cs

@@ -0,0 +1,72 @@
+/*
+This file is part of the iText (R) project.
+Copyright (c) 1998-2017 iText Group NV
+Authors: iText Software.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License version 3
+as published by the Free Software Foundation with the addition of the
+following permission added to Section 15 as permitted in Section 7(a):
+FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
+OF THIRD PARTY RIGHTS
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, see http://www.gnu.org/licenses or write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA, 02110-1301 USA, or download the license from the following URL:
+http://itextpdf.com/terms-of-use/
+
+The interactive user interfaces in modified source and object code versions
+of this program must display Appropriate Legal Notices, as required under
+Section 5 of the GNU Affero General Public License.
+
+In accordance with Section 7(b) of the GNU Affero General Public License,
+a covered work must retain the producer line in every PDF that is created
+or manipulated using iText.
+
+You can be released from the requirements of the license by purchasing
+a commercial license. Buying such a license is mandatory as soon as you
+develop commercial activities involving the iText software without
+disclosing the source code of your own applications.
+These activities include: offering paid services to customers as an ASP,
+serving PDFs on the fly in a web application, shipping iText with a closed
+source product.
+
+For more information, please contact iText Software Corp. at this
+address: [email protected]
+*/
+using System;
+using System.IO;
+using iText.Kernel.Utils;
+using iText.Test;
+
+namespace iText.Html2pdf {
+    public class BackgroundTest : ExtendedITextTest {
+        public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/BackgroundTest/";
+
+        public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+             + "/test/itext/html2pdf/css/BackgroundTest/";
+
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            CreateDestinationFolder(destinationFolder);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [NUnit.Framework.Ignore("DEVSIX-1708")]
+        public virtual void BackgroundSizeTest01() {
+            HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "backgroundsize01.html"), new FileInfo(destinationFolder
+                 + "backgroundsize01.pdf"));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + "backgroundsize01.pdf"
+                , sourceFolder + "cmp_backgroundsize01.pdf", destinationFolder, "diff01_"));
+        }
+    }
+}

itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2ElementsTest.cs

@@ -42,6 +42,7 @@ source product.
 */
 using System;
 using System.Collections.Generic;
+using iText.Html2pdf.Attach.Impl;
 using iText.Layout.Element;
 using iText.Layout.Properties;
 using iText.Test;
@@ -65,7 +66,7 @@ public virtual void HtmlToElementsTest01() {
             NUnit.Framework.Assert.IsTrue(lst[0] is Paragraph);
             Paragraph p = (Paragraph)lst[0];
             NUnit.Framework.Assert.AreEqual("Hello world!", ((Text)p.GetChildren()[0]).GetText());
-            NUnit.Framework.Assert.AreEqual(12f, (float)(Object)p.GetProperty<float?>(Property.FONT_SIZE), 1e-10);
+            NUnit.Framework.Assert.AreEqual(12f, p.GetProperty<UnitValue>(Property.FONT_SIZE).GetValue(), 1e-10);
         }
 
         /// <exception cref="System.IO.IOException"/>
@@ -79,7 +80,7 @@ public virtual void HtmlToElementsTest02() {
             NUnit.Framework.Assert.AreEqual(2, t.GetNumberOfRows());
             NUnit.Framework.Assert.AreEqual("123", ((Text)(((Paragraph)t.GetCell(0, 0).GetChildren()[0]).GetChildren()
                 [0])).GetText());
-            NUnit.Framework.Assert.AreEqual(24f, (float)(Object)t.GetProperty<float?>(Property.FONT_SIZE), 1e-10);
+            NUnit.Framework.Assert.AreEqual(24f, t.GetProperty<UnitValue>(Property.FONT_SIZE).GetValue(), 1e-10);
         }
 
         /// <exception cref="System.IO.IOException"/>
@@ -147,5 +148,25 @@ public virtual void HtmlToElementsTest08() {
             String html = "<html><p>Hello world!</p><meta name=\"author\" content=\"Bruno\"><table><tr><td>123</td><td><456></td></tr><tr><td>Long cell</td></tr></table><p>Hello world!</p></html>";
             HtmlConverter.ConvertToElements(html);
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        [NUnit.Framework.Test]
+        public virtual void HtmlToElementsTest09() {
+            //Test OutlineHandler exception throwing
+            /*
+            Outlines require a PdfDocument, and OutlineHandler is based around its availability
+            Any convert to elements workflow of course doesn't have a PdfDocument.
+            Instead of throwing an NPE when trying it, the OutlineHandler will check for the existence of a pdfDocument
+            If no PdfDocument is found, the handler will do nothing silently
+            */
+            String html = "<html><p>Hello world!</p><meta name=\"author\" content=\"Bruno\"><table><tr><td>123</td><td><456></td></tr><tr><td>Long cell</td></tr></table><p>Hello world!</p></html>";
+            ConverterProperties props = new ConverterProperties();
+            OutlineHandler outlineHandler = new OutlineHandler();
+            outlineHandler.PutTagPriorityMapping("h1", 1);
+            outlineHandler.PutTagPriorityMapping("h3", 2);
+            outlineHandler.PutTagPriorityMapping("p", 3);
+            props.SetOutlineHandler(outlineHandler);
+            HtmlConverter.ConvertToElements(html);
+        }
     }
 }

itext.tests/itext.html2pdf.tests/itext/html2pdf/ResourceResolverTest.cs

@@ -49,13 +49,16 @@ source product.
 using iText.Kernel;
 using iText.Test;
 using iText.Test.Attributes;
+using NUnit.Framework;
 
 namespace iText.Html2pdf {
     public class ResourceResolverTest : ExtendedITextTest {
-        public static readonly String sourceFolder = TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext.CurrentContext.TestDirectory) + "/resources/itext/html2pdf/ResourceResolverTest/";
+        public static readonly String sourceFolder =
+            TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext.CurrentContext.TestDirectory) +
+            "/resources/itext/html2pdf/ResourceResolverTest/";
 
         public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
-             + "/test/itext/html2pdf/ResourceResolverTest/";
+                                                          + "/test/itext/html2pdf/ResourceResolverTest/";
 
         [NUnit.Framework.OneTimeSetUp]
         public static void BeforeClass() {
@@ -70,71 +73,149 @@ public virtual void ResourceResolverTest03() {
             String outPdf = destinationFolder + "resourceResolverTest03.pdf";
             String cmpPdf = sourceFolder + "cmp_resourceResolverTest03.pdf";
 
-            using (FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest03.html", FileMode.Open, FileAccess.Read),
-                fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
-                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream, new ConverterProperties().SetBaseUri(baseUri));
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff03_"
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest03.html", FileMode.Open,
+                        FileAccess.Read),
+                    fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri(baseUri));
+                NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder,
+                    "diff03_"
                 ));
             }
         }
-        
+
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
-        public virtual void ResourceResolverTest07()
-        {
+        public virtual void ResourceResolverTest07() {
             String outPdf = destinationFolder + "resourceResolverTest07.pdf";
             String cmpPdf = sourceFolder + "cmp_resourceResolverTest07.pdf";
             HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "resourceResolverTest07.html"), new FileInfo(outPdf
             ));
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff07_"
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder,
+                "diff07_"
             ));
         }
 
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
-        public virtual void ResourceResolverTest09()
-        {
+        public virtual void ResourceResolverTest09() {
             String outPdf = destinationFolder + "resourceResolverTest09.pdf";
             String cmpPdf = sourceFolder + "cmp_resourceResolverTest09.pdf";
             HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "resourceResolverTest09.html"), new FileInfo(outPdf
             ));
-            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff09_"
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder,
+                "diff09_"
             ));
         }
 
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
-        public virtual void ResourceResolverTest10()
-        {
+        public virtual void ResourceResolverTest10() {
             String outPdf = destinationFolder + "resourceResolverTest10.pdf";
             String cmpPdf = sourceFolder + "cmp_resourceResolverTest10.pdf";
-            using (FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest10.html", FileMode.Open, FileAccess.Read),
-                fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
-                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream, new ConverterProperties().SetBaseUri("%homepath%"));
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest10.html", FileMode.Open,
+                        FileAccess.Read),
+                    fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri("%homepath%"));
                 NUnit.Framework.Assert.IsNull(
                     new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff10_"));
-            } 
+            }
         }
 
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
-        public virtual void ResourceResolverTest11()
-        {
+        public virtual void ResourceResolverTest11() {
             String outPdf = destinationFolder + "resourceResolverTest11.pdf";
             String cmpPdf = sourceFolder + "cmp_resourceResolverTest11.pdf";
-            using (FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest11.html", FileMode.Open, FileAccess.Read),
-                fileOutputStream = new FileStream(outPdf, FileMode.Create))
-            {
-                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream, new ConverterProperties().SetBaseUri("https://en.wikipedia.org/wiki/Welsh_Corgi"));
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest11.html", FileMode.Open,
+                        FileAccess.Read),
+                    fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri("https://en.wikipedia.org/wiki/Welsh_Corgi"));
                 NUnit.Framework.Assert.IsNull(
                     new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff11_"));
             }
         }
 
+        [NUnit.Framework.Test]
+        [Ignore("DEVSIX-1668")]
+        public void ResourceResolverTest12() {
+            String baseUri = sourceFolder + "path with spaces";
+
+            String outPdf = destinationFolder + "resourceResolverTest12.pdf";
+            String cmpPdf = sourceFolder + "cmp_resourceResolverTest12.pdf";
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12.html", FileMode.Open,
+                        FileAccess.Read),
+                    fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri(baseUri));
+                NUnit.Framework.Assert.IsNull(
+                    new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff12_"));
+            }
+        }
+
+        [NUnit.Framework.Test]
+        public void ResourceResolverTest13() {
+            String baseUri = sourceFolder;
+
+            String outPdf = destinationFolder + "resourceResolverTest13.pdf";
+            String cmpPdf = sourceFolder + "cmp_resourceResolverTest13.pdf";
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest13.html", FileMode.Open,
+                        FileAccess.Read),
+                    fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri(baseUri));
+                NUnit.Framework.Assert.IsNull(
+                    new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff13_"));
+            }
+        }
+
+        [NUnit.Framework.Test]
+        [Ignore("DEVSIX-1668")]
+        public void ResourceResolverTest14() {
+            String baseUri = sourceFolder + "path%20with%20spaces";
+
+            String outPdf = destinationFolder + "resourceResolverTest14.pdf";
+            String cmpPdf = sourceFolder + "cmp_resourceResolverTest14.pdf";
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest12.html", FileMode.Open,
+                        FileAccess.Read),
+                    fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri(baseUri));
+                NUnit.Framework.Assert.IsNull(
+                    new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff14_"));
+            }
+        }
+
+        [NUnit.Framework.Test]
+
+        public void ResourceResolverTest15() {
+            String baseUri = sourceFolder;
+
+            String outPdf = destinationFolder + "resourceResolverTest15.pdf";
+            String cmpPdf = sourceFolder + "cmp_resourceResolverTest15.pdf";
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest15.html", FileMode.Open,
+                        FileAccess.Read),
+                    fileOutputStream = new FileStream(outPdf, FileMode.Create)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri(baseUri));
+                NUnit.Framework.Assert.IsNull(
+                    new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff15_"));
+            }
+        }
+
 
         // TODO test with absolute http links for resources?
         // TODO test with http base URI?