Create convenience methods for SvgConverter

DEVSIX-2049

Author: pkjuak

src/main/java/com/itextpdf/svg/converter/SvgConverter.java

@@ -43,9 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.svg.processors;
 
 import com.itextpdf.layout.font.FontProvider;
-import com.itextpdf.styledxmlparser.css.ICssResolver;
 import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
-import com.itextpdf.styledxmlparser.resolver.resource.ResourceResolver;
 import com.itextpdf.svg.converter.SvgConverter;
 import com.itextpdf.svg.renderers.factories.ISvgNodeRendererFactory;
 import java.nio.charset.Charset;

src/main/java/com/itextpdf/svg/processors/ISvgConverterProperties.java

@@ -61,7 +61,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.svg.renderers.impl.NoDrawOperationSvgNodeRenderer;
 import com.itextpdf.svg.renderers.impl.TextSvgNodeRenderer;
 import com.itextpdf.svg.utils.SvgTextUtil;
-
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;

src/main/java/com/itextpdf/svg/processors/impl/DefaultSvgProcessor.java

@@ -47,7 +47,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.svg.processors.ISvgConverterProperties;
 import com.itextpdf.svg.renderers.factories.DefaultSvgNodeRendererFactory;
 import com.itextpdf.svg.renderers.factories.ISvgNodeRendererFactory;
-
 import java.nio.charset.StandardCharsets;
 
 /**
@@ -75,6 +74,11 @@ public class SvgConverterProperties implements ISvgConverterProperties {
 
     private String charset = StandardCharsets.UTF_8.name();
 
+    public SvgConverterProperties setRendererFactory(ISvgNodeRendererFactory rendererFactory) {
+        this.rendererFactory = rendererFactory;
+        return this;
+    }
+
     /**
      * Creates a SvgConverterProperties object. Instantiates its members, ICssResolver and ISvgNodeRenderer, to its default implementations.
      */
@@ -98,8 +102,9 @@ public String getCharset() {
         return charset;
     }
 
