Tests: reduce access rights to temporary files

Author: carlosame

echosvg-anim/src/test/java/io/sf/carte/echosvg/anim/dom/SerializationTest.java

@@ -27,6 +27,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.URL;
+import java.nio.file.Files;
 
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
@@ -58,8 +59,8 @@ void testSerialization(String testFileName) throws Exception {
 			doc = df.parse(source);
 		}
 
-		File ser1 = File.createTempFile("doc1", "ser");
-		File ser2 = File.createTempFile("doc2", "ser");
+		File ser1 = Files.createTempFile("doc1", "ser").toFile();
+		File ser2 = Files.createTempFile("doc2", "ser").toFile();
 		ser1.deleteOnExit();
 		ser2.deleteOnExit();
 

echosvg-dom/src/test/java/io/sf/carte/echosvg/dom/SerializationTest.java

@@ -28,6 +28,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.URL;
+import java.nio.file.Files;
 
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
@@ -56,8 +57,8 @@ void testSerialization(String testFileName, String rootTag) throws IOException,
 		URL url = getClass().getClassLoader().getResource(testFileName);
 		Document doc = df.createDocument(null, rootTag, url.toString(), url.openStream());
 
-		File ser1 = File.createTempFile("doc1", "ser");
-		File ser2 = File.createTempFile("doc2", "ser");
+		File ser1 = Files.createTempFile("doc1", "ser").toFile();
+		File ser2 = Files.createTempFile("doc2", "ser").toFile();
 		ser1.deleteOnExit();
 		ser2.deleteOnExit();
 

echosvg-svgrasterizer/src/test/java/io/sf/carte/echosvg/apps/rasterizer/SVGConverterTest.java

@@ -30,6 +30,7 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -369,7 +370,7 @@ protected void configure(SVGConverter c) {
 			protected void configure(SVGConverter c) {
 				File dummy = null;
 				try {
-					dummy = File.createTempFile("dummyPNG", ".png");
+					dummy = Files.createTempFile("dummyPNG", ".png").toFile();
 				} catch (IOException ioEx) {
 					throw new RuntimeException(ioEx.getMessage());
 				}

echosvg-test-util/src/main/java/io/sf/carte/echosvg/test/image/TempImageFiles.java

@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.Files;
 
 /**
  * Produce image-based filenames.
@@ -85,7 +86,7 @@ public File createImageFile(URL imageUrl, CharSequence fileSuffix, CharSequence
 		StringBuilder buf = new StringBuilder(path.length() + fileSuffix.length() + dotExtension.length());
 		buf.append(path).append(fileSuffix).append(dotExtension);
 
-		return File.createTempFile("TempImageFiles", buf.toString(), null);
+		return Files.createTempFile("TempImageFiles", buf.toString()).toFile();
 	}
 
 	@Override
@@ -100,7 +101,7 @@ public File createImageFile(String imageNameWithExtension) throws IOException {
 			}
 		}
 
-		return File.createTempFile("TempImageFiles", imageNameWithExtension, null);
+		return Files.createTempFile("TempImageFiles", imageNameWithExtension).toFile();
 	}
 
 }

echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/JPainterCompare.java

@@ -21,10 +21,10 @@
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.GridLayout;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -137,11 +137,11 @@ public JPainterCompare(Painter painter) {
 		//
 		// Generate SVG content
 		//
-		File tmpFile = null;
+		Path tmpFile = null;
 		try {
-			tmpFile = File.createTempFile(CONFIG_TMP_FILE_PREFIX, ".svg");
+			tmpFile = Files.createTempFile(CONFIG_TMP_FILE_PREFIX, ".svg");
 
-			OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(tmpFile),
+			OutputStreamWriter osw = new OutputStreamWriter(Files.newOutputStream(tmpFile),
 					StandardCharsets.UTF_8);
 
 			painter.paint(g2d);
@@ -161,7 +161,7 @@ public JPainterCompare(Painter painter) {
 		svgCanvas.addSVGDocumentLoaderListener(l);
 
 		try {
-			svgCanvas.setURI(tmpFile.toURI().toURL().toString());
+			svgCanvas.setURI(tmpFile.toUri().toURL().toString());
 			synchronized (l.sem) {
 				l.sem.wait();
 			}

echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/SVGAccuracyTestValidator.java

@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.nio.file.Files;
 
 import org.junit.jupiter.api.Test;
 
@@ -138,7 +139,7 @@ public void test() throws IOException {
 	static class DiffWithReferenceImage extends ValidPainterTest {
 
 		public void test() throws IOException {
-			File tmpFile = File.createTempFile("EmptySVGReference", null);
+			File tmpFile = Files.createTempFile("EmptySVGReference", null).toFile();
 			tmpFile.deleteOnExit();
 
 			SVGAccuracyTest t = new SVGAccuracyTest(this, tmpFile.toURI().toURL());
@@ -150,7 +151,7 @@ public void test() throws IOException {
 	static class SameAsReferenceImage extends ValidPainterTest {
 
 		public void test() throws IOException {
-			File tmpFile = File.createTempFile("SVGReference", null);
+			File tmpFile = Files.createTempFile("SVGReference", null).toFile();
 			tmpFile.deleteOnExit();
 
 			SVGAccuracyTest t = new SVGAccuracyTest(this, tmpFile.toURI().toURL());