relative_to, is_subdir: clarify

Author: scivision

+stdlib/get_username.m

@@ -1,5 +1,13 @@
 %% GET_USERNAME tell username of current user
 
-function username = get_username()
-username = string(java.lang.System.getProperty('user.name'));
+function n = get_username()
+
+if stdlib.isoctave()
+  n = javaMethod("getProperty", "java.lang.System", "user.name");
+else
+  n = string(java.lang.System.getProperty('user.name'));
+end
+
 end
+
+%!assert(!isempty(get_username()))

+stdlib/is_subdir.m

@@ -1,13 +1,28 @@
 %% IS_SUBDIR is subdir a subdirectory of dir?
 
-function yes = is_subdir(subdir, dir)
+function s = is_subdir(subdir, dir)
 arguments
   subdir (1,1) string
   dir (1,1) string
 end
 
 r = stdlib.relative_to(dir, subdir);
 
-yes = strlength(r) > 0 && r ~= "." && ~startsWith(r, "..");
+if stdlib.len(r) == 0 || r == "."
+  s = false;
+elseif ischar(r)
+  s = ~strncmp(r, '..', 2);
+else
+  s = ~startsWith(r, "..");
+end
 
 end
+
+%!assert(!is_subdir("/a/b", "/a/b"))
+%!assert(!is_subdir("/a/b", "/a/b/c"))
+%!assert(!is_subdir("/a/b", "/a/b/c/"))
+%!assert(!is_subdir("/a/b", "d"))
+%!assert(is_subdir("a/b", "a"))
+%!assert(!is_subdir("a", "a/.c"))
+
+% this is incorrect on Windows at least%assert(is_subdir("a/b", "a/b/.."))

+stdlib/is_writable.m

@@ -11,7 +11,7 @@
 if use_java
   % java is about 10x slower than fileattrib
   % needs absolute()
-  file = stdlib.absolute(file, "", false, use_java);
+  file = stdlib.absolute(file, "", false, true);
 
   % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/Files.html#isWritable(java.nio.file.Path)
   ok = java.nio.file.Files.isWritable(java.io.File(file).toPath());

+stdlib/java_api.m

@@ -6,16 +6,19 @@
 
 % major version is first number before "."
 
-a = split(v, ".");
+a = strsplit(v, '.');
 if(isempty(a))
   api = 0;
   return
 end
 
-if a(1) == "1"
-  api = double(a(2));
+if a{1} == "1"
+  api = str2double(a{2});
 else
-  api = double(a(1));
+  api = str2double(a{1});
 end
 
 end
+
+
+%!assert(java_api() > 0)

+stdlib/java_version.m

@@ -1,13 +1,19 @@
 %% JAVA_VERSION get version of Java Virtual Machine
-
-function v = java_version()
-
-  v = string(java.lang.System.getProperty("java.version"));
-
 % this gives a long string with more detail
 % version("-java")
 
 % these give the Matlab version, not the JVM version.
 % java.lang.Runtime.version()
 % java.lang.Runtime.getRuntime().version
+
+function v = java_version()
+
+if stdlib.isoctave()
+  v = javaMethod("getProperty", "java.lang.System", "java.version");
+else
+  v = string(java.lang.System.getProperty("java.version"));
 end
+
+end
+
+%!assert(!isempty(java_version()))

+stdlib/relative_to.m

@@ -43,4 +43,5 @@
 %!assert(relative_to("/a/b", "/a/b"), ".")
 %!assert(relative_to("/a/b", "/a/b/c"), "c")
 %!assert(relative_to("/a/b", "/a/b/c/"), "c")
+%!assert(relative_to("a/b/..", "a/b"), "..")
 %!assert(relative_to("/a/b", "d"), "")

test/TestFilePure.m

@@ -10,10 +10,8 @@
 p_is_absolute
 in_filename = {"", "/a/b/c", "/a/b/c/", "a/b/c.txt", "a/b/c.txt.gz"}
 ref_filename = {"", "c", "", "c.txt", "c.txt.gz"}
-dir_is_subdir
-sub_is_subdir
-ref_is_subdir
 
+p_is_subdir
 p_parent
 
 p_join = {{"", "", ""}, ...
@@ -84,6 +82,7 @@
 {"Hello", "Hello/", "."}, ...
 {"./this/one", "./this/two", "../two"}, ...
 {"/path/same", "/path/same/hi/..", "hi/.."}, ...
+{"a/b/..", "a/b", ".."}, ...
 {"", "/", ""}, ...
 {"/", "", ""}, ...
 {"/", "/", "."}, ...
@@ -148,24 +147,20 @@
 end
 
 
-function [dir_is_subdir, sub_is_subdir, ref_is_subdir] = init_is_subdir(classToTest) %#ok<INUSD>
+function [p_is_subdir] = init_is_subdir(classToTest) %#ok<INUSD>
 
-dir_is_subdir = {"a/b", "a/b", "a/b", "a"};
-sub_is_subdir = {"a/b", "a/b/", "a", "a/.c"};
-ref_is_subdir = {false, false, false, true};
+p_is_subdir = {
+  {"a/b", "a/b", false}, ...
+  {"a/b", "a/b/", false}, ...
+  {"a/b", "a", true}, ...
+  {"a/.c", "a", true}, ...
+  {"a/b", "a/b/..", false}  % tricky one
+};
 
 if ispc
-
-dir_is_subdir{end+1} = "c:\";
-sub_is_subdir{end+1} = "c:/";
-ref_is_subdir{end+1} = false;
-
+  p_is_subdir{end+1} = {"c:\", "c:/", false};
 else
-
-dir_is_subdir{end+1} = "/";
-sub_is_subdir{end+1} = "/";
-ref_is_subdir{end+1} = false;
-
+  p_is_subdir{end+1} = {"/", "/", false};
 end
 
 end
@@ -281,9 +276,9 @@ function test_proximate_to(tc, p_proximate_to)
 end
 
 
-function test_is_subdir(tc, dir_is_subdir, sub_is_subdir, ref_is_subdir)
+function test_is_subdir(tc, p_is_subdir)
 tc.assumeTrue(stdlib.has_java)
-tc.verifyEqual(stdlib.is_subdir(sub_is_subdir, dir_is_subdir), ref_is_subdir)
+tc.verifyEqual(stdlib.is_subdir(p_is_subdir{1}, p_is_subdir{2}), p_is_subdir{3}, "subdir(" + p_is_subdir{1} + "," + p_is_subdir{2} + ")")
 end