absolute_path: fallback without java

Author: scivision

+stdlib/+fileio/absolute_path.m

@@ -34,7 +34,12 @@
 try
   abspath = string(java.io.File(abspath).getCanonicalPath());
 catch excp
-  error("stdlib:fileio:absolute_path", "%s is not a canonicalizable path.  %s", abspath, excp.message)
+  if excp.identifier == "MATLAB:undefinedVarOrClass"
+    % Java is not available, so return unmodified path
+    return
+  else
+    error("stdlib:fileio:absolute_path", "%s is not a canonicalizable path.  %s", abspath, excp.message)
+  end
 end
 
 end % function

+stdlib/+fileio/example.ini

@@ -15,8 +15,11 @@ function test_posix(tc)
 end
 
 function test_samepath(tc)
+
 import stdlib.fileio.samepath
 
+tc.assumeTrue(usejava("jvm"), "Java required for samepath")
+
 tc.verifyEmpty(samepath(string.empty, string.empty))
 tc.verifyTrue(samepath("", ""))
 tc.verifyFalse(samepath("a", "b"))
@@ -29,6 +32,8 @@ function test_path_tail(tc)
 
 import stdlib.fileio.path_tail
 
+tc.assumeTrue(usejava("jvm"), "Java required for path_tail")
+
 tc.verifyEmpty(path_tail(string.empty))
 tc.verifyEqual(path_tail(""), "")
 tc.verifyEqual(path_tail("/foo/bar/baz"), "baz")
@@ -62,6 +67,8 @@ function test_absolute_path(tc)
 
 import stdlib.fileio.absolute_path
 
+tc.assumeTrue(usejava("jvm"), "Java required for absolute_path")
+
 tc.verifyEmpty(absolute_path(string.empty))
 tc.verifyEqual(absolute_path(""), string(pwd))
 
@@ -71,11 +78,14 @@ function test_absolute_path(tc)
 tc.verifyTrue(strncmp(pabs, pabs2, 2))
 
 par1 = absolute_path("../2foo");
+tc.verifyNotEmpty(par1)
+tc.verifyFalse(contains(par1, ".."))
+
 par2 = absolute_path("../4foo");
-tc.verifyFalse(startsWith(par1, ".."))
 tc.verifyTrue(strncmp(par2, pabs2, 2))
 
 pt1 = absolute_path("bar/../2foo");
+tc.verifyNotEmpty(pt1)
 tc.verifyFalse(contains(pt1, ".."))
 
 va = absolute_path("2foo");

+stdlib/+test/TestFilePure.m

@@ -12,7 +12,10 @@ function test_checkRAM(tc)
 end
 
 function test_diskfree(tc)
-  import stdlib.sys.diskfree
+import stdlib.sys.diskfree
+
+tc.assumeTrue(usejava("jvm"), "Java required for path_tail")
+
 tc.assertTrue(isnumeric(diskfree('~')))
 tc.assertTrue(diskfree('~') > 0, 'diskfree')
 end