More FileUtils tests

Author: mikera

convex-core/src/main/java/convex/core/util/FileUtils.java

@@ -61,10 +61,6 @@ public static String loadFileAsString(InputStream inputStream) throws IOExceptio
 	public static Blob loadFileAsBlob(Path file) throws IOException {
 		return Blob.wrap(Files.readAllBytes(file));
 	}
-
-	public static byte[] loadFileAsBytes(Path file) throws IOException {
-		return Files.readAllBytes(file);
-	}
 
 	public static <T extends ACell> T loadCAD3(Path file) throws IOException, BadFormatException {
 		Blob b=loadFileAsBlob(file);
@@ -106,6 +102,20 @@ public static File ensureFilePath(File file) throws IOException {
 		Files.createDirectories(Path.of(dirPath));
 		return target;
 	}
+	
+	/**
+	 * Create a path if necessary to a File object. Interprets leading "~" as user home directory.
+	 *
+	 * @param file File object to see if the path part of the filename exists, if not then create it.
+	 * @return target File, as an absolute path, with parent directories created recursively if needed
+	 * @throws IOException In case of IO Error
+	 */
+	public static Path ensureFilePath(Path file) throws IOException {
+		// Get path of parent directory, using absolute path (may be current working directory user.dir)
+		Path parent=file.getParent();
+		Files.createDirectories(parent);
+		return file;
+	}
 
 	/**
 	 * Gets the absolute path File for a given file name. Interprets leading "~" as user home directory.

convex-core/src/test/java/convex/core/util/FileUtilsTest.java

@@ -5,13 +5,32 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 
+import convex.core.data.Blob;
+import convex.core.data.Strings;
+
+@TestInstance(Lifecycle.PER_CLASS)
 public class FileUtilsTest {
 
+	Path TEMP;
+	
+	@BeforeAll 
+	public void setup() throws IOException {
+		TEMP=Files.createTempDirectory("fileTest");
+	}
+	
+	@BeforeAll 
+	public void cleanup() throws IOException {
+		Files.deleteIfExists(TEMP);
+	}
 
 	@Test public void testGetHomePath() {
 		String home=System.getProperty("user.home");
@@ -27,4 +46,32 @@ public class FileUtilsTest {
 		assertTrue(path.isAbsolute());
 		assertTrue(Files.isDirectory(path));
 	}
+	
+	@Test public void testFileOps() throws IOException {
+		Path DIR=FileUtils.ensureFilePath(TEMP.resolve("testOps/foo.bar")).getParent();
+		assertTrue(Files.exists(DIR));
+		assertTrue(Files.isDirectory(DIR));
+		try {
+			
+			
+			Path TEXT=DIR.resolve("hello.txt");
+			try { // text file
+				FileUtils.writeFileAsString(TEXT, "hello");
+				String rs=FileUtils.loadFileAsString(DIR.toString()+"/hello.txt");
+				assertEquals("hello",rs);
+				
+				Blob b=FileUtils.loadFileAsBlob(TEXT);
+				assertEquals("hello",Strings.create(b).toString());
+				
+				
+			} finally {
+				Files.delete(TEXT);
+			}
+
+			
+			
+		} finally {
+			Files.delete(DIR);
+		}
+	}
 }

convex-gui/src/main/java/convex/gui/tools/SystemInfoPanel.java

@@ -42,7 +42,7 @@ public SystemInfoPanel() {
 				hashPanel.add(new ActionButton("Compute...,",0xe8b6, e->{
 					try {
 						String hash;
-						hash = Hashing.sha256(FileUtils.loadFileAsBytes(jarFile)).toHexString();
+						hash = Hashing.sha256(Files.readAllBytes(jarFile)).toHexString();
 						hashPanel.removeAll();
 						hashPanel.add(new JLabel(hash.toUpperCase()));
 					} catch (IOException e1) {