more java methods

Author: scivision

+stdlib/+fileio/filename.m

@@ -4,8 +4,11 @@
   path string
 end
 
-[~, n, e] = fileparts(path);
+% NOT https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#getName()
+% because by our definition, a trailing directory component is not part of the filename
+% this is like C++17 filesystem::path::filename
 
+[~, n, e] = fileparts(path);
 p = n + e;
 
 end

+stdlib/+fileio/is_exe.m

@@ -13,4 +13,7 @@
 
 ok = java.io.File(file).canExecute();
 
+% more complicated
+% ok = java.nio.file.Files.isExecutable(java.io.File(stdlib.fileio.absolute_path(file)).toPath());
+
 end

+stdlib/+fileio/parent.m

@@ -1,10 +1,13 @@
 function p = parent(path)
 % PARENT parent directory of path
+% https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#getParent()
 arguments
   path string
 end
 
+p = stdlib.fileio.posix(java.io.File(path).getParent());
+
 % must drop trailing slash - need to as_posix for windows
-p = fileparts(strip(stdlib.fileio.posix(path), 'right', '/'));
+%p = fileparts(strip(stdlib.fileio.posix(path), 'right', '/'));
 
 end

+stdlib/+fileio/samepath.m

@@ -10,7 +10,7 @@
    return
 end
 
-% unlike c++ filesystem, isSameFile does not canonicalize first
+% java.nio.file.Files needs CANONICAL -- not just absolute path
 p1 = java.io.File(stdlib.fileio.canonical(path1)).toPath();
 p2 = java.io.File(stdlib.fileio.canonical(path2)).toPath();
 

test/TestFileImpure.m

@@ -14,9 +14,36 @@ function setup_path(tc)
 
 methods (Test)
 
+function test_exists(tc)
+
+tc.verifyTrue(stdlib.exists(pwd))
+tc.verifyTrue(stdlib.exists(string(mfilename("fullpath"))+".m"))
+tc.verifyFalse(stdlib.exists("not-exists"))
+
+end
+
+
+function test_is_readable(tc)
+
+tc.verifyTrue(stdlib.is_readable(pwd))
+tc.verifyTrue(stdlib.is_readable(string(mfilename("fullpath"))+".m"))
+tc.verifyFalse(stdlib.is_readable("not-exists"))
+
+end
+
+
+function test_is_writable(tc)
+
+tc.verifyTrue(stdlib.is_writable(pwd))
+tc.verifyFalse(stdlib.is_writable(matlabroot))
+tc.verifyFalse(stdlib.is_writable("not-exists"))
+
+end
+
+
+
 function test_expanduser(tc)
 
-tc.verifyEmpty(stdlib.expanduser(string.empty))
 tc.verifyEqual(stdlib.expanduser(""), "")
 
 tc.verifyEqual(stdlib.expanduser("~abc"), "~abc")
@@ -30,6 +57,33 @@ function test_expanduser(tc)
 end
 
 
+function test_absolute_path(tc)
+import matlab.unittest.constraints.StartsWithSubstring
+
+tc.verifyEqual(stdlib.absolute_path(""), "")
+
+pabs = stdlib.absolute_path('2foo');
+pabs2 = stdlib.absolute_path('4foo');
+tc.verifyThat(pabs, ~StartsWithSubstring("2"))
+tc.verifyTrue(strncmp(pabs, pabs2, 2))
+
+par1 = stdlib.absolute_path("../2foo");
+tc.verifyNotEmpty(par1)
+
+par2 = stdlib.absolute_path("../4foo");
+tc.verifyTrue(strncmp(par2, pabs2, 2))
+
+pt1 = stdlib.absolute_path("bar/../2foo");
+tc.verifyNotEmpty(pt1)
+
+va = stdlib.absolute_path("2foo");
+vb = stdlib.absolute_path("4foo");
+tc.verifyThat(va, ~StartsWithSubstring("2"))
+tc.verifyTrue(strncmp(va, vb, 2))
+
+end
+
+
 function test_canonical(tc)
 import matlab.unittest.fixtures.TemporaryFolderFixture
 import matlab.unittest.fixtures.CurrentFolderFixture
@@ -39,7 +93,7 @@ function test_canonical(tc)
 tc.applyFixture(CurrentFolderFixture(td))
 
 % all non-existing files
-tc.verifyEmpty(stdlib.canonical(string.empty))
+
 tc.verifyEqual(stdlib.canonical(""), "")
 
 pabs = stdlib.canonical('2foo');
@@ -78,7 +132,7 @@ function test_resolve(tc)
 tc.applyFixture(CurrentFolderFixture(td))
 
 % all non-existing files
-tc.verifyEmpty(stdlib.resolve(string.empty))
+
 tc.verifyEqual(stdlib.resolve(""), stdlib.fileio.posix(pwd))
 
 pabs = stdlib.resolve('2foo');
