Support of SVG tag when using HtmlConverter#convertToElements

DEVSIX-3891

Autoported commit.
Original commit hash: [19c929300]

Author: AnhelinaM

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

@@ -159,8 +159,7 @@ Any convert to elements workflow of course doesn't have a PdfDocument.
         [NUnit.Framework.Test]
         [LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI
             , Count = 1)]
-        [LogMessage(Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER, Count = 1)]
-        [LogMessage(Html2PdfLogMessageConstant.PDF_DOCUMENT_NOT_PRESENT, Count = 1)]
+        [LogMessage(Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER)]
         public virtual void HtmlObjectMalformedUrlTest() {
             String html = "<object data ='htt://as' type='image/svg+xml'></object>";
             IList<IElement> lst = HtmlConverter.ConvertToElements(html);
@@ -279,14 +278,66 @@ public virtual void ConvertToElementsAndCreateTwoDocumentsTest() {
         }
 
         [NUnit.Framework.Test]
-        //TODO: DEVSIX-3891 change the Assert after supporting the svg tag
-        [LogMessage(Html2PdfLogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER, LogLevel = LogLevelConstants
-            .ERROR)]
         public virtual void HtmlToElementsSvgTest() {
             String html = "<svg height=\"100\" width=\"100\">" + "<circle cx=\"50\" cy=\"50\" r=\"40\" stroke=\"black\" stroke-width=\"3\" fill=\"red\" />"
                  + "</svg>";
+            String cmpPdf = sourceFolder + "cmp_htmlToElementsSvg.pdf";
+            String outPdf = destinationFolder + "htmlToElementsSvg.pdf";
             IList<IElement> lst = HtmlConverter.ConvertToElements(html);
-            NUnit.Framework.Assert.AreEqual(0, lst.Count);
+            NUnit.Framework.Assert.AreEqual(1, lst.Count);
+            using (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) {
+                foreach (IElement element in lst) {
+                    document.Add((Image)element);
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder));
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void HtmlToElementsSvgInTheTableTest() {
+            String html = "<table style=\"border: 1pt solid black\">\n" + "  <tr>\n" + "     <td>\n" + "        <svg height=\"100\" width=\"100\">\n"
+                 + "          <circle cx=\"50\" cy=\"50\" r=\"40\" stroke=\"black\" stroke-width=\"3\" fill=\"red\" />\n"
+                 + "        </svg>\n" + "     </td>\n" + "     <td>\n" + "        test\n" + "     </td>\n" + "  </tr>\n"
+                 + "</table>";
+            String cmpPdf = sourceFolder + "cmp_htmlToElementsSvgInTheTable.pdf";
+            String outPdf = destinationFolder + "htmlToElementsSvgInTheTable.pdf";
+            IList<IElement> elements = HtmlConverter.ConvertToElements(html);
+            using (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) {
+                foreach (IElement element in elements) {
+                    document.Add((IBlockElement)element);
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder));
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void HtmlToElementsSvgImgTest() {
+            String html = "<img src=\"lines.svg\" height=\"500\" width=\"500\"/>";
+            String cmpPdf = sourceFolder + "cmp_htmlToElementsSvgImg.pdf";
+            String outPdf = destinationFolder + "htmlToElementsSvgImg.pdf";
+            IList<IElement> elements = HtmlConverter.ConvertToElements(html, new ConverterProperties().SetBaseUri(sourceFolder
+                ));
+            using (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) {
+                foreach (IElement element in elements) {
+                    document.Add((IBlockElement)element);
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder));
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void HtmlToElementsSvgObjectTest() {
+            String html = "<object data ='lines.svg' type='image/svg+xml'></object>";
+            String cmpPdf = sourceFolder + "cmp_htmlToElementsSvgObject.pdf";
+            String outPdf = destinationFolder + "htmlToElementsSvgObject.pdf";
+            IList<IElement> elements = HtmlConverter.ConvertToElements(html, new ConverterProperties().SetBaseUri(sourceFolder
+                ));
+            using (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) {
+                foreach (IElement element in elements) {
+                    document.Add((Image)element);
+                }
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder));
         }
 
         private static void AddElementsToDocument(Document document, IList<IElement> elements) {

itext.tests/itext.html2pdf.tests/itext/html2pdf/resolver/resource/HtmlResourceResolverTest.cs

@@ -32,6 +32,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Kernel.Pdf;
 using iText.Kernel.Pdf.Xobject;
 using iText.Kernel.Utils;
+using iText.Layout;
 using iText.Svg;
 using iText.Svg.Converter;
 using iText.Svg.Exceptions;
@@ -198,8 +199,6 @@ public virtual void ResourceResolverHtmlWithSvgDifferentLevels() {
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI
-            )]
         public virtual void AttemptToProcessBySvgProcessingUtilSvgWithImageTest() {
             // TODO review this test in the scope of DEVSIX-4107
             String fileName = "svgWithImage.svg";
@@ -209,21 +208,19 @@ public virtual void AttemptToProcessBySvgProcessingUtilSvgWithImageTest() {
             ISvgProcessorResult res = SvgConverter.ParseAndProcess(resourceResolver.RetrieveResourceAsInputStream(fileName
                 ), svgConverterProperties);
             ISvgNodeRenderer imageRenderer = ((SvgTagSvgNodeRenderer)res.GetRootRenderer()).GetChildren()[0];
-            // Remove the previous result of the resource resolving in order to demonstrate that the resource will not be
-            // resolved due to not setting of baseUri in the SvgProcessingUtil#createXObjectFromProcessingResult method.
-            imageRenderer.SetAttribute(SvgConstants.Attributes.XLINK_HREF, "doggo.jpg");
+            // Remove the previous result of the resource resolving in order to demonstrate that the resource will be
+            // resolved due to setting of baseUri in the SvgProcessingUtil#createXObjectFromProcessingResult method.
+            imageRenderer.SetAttribute(SvgConstants.Attributes.XLINK_HREF, "res/itextpdf.com/doggo.jpg");
             SvgProcessingUtil processingUtil = new SvgProcessingUtil(resourceResolver);
-            PdfDocument pdfDocument = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
-            PdfFormXObject pdfFormXObject = processingUtil.CreateXObjectFromProcessingResult(res, pdfDocument);
+            PdfDocument document = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+            PdfFormXObject pdfFormXObject = processingUtil.CreateXObjectFromProcessingResult(res, document);
             PdfDictionary resources = (PdfDictionary)pdfFormXObject.GetResources().GetPdfObject().Get(PdfName.XObject);
             PdfDictionary fm1Dict = (PdfDictionary)resources.Get(new PdfName("Fm1"));
-            NUnit.Framework.Assert.IsFalse(((PdfDictionary)fm1Dict.Get(PdfName.Resources)).ContainsKey(PdfName.XObject
-                ));
+            NUnit.Framework.Assert.IsTrue(((PdfDictionary)fm1Dict.Get(PdfName.Resources)).ContainsKey(PdfName.XObject)
+                );
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI
-            )]
         public virtual void AttemptToProcessBySvgProcessingUtilSvgWithSvgTest() {
             // TODO review this test in the scope of DEVSIX-4107
             String fileName = "svgWithSvg.svg";
@@ -233,23 +230,45 @@ public virtual void AttemptToProcessBySvgProcessingUtilSvgWithSvgTest() {
             ISvgProcessorResult res = SvgConverter.ParseAndProcess(resourceResolver.RetrieveResourceAsInputStream(fileName
                 ), svgConverterProperties);
             ISvgNodeRenderer imageRenderer = ((SvgTagSvgNodeRenderer)res.GetRootRenderer()).GetChildren()[1];
-            // Remove the previous result of the resource resolving in order to demonstrate that the resource will not be
-            // resolved due to not setting of baseUri in the SvgProcessingUtil#createXObjectFromProcessingResult method.
-            // But even if set baseUri in the SvgProcessingUtil#createXObjectFromProcessingResult method, the SVG will not
-            // be processed, because in the createXObjectFromProcessingResult method we create ResourceResolver, not HtmlResourceResolver.
-            imageRenderer.SetAttribute(SvgConstants.Attributes.XLINK_HREF, "res\\itextpdf.com\\lines.svg");
+            // Remove the previous result of the resource resolving in order to demonstrate that the resource will be
+            // resolved due to setting of baseUri in the SvgProcessingUtil#createXObjectFromProcessingResult method.
+            imageRenderer.SetAttribute(SvgConstants.Attributes.XLINK_HREF, "res/itextpdf.com/lines.svg");
             SvgProcessingUtil processingUtil = new SvgProcessingUtil(resourceResolver);
-            PdfDocument pdfDocument = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
-            PdfFormXObject pdfFormXObject = processingUtil.CreateXObjectFromProcessingResult(res, pdfDocument);
+            PdfDocument document = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()));
+            PdfFormXObject pdfFormXObject = processingUtil.CreateXObjectFromProcessingResult(res, document);
             PdfDictionary resources = (PdfDictionary)pdfFormXObject.GetResources().GetPdfObject().Get(PdfName.XObject);
             PdfDictionary fm1Dict = (PdfDictionary)resources.Get(new PdfName("Fm1"));
-            NUnit.Framework.Assert.IsFalse(((PdfDictionary)fm1Dict.Get(PdfName.Resources)).ContainsKey(PdfName.XObject
-                ));
+            NUnit.Framework.Assert.IsTrue(((PdfDictionary)fm1Dict.Get(PdfName.Resources)).ContainsKey(PdfName.XObject)
+                );
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void SvgInsideSvgTest() {
+            String svgFileName = "svgInsideSvg.svg";
+            String cmpFileName = SOURCE_FOLDER + "cmp_svgInsideSvg.pdf";
+            String outFileName = DESTINATION_FOLDER + "svgInsideSvg.pdf";
+            using (Document document = new Document(new PdfDocument(new PdfWriter(outFileName)))) {
+                ProcessorContext context = new ProcessorContext(new ConverterProperties());
+                HtmlResourceResolver resourceResolver = new HtmlResourceResolver(SOURCE_FOLDER, context);
+                ISvgConverterProperties svgConverterProperties = ContextMappingHelper.MapToSvgConverterProperties(context);
+                ISvgProcessorResult result = SvgConverter.ParseAndProcess(resourceResolver.RetrieveResourceAsInputStream(svgFileName
+                    ), svgConverterProperties);
+                ISvgNodeRenderer imageRenderer = ((SvgTagSvgNodeRenderer)result.GetRootRenderer()).GetChildren()[0];
+                ISvgNodeRenderer svgRenderer = ((SvgTagSvgNodeRenderer)result.GetRootRenderer()).GetChildren()[2];
+                // Remove the previous result of the resource resolving in order to demonstrate that the resource will be
+                // resolved due to setting of baseUri in the SvgProcessingUtil#createXObjectFromProcessingResult method.
+                // TODO DEVSIX-4107 However the SVG will not be displayed since it is expected to be drawn during
+                //  HtmlResourceResolver#processAsSvg call, but document is null, so SvgProcessingUtil#
+                //  createSvgImageFromProcessingResult method is called instead of createXObjectFromProcessingResult.
+                imageRenderer.SetAttribute(SvgConstants.Attributes.XLINK_HREF, "res/itextpdf.com/doggo.jpg");
+                svgRenderer.SetAttribute(SvgConstants.Attributes.XLINK_HREF, "res/itextpdf.com/lines.svg");
+                document.Add(new SvgProcessingUtil(resourceResolver).CreateSvgImageFromProcessingResult(result));
+            }
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFileName, cmpFileName, DESTINATION_FOLDER
+                , "diff"));
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI
-            )]
         public virtual void ResourceResolverSvgEmbeddedSvg() {
             // TODO review this test in the scope of DEVSIX-4107
             String outPdf = DESTINATION_FOLDER + "resourceResolverSvgEmbeddedSvg.pdf";
@@ -259,8 +278,6 @@ public virtual void ResourceResolverSvgEmbeddedSvg() {
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI
-            )]
         public virtual void ResourceResolverObjectWithSvgEmbeddedSvg() {
             // TODO review this test in the scope of DEVSIX-4107
             String outPdf = DESTINATION_FOLDER + "resourceResolverObjectWithSvgEmbeddedSvg.pdf";