-    public void setCharset(String charset) {
+    public SvgConverterProperties setCharset(String charset) {
         this.charset = charset;
+        return this;
     }
 
     /**

src/main/java/com/itextpdf/svg/processors/impl/SvgConverterProperties.java

@@ -49,6 +49,7 @@ public SvgProcessorContext(ISvgConverterProperties converterProperties) {
         if (baseUri == null) {
             baseUri = "";
         }
+        //TODO DEVSIX-2095
         resourceResolver = new ResourceResolver(baseUri);
     }
 

src/main/java/com/itextpdf/svg/processors/impl/SvgProcessorContext.java

@@ -59,11 +59,9 @@ This file is part of the iText (R) project.
 import com.itextpdf.svg.renderers.SvgIntegrationTest;
 import com.itextpdf.test.ITextTest;
 import com.itextpdf.test.annotations.type.UnitTest;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/com/itextpdf/svg/css/SvgStyleResolverTest.java

@@ -279,7 +279,7 @@ public void processWithNullPropertiesTest() {
 
     @Test
     public void depthFirstNullRendererTest() {
-        Element jsoupNonExistingElement = new Element(Tag.valueOf("nonExisting"),"");
+        Element jsoupNonExistingElement = new Element(Tag.valueOf("nonExisting"), "");
         INode root = new JsoupElementNode(jsoupNonExistingElement);
         DefaultSvgProcessor dsp = new DefaultSvgProcessor();
         ISvgConverterProperties scp = new SvgConverterProperties();

src/test/java/com/itextpdf/svg/processors/impl/DefaultSvgProcessorUnitTest.java

@@ -43,18 +43,24 @@ This file is part of the iText (R) project.
 package com.itextpdf.svg.processors.impl.font;
 
 
+import com.itextpdf.io.util.FileUtil;
+import com.itextpdf.kernel.pdf.WriterProperties;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
+import com.itextpdf.styledxmlparser.css.media.MediaType;
+import com.itextpdf.styledxmlparser.resolver.font.BasicFontProvider;
 import com.itextpdf.svg.exceptions.SvgLogMessageConstant;
+import com.itextpdf.svg.processors.ISvgConverterProperties;
+import com.itextpdf.svg.processors.impl.SvgConverterProperties;
 import com.itextpdf.svg.renderers.SvgIntegrationTest;
 import com.itextpdf.test.ITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.IntegrationTest;
-
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -225,11 +231,73 @@ public void fontFamilyTest01() throws IOException, InterruptedException {
         runTest("fontFamilyTest01");
     }
 
-    private void runTest(String fileName) throws IOException, InterruptedException {
-        convert(sourceFolder + fileName + ".svg",destinationFolder + fileName + ".pdf");
-        CompareTool compareTool = new CompareTool();
-        String compareResult = compareTool.compareByContent(destinationFolder + fileName + ".pdf", sourceFolder + "cmp_" + fileName + ".pdf", destinationFolder, "diff_");
-        Assert.assertNull(compareResult);
+    @Test
+    public void resolveFontsWithoutWriterProperties() throws IOException, InterruptedException {
+        String fileName = "fontSelectorTest";
+        ISvgConverterProperties properties = new SvgConverterProperties().setFontProvider(new BasicFontProvider()).setMediaDeviceDescription(new MediaDeviceDescription(MediaType.ALL));
+        convertToSinglePage(new File(sourceFolder + fileName + ".svg"), new File(destinationFolder + fileName + ".pdf"), properties);
+        compare(fileName, sourceFolder, destinationFolder);
+    }
+
+    @Test
+    public void resolveFontsWithoutConverterPropertiesAndWriterProperties() throws IOException, InterruptedException {
+        String fileName = "resolveFonts_WithoutConverterPropertiesAndWriterProperties";
+        String svgFile = "fontSelectorTest";
+        convertToSinglePage(new File(sourceFolder + svgFile + ".svg"), new File(destinationFolder + fileName + ".pdf"));
+        compare(fileName, sourceFolder, destinationFolder);
+    }
+
+    @Test
+    public void resolveFontsWithAllProperties() throws IOException, InterruptedException {
+        String fileName = "resolveFonts_WithAllProperties";
+        String svgFile = "fontSelectorTest";
+        WriterProperties writerprops = new WriterProperties().setCompressionLevel(0);
+        String baseUri = FileUtil.getParentDirectory(new File(sourceFolder + svgFile + ".svg"));
+        ISvgConverterProperties properties = new SvgConverterProperties().setBaseUri(baseUri).setFontProvider(new BasicFontProvider()).setMediaDeviceDescription(new MediaDeviceDescription(MediaType.ALL));
+        convertToSinglePage(new File(sourceFolder + svgFile + ".svg"), new File(destinationFolder + fileName + ".pdf"), properties, writerprops);
+        compare(fileName, sourceFolder, destinationFolder);
+    }
+
+    @Test
+    public void resolveFontsWithWriterProperties() throws IOException, InterruptedException {
+        String fileName = "resolveFonts_WithWriterProperties";
+        String svgFile = "fontSelectorTest";
+        WriterProperties writerprops = new WriterProperties().setCompressionLevel(0);
+        convertToSinglePage(new File(sourceFolder + svgFile + ".svg"), new File(destinationFolder + fileName + ".pdf"), writerprops);
+        compare(fileName, sourceFolder, destinationFolder);
+    }
+
+    @Test
+    public void resolveFontsWithConverterPropsAndWriterProps() throws IOException, InterruptedException {
+        String fileName = "resolveFonts_WithConverterPropsAndWriterProps";
+        String svgFile = "fontSelectorTest";
+        WriterProperties writerprops = new WriterProperties().setCompressionLevel(0);
+        String baseUri = FileUtil.getParentDirectory(new File(sourceFolder + svgFile + ".svg"));
+        ISvgConverterProperties properties = new SvgConverterProperties().setBaseUri(baseUri).setFontProvider(new BasicFontProvider()).setMediaDeviceDescription(new MediaDeviceDescription(MediaType.ALL));
+        convertToSinglePage(new FileInputStream(sourceFolder + svgFile + ".svg"), new FileOutputStream(destinationFolder + fileName + ".pdf"), properties, writerprops);
+        compare(fileName, sourceFolder, destinationFolder);
+    }
+
+    @Test
+    public void resolveFontsWithConverterPropertiesAndEmptyUri() throws IOException, InterruptedException {
+        String fileName = "resolveFonts_WithConverterPropertiesAndEmptyUri";
+        String svgFile = "fontSelectorTest";
+        ISvgConverterProperties properties = new SvgConverterProperties().setBaseUri("").setFontProvider(new BasicFontProvider()).setMediaDeviceDescription(new MediaDeviceDescription(MediaType.ALL));
+        convertToSinglePage(new File(sourceFolder + svgFile + ".svg"), new File(destinationFolder + fileName + ".pdf"), properties);
+        compare(fileName, sourceFolder, destinationFolder);
+    }
+
+    @Test
+    public void resolveFontsWithConverterPropertiesAndNullUri() throws IOException, InterruptedException {
+        String fileName = "resolveFonts_WithConverterPropertiesAndNullUri";
+        String svgFile = "fontSelectorTest";
+        ISvgConverterProperties properties = new SvgConverterProperties().setBaseUri(null).setFontProvider(new BasicFontProvider()).setMediaDeviceDescription(new MediaDeviceDescription(MediaType.ALL));
+        convertToSinglePage(new File(sourceFolder + svgFile + ".svg"), new File(destinationFolder + fileName + ".pdf"), properties);
+        compare(fileName, sourceFolder, destinationFolder);
+    }
 
+    private void runTest(String fileName) throws IOException, InterruptedException {
+        convert(sourceFolder + fileName + ".svg", destinationFolder + fileName + ".pdf");
+        compare(fileName, sourceFolder, destinationFolder);
     }
 }

src/test/java/com/itextpdf/svg/processors/impl/font/FontFaceTest.java

@@ -48,15 +48,13 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.svg.converter.SvgConverter;
 import com.itextpdf.svg.processors.ISvgConverterProperties;
-
+import com.itextpdf.svg.processors.impl.SvgConverterProperties;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
-import com.itextpdf.svg.processors.impl.SvgConverterProperties;
 import org.junit.Assert;
 
 public class SvgIntegrationTest {
@@ -84,9 +82,28 @@ public void convertToSinglePage(InputStream svg, OutputStream pdfOutputStream) t
         SvgConverter.createPdf(svg, pdfOutputStream, writerprops);
     }
 
+    public void convertToSinglePage(File svg, File pdf) throws IOException {
+        SvgConverter.createPdf(svg, pdf);
+    }
+
+    public void convertToSinglePage(File svg, File pdf, ISvgConverterProperties properties) throws IOException {
+        SvgConverter.createPdf(svg, pdf, properties);
+    }
+
+    public void convertToSinglePage(File svg, File pdf, ISvgConverterProperties properties, WriterProperties writerProperties) throws IOException {
+        SvgConverter.createPdf(svg, pdf, properties, writerProperties);
+    }
+
+    public void convertToSinglePage(File svg, File pdf, WriterProperties writerProperties) throws IOException {
+        SvgConverter.createPdf(svg, pdf, writerProperties);
+    }
+
     public void convertToSinglePage(InputStream svg, OutputStream pdfOutputStream, ISvgConverterProperties properties) throws IOException {
-        WriterProperties writerprops = new WriterProperties().setCompressionLevel(0);
-        SvgConverter.createPdf(svg, properties, pdfOutputStream, writerprops);
+        SvgConverter.createPdf(svg, pdfOutputStream, properties);
+    }
+
+    public void convertToSinglePage(InputStream svg, OutputStream pdfOutputStream, ISvgConverterProperties properties, WriterProperties writerprops) throws IOException {
+        SvgConverter.createPdf(svg, pdfOutputStream, properties, writerprops);
     }
 
     public void convertAndCompareVisually(String src, String dest, String fileName) throws IOException, InterruptedException {
@@ -119,7 +136,7 @@ public void convertAndCompareStructurally(String src, String dest, String fileNa
         compare(fileName, src, dest);
     }
 
-    private void compare(String filename, String sourceFolder, String destinationFolder) throws IOException, InterruptedException {
+    protected void compare(String filename, String sourceFolder, String destinationFolder) throws IOException, InterruptedException {
         String result = new CompareTool().compareByContent(destinationFolder + filename + ".pdf", sourceFolder + "cmp_" + filename + ".pdf", destinationFolder, "diff_");
 
         if (result != null && !result.contains("No visual differences")) {