@@ -127,11 +181,10 @@ function test_makedir(tc)
 
 function test_samepath(tc)
 
-tc.verifyEmpty(stdlib.samepath(string.empty, string.empty))
-tc.verifyTrue(stdlib.samepath("", ""))
-tc.verifyFalse(stdlib.samepath(tempname, tempname))
+tc.verifyTrue(stdlib.samepath("", ""), "empty not same")
+tc.verifyFalse(stdlib.samepath(tempname, tempname), "tempname not same")
 tc.verifyTrue(stdlib.samepath("~/b/..", "~/c/.."), "tilde path ..")
-tc.verifyTrue(stdlib.samepath(".", fullfile(pwd, "a/..")))
+tc.verifyTrue(stdlib.samepath(".", fullfile(pwd, "a/..")), "dot path ..")
 end
 
 
@@ -155,7 +208,6 @@ function test_is_exe_which_fullpath(tc)
 import matlab.unittest.constraints.IsFile
 import matlab.unittest.constraints.EndsWithSubstring
 
-tc.verifyEmpty(stdlib.is_exe(string.empty))
 tc.verifyFalse(stdlib.is_exe(""))
 tc.verifyFalse(stdlib.is_exe(tempname))
 

test/TestFilePure.m

@@ -27,7 +27,6 @@ function test_posix(tc)
 
 function test_filename(tc)
 
-tc.verifyEmpty(stdlib.filename(string.empty))
 tc.verifyEqual(stdlib.filename(""), "")
 
 tc.verifyEqual(stdlib.filename("/foo/bar/baz"), "baz")
@@ -41,7 +40,6 @@ function test_filename(tc)
 
 function test_parent(tc)
 
-tc.verifyEmpty(stdlib.parent(string.empty))
 tc.verifyEqual(stdlib.parent(""), "")
 
 tc.verifyEqual(stdlib.parent("/foo/bar/baz"), "/foo/bar")
@@ -81,21 +79,8 @@ function test_stem(tc)
 end
 
 
-function test_path_tail(tc)
-
-tc.verifyEmpty(stdlib.path_tail(string.empty))
-tc.verifyEqual(stdlib.path_tail(""), "")
-tc.verifyEqual(stdlib.path_tail("/foo/bar/baz"), "baz")
-tc.verifyEqual(stdlib.path_tail("/foo/bar/baz/"), "baz")
-tc.verifyEqual(stdlib.path_tail("/foo/bar/baz/."), "baz")
-tc.verifyEqual(stdlib.path_tail("/foo/bar/baz/.."), "bar")
-tc.verifyEqual(stdlib.path_tail("/foo/bar/baz.txt"), "baz.txt")
-
-end
-
 function test_is_absolute_path(tc)
 
-tc.verifyEmpty(stdlib.is_absolute_path(string.empty))
 tc.verifyFalse(stdlib.is_absolute_path(""))
 
 tc.verifyTrue(stdlib.is_absolute_path('~/foo'))
@@ -109,36 +94,9 @@ function test_is_absolute_path(tc)
 tc.verifyFalse(stdlib.is_absolute_path("c"))
 end
 
-function test_absolute_path(tc)
-import matlab.unittest.constraints.StartsWithSubstring
-
-tc.verifyEmpty(stdlib.absolute_path(string.empty))
-tc.verifyEqual(stdlib.absolute_path(""), "")
-
-pabs = stdlib.absolute_path('2foo');
-pabs2 = stdlib.absolute_path('4foo');
-tc.verifyThat(pabs, ~StartsWithSubstring("2"))
-tc.verifyTrue(strncmp(pabs, pabs2, 2))
-
-par1 = stdlib.absolute_path("../2foo");
-tc.verifyNotEmpty(par1)
-
-par2 = stdlib.absolute_path("../4foo");
-tc.verifyTrue(strncmp(par2, pabs2, 2))
-
-pt1 = stdlib.absolute_path("bar/../2foo");
-tc.verifyNotEmpty(pt1)
-
-va = stdlib.absolute_path("2foo");
-vb = stdlib.absolute_path("4foo");
-tc.verifyThat(va, ~StartsWithSubstring("2"))
-tc.verifyTrue(strncmp(va, vb, 2))
-
-end
 
 function test_normalize(tc)
 
-tc.verifyEmpty(stdlib.normalize(string.empty))
 tc.verifyEqual(stdlib.normalize(""), "")
 
 pabs = stdlib.normalize('2foo//');
@@ -148,7 +106,6 @@ function test_normalize(tc)
 
 function test_with_suffix(tc)
 
-tc.verifyEmpty(stdlib.with_suffix(string.empty, ".nc"))
 tc.verifyEqual(stdlib.with_suffix("", ""), "")
 
 tc.verifyEqual(stdlib.with_suffix("foo.h5", ".nc"), "foo.nc")