Add test for check resources released after conversion

Veronika Lisovskaya · yulian-gaponenko · commit 635d7abc3812 · 2018-10-02T13:02:46.000+03:00
DEVSIX-2314
diff --git a/src/test/java/com/itextpdf/html2pdf/resolver/font/LocalFontResolverReleaseTest.java b/src/test/java/com/itextpdf/html2pdf/resolver/font/LocalFontResolverReleaseTest.java
@@ -49,9 +49,8 @@ public void testThatLocalFontIsReleasedAfterConversion() throws IOException {
         }
 
         // The resource must be freed after the conversion
-        File resourceToBeremoved = new File(workDirFontFile);
-        resourceToBeremoved.delete();
-        Assert.assertFalse(resourceToBeremoved.exists());
+        File resourceToBeRemoved = new File(workDirFontFile);
+        resourceToBeRemoved.delete();
+        Assert.assertFalse(resourceToBeRemoved.exists());
     }
-
 }
diff --git a/src/test/java/com/itextpdf/html2pdf/resolver/form/NameResolverTest.java b/src/test/java/com/itextpdf/html2pdf/resolver/form/NameResolverTest.java
@@ -42,7 +42,6 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.html2pdf.resolver.form;
 
-import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.type.UnitTest;
 import org.junit.Assert;
diff --git a/src/test/java/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest.java b/src/test/java/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest.java
@@ -0,0 +1,63 @@
+package com.itextpdf.html2pdf.resolver.resource;
+
+import com.itextpdf.html2pdf.HtmlConverter;
+import com.itextpdf.styledxmlparser.LogMessageConstant;
+import com.itextpdf.test.ExtendedITextTest;
+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.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(IntegrationTest.class)
+public class LocalImageResolverReleaseTest extends ExtendedITextTest {
+
+    public static final String sourceFolder = "./src/test/resources/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/";
+    public static final String destinationFolder = "./target/test/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/";
+
+    @BeforeClass
+    public static void beforeClass() {
+        createOrClearDestinationFolder(destinationFolder);
+    }
+
+    @Test
+    @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.ERROR_RESOLVING_PARENT_STYLES, count = 60)})
+    public void testThatSvgIsReleasedAfterConversion() throws IOException {
+        String htmlFileName = "testWithSvg.html";
+        String svgFileName = "imageWithMultipleShapes.svg";
+        String imageFileName = "image.png";
+        String sourceHtmlFile = sourceFolder + htmlFileName;
+        String sourceSvgFile = sourceFolder + svgFileName;
+        String sourceImageFile = sourceFolder + imageFileName;
+
+        String workDir = destinationFolder + "work/";
+        createDestinationFolder(workDir);
+        String targetPdfFile = workDir + "target.pdf";
+
+        String workDirHtmlFile = workDir + htmlFileName;
+        String workDirSvgFile = workDir + svgFileName;
+        String workDirImageFile = workDir + imageFileName;
+        Files.copy(Paths.get(sourceHtmlFile), Paths.get(workDirHtmlFile));
+        Files.copy(Paths.get(sourceSvgFile), Paths.get(workDirSvgFile));
+        Files.copy(Paths.get(sourceImageFile), Paths.get(workDirImageFile));
+        for (int i = 0; i < 10; i++) {
+            HtmlConverter.convertToPdf(new File(workDirHtmlFile), new File(targetPdfFile));
+        }
+
+        // The resource must be freed after the conversion
+        File resourceToBeRemoved = new File(workDirSvgFile);
+        resourceToBeRemoved.delete();
+        Assert.assertFalse(resourceToBeRemoved.exists());
+
+        resourceToBeRemoved = new File(workDirImageFile);
+        resourceToBeRemoved.delete();
+        Assert.assertFalse(resourceToBeRemoved.exists());
+    }
+
+}
diff --git a/src/test/resources/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/image.png b/src/test/resources/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/image.png
diff --git a/src/test/resources/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/imageWithMultipleShapes.svg b/src/test/resources/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/imageWithMultipleShapes.svg
@@ -0,0 +1,5 @@
+<svg width="400" height="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <rect x='0' y='0' width='400' height='400' stroke='green' fill='cyan'/>
+    <rect x='10' y='10' width='250' height='312' stroke='orange' fill='red'/>
+    <circle cx='350' cy='378' r='150' stroke='red' fill='green'/>
+</svg>
diff --git a/src/test/resources/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/testWithSvg.html b/src/test/resources/com/itextpdf/html2pdf/resolver/resource/LocalImageResolverReleaseTest/testWithSvg.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Example</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+</head>
+
+<body>
+<h1>images within html</h1>
+<p> Example SVG Image</p>
+<img src="imageWithMultipleShapes.svg"/>
+<p>Example Object1</p>
+<object data="imageWithMultipleShapes.svg" type="image/svg+xml"></object>
+<p> Example Image</p>
+<img src="image.png"/>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,8 @@ public void testThatLocalFontIsReleasedAfterConversion() throws IOException {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// The resource must be freed after the conversion`
`52`		`- File resourceToBeremoved = new File(workDirFontFile);`
`53`		`- resourceToBeremoved.delete();`
`54`		`- Assert.assertFalse(resourceToBeremoved.exists());`
	`52`	`+ File resourceToBeRemoved = new File(workDirFontFile);`
	`53`	`+ resourceToBeRemoved.delete();`
	`54`	`+ Assert.assertFalse(resourceToBeRemoved.exists());`
`55`	`55`	`}`
`56`		`-`
`57`	`56`	`}`