generalize

scivision · scivision · commit 9fbde32db64f · 2024-12-12T00:41:30.000-05:00
diff --git a/+stdlib/absolute.m b/+stdlib/absolute.m
@@ -31,6 +31,8 @@
 
 try %#ok<TRYNC>
   cwd = string(cwd);
+  p = string(p);
+  base = string(base);
 end
 
 cwd = stdlib.posix(cwd);
diff --git a/+stdlib/auto_chunk_size.m b/+stdlib/auto_chunk_size.m
@@ -7,9 +7,12 @@
 % * dims: proposed dataset dimensions (like size())
 
 function csize = auto_chunk_size(dims)
-arguments
-  dims (1,:) {mustBeInteger,mustBePositive}
-end
+% arguments
+%   dims (1,:) {mustBeInteger,mustBePositive}
+% end
+
+assert(isvector(dims), 'dims must be a vector')
+mustBePositive(dims)
 
 CHUNK_BASE = 16000;  % Multiplier by which chunks are adjusted
 CHUNK_MIN = 8000;    % lower limit: 8 kbyte
@@ -55,4 +58,6 @@
   i = i+1;
 end
 
-end % function
+end
+
+%!assert(auto_chunk_size([15,250,100]), [2,32,25])
diff --git a/+stdlib/checkRAM.m b/+stdlib/checkRAM.m
@@ -6,10 +6,10 @@
 % certainly CAN'T create an array without digging deep into swap or worse.
 
 function [OK,newSizeBytes,freebytes] = checkRAM(newSize, myclass)
-arguments
-  newSize (1,:) {mustBeNumeric}
-  myclass (1,1) string = "double"
-end
+% arguments
+%   newSize (1,:) {mustBeNumeric}
+%   myclass (1,1) string
+% end
 
 % get available RAM
 freebytes = stdlib.ram_free();
@@ -29,3 +29,5 @@
 OK = newSizeBytes < freebytes;
 
 end
+
+%!assert(checkRAM([15,2,1], 'double'), true)
diff --git a/+stdlib/exists.m b/+stdlib/exists.m
@@ -1,5 +1,9 @@
 %% EXISTS does path exist
 %
+% NOTE: in general on Windows existS("not-exist/..") is true, but on
+% Unix it is false.
+% In C/C++ access() or stat() the same behavior is observed Windows vs Unix.
+%
 %%% Inputs
 % * p: path to check
 %%% Outputs
diff --git a/+stdlib/expanduser.m b/+stdlib/expanduser.m
@@ -22,14 +22,11 @@
 end
 
 if ischar(e)
-  if e(1) ~= '~' || (L > 1 && e(1) == '~' && e(2) ~= '/')
-    return
-  end
+  ng = e(1) ~= '~' || (L > 1 && e(1) == '~' && e(2) ~= '/');
 else
-  if ~startsWith(e, "~") || (L > 1 && ~startsWith(e, "~/"))
-    return
-  end
+  ng = ~startsWith(e, "~") || (L > 1 && ~startsWith(e, "~/"));
 end
+if ng, return, end
 
 home = stdlib.homedir(use_java);
 
diff --git a/+stdlib/extract_zstd.m b/+stdlib/extract_zstd.m
@@ -40,3 +40,5 @@ function extract_zstd_bin(archive, out_dir)
 untar(tar_arc, out_dir)
 delete(tar_arc)
 end
+
+%!testif 0
diff --git a/+stdlib/h4exists.m b/+stdlib/h4exists.m
@@ -22,3 +22,5 @@
     rethrow(e)
   end
 end
+
+%!testif 0
diff --git a/+stdlib/h4size.m b/+stdlib/h4size.m
@@ -22,3 +22,5 @@
 fsize = cell2mat({sds(i).Dims.Size});
 
 end
+
+%!testif 0
diff --git a/+stdlib/h4variables.m b/+stdlib/h4variables.m
@@ -20,3 +20,5 @@
 names = string({ds.Name});
 
 end
+
+%!testif 0
diff --git a/+stdlib/h5create_group.m b/+stdlib/h5create_group.m
@@ -53,3 +53,6 @@
 end
 
 end
+
+
+%!testif 0
diff --git a/+stdlib/h5save.m b/+stdlib/h5save.m
@@ -48,4 +48,7 @@ function h5save(filename, varname, A, opts)
     stdlib.h5save_new(filename, varname, A, opts.size, opts.compressLevel)
 end
 
-end % function
+end
+
+
+%!testif 0
diff --git a/+stdlib/handle2filename.m b/+stdlib/handle2filename.m
@@ -1,14 +1,22 @@
 %% HANDLE2FILENAME Convert a file handle to a filename
 
 function n = handle2filename(fileHandle)
-arguments
-  fileHandle (1,1) {mustBeInteger}
-end
+% arguments
+%   fileHandle (1,1) {mustBeInteger}
+% end
+
+mustBeInteger(fileHandle)
+
+n = "";
 
 if fileHandle >= 0
-  n = stdlib.posix(string(fopen(fileHandle)));
-else
-  n = string.empty;
+  n = stdlib.posix(fopen(fileHandle));
 end
 
+try %#ok<TRYNC>
+  n = string(n);
 end
+
+end
+
+%!assert(handle2filename(0), "stdin")
diff --git a/+stdlib/hard_link_count.m b/+stdlib/hard_link_count.m
@@ -26,4 +26,6 @@
 
 end
 
-%!assert(hard_link_count('hard_link_count.m') >= 1)
+%!test
+%! if ispc, return; end
+%! assert(hard_link_count('hard_link_count.m') >= 1)
diff --git a/+stdlib/has_wsl.m b/+stdlib/has_wsl.m
@@ -6,14 +6,15 @@
 persistent wsl;
 
 if isempty(wsl)
+  wsl = false;
   if ispc
     [stat, ~] = system("wsl test 1");
     wsl = stat == 0;
-  else
-    wsl = false;
   end
 end
 
 ok = wsl;
 
 end
+
+%!assert(islogical(has_wsl()))
diff --git a/+stdlib/ini2struct.m b/+stdlib/ini2struct.m
@@ -49,7 +49,7 @@
 
 fclose(f);
 
-end % function
+end
 
 
 function i = is_comment(line)
@@ -59,6 +59,8 @@
 
 end
 
+%!testif 0
+
 % Copyright (c) 2014, freeb
 % Copyright (c) 2008, Andriy Nych
 % Copyright (c) 2009-2010, Evgeny Prilepin aka Iroln
diff --git a/+stdlib/is_absolute.m b/+stdlib/is_absolute.m
@@ -18,6 +18,7 @@
   % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/io/File.html#isAbsolute()
   isabs = java.io.File(p).toPath().isAbsolute();
 else
+  p = string(p);
   L = strlength(p);
   if ispc
     s = "";
diff --git a/+stdlib/is_parallel_worker.m b/+stdlib/is_parallel_worker.m
@@ -24,3 +24,5 @@
 end
 
 end
+
+%!testif 0
diff --git a/+stdlib/is_regular_file.m b/+stdlib/is_regular_file.m
@@ -1,15 +1,23 @@
 %% IS_REGULAR_FILE check if path is a regular file
 
-function isreg = is_regular_file(p)
-arguments
-  p (1,1) string
-end
-
-opt = java.nio.file.LinkOption.values;
+function r = is_regular_file(p)
+% arguments
+%   p (1,1) string
+% end
 
 % needs absolute()
 p = stdlib.absolute(p, "", false, true);
 
-isreg = java.nio.file.Files.isRegularFile(java.io.File(p).toPath(), opt);
+if stdlib.isoctave()
+  opt = javaMethod("values", "java.nio.file.LinkOption");
+  op = javaObject("java.io.File", p).toPath();
+  r = javaMethod("isRegularFile", "java.nio.file.Files", op, opt);
+else
+  opt = java.nio.file.LinkOption.values;
+  op = java.io.File(p).toPath();
+  r = java.nio.file.Files.isRegularFile(op, opt);
+end
 
 end
+
+%!assert(is_regular_file('is_regular_file.m'))
diff --git a/+stdlib/is_symlink.m b/+stdlib/is_symlink.m
@@ -4,11 +4,15 @@
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#isSymbolicLink(java.nio.file.Path)
 
 function ok = is_symlink(p)
-arguments
-  p (1,1) string
-end
+% arguments
+%   p (1,1) string
+% end
 
-if isMATLABReleaseOlderThan("R2024b")
+if stdlib.isoctave()
+  p = stdlib.absolute(p, "", false, true);
+  op = javaObject("java.io.File", p).toPath();
+  ok = javaMethod("isSymbolicLink", "java.nio.file.Files", op);
+elseif isMATLABReleaseOlderThan("R2024b")
   % must be absolute path
   % NOT .canonical or symlink is gobbled!
   p = stdlib.absolute(p, "", false, true);
@@ -18,3 +22,8 @@
 end
 
 end
+
+%!test
+%! p = tempname();
+%! assert(create_symlink(mfilename("fullpath"), p))
+%! assert(is_symlink(p))
diff --git a/+stdlib/is_wsl_path.m b/+stdlib/is_wsl_path.m
@@ -3,14 +3,16 @@
 % Ref: https://learn.microsoft.com/en-us/windows/wsl/filesystems
 
 function iswsl = is_wsl_path(p)
-arguments
-  p (1,1) string
-end
+% arguments
+%   p (1,1) string
+% end
 
 if ispc
-  iswsl = any(startsWith(p, ["\\wsl$", "\\wsl.localhost"]));
+  iswsl = strncmp(p, "\\wsl$", 6) || strncmp(p, "\\wsl.localhost", 15);
 else
   iswsl = false;
 end
 
 end
+
+%!assert(!is_wsl_path("C:/"))
diff --git a/+stdlib/iswsl.m b/+stdlib/iswsl.m
@@ -2,7 +2,7 @@
 % Detects if Matlab or GNU Octave is installed and running from within
 % Windows Subsystem for Linux
 
-function yeswsl = iswsl()
+function w = iswsl()
 
 persistent wsl;
 
@@ -13,11 +13,13 @@
     if fid >= 1
       v = fscanf(fid,'%s');
       fclose(fid);
-      wsl = contains(v, 'microsoft-standard');
+      wsl = ~isempty(strfind(v, 'microsoft-standard')); %#ok<*STREMP>
     end
   end
 end
 
-yeswsl=wsl; % has to be a separate line/variable for matlab
+w = wsl; % has to be a separate line/variable for matlab
 
 end
+
+%!assert(islogical(iswsl()))
diff --git a/+stdlib/join.m b/+stdlib/join.m
@@ -44,6 +44,8 @@
 
 end
 
+p = stdlib.posix(p);
+
 end
 
 %!assert(join("", ""), "")
diff --git a/+stdlib/len.m b/+stdlib/len.m
@@ -13,3 +13,5 @@
 end
 
 end
+
+%!assert(len('abc'), 3)
diff --git a/+stdlib/ncsave.m b/+stdlib/ncsave.m
@@ -52,3 +52,5 @@ function ncsave(filename, varname, A, opts)
 end
 
 end
+
+%!testif 0
diff --git a/+stdlib/normalize.m b/+stdlib/normalize.m
@@ -21,7 +21,7 @@
   n = stdlib.posix(java.io.File(p).toPath().normalize().toString());
 else
 
-  n = stdlib.posix(p);
+  n = stdlib.posix(string(p));
 
   % use split to remove /../ and /./ and duplicated /
   parts = split(n, '/');
diff --git a/+stdlib/null_file.m b/+stdlib/null_file.m
@@ -9,3 +9,5 @@
 end
 
 end
+
+%!assert(ischar(null_file()))
diff --git a/+stdlib/resolve.m b/+stdlib/resolve.m
@@ -22,4 +22,4 @@
 
 end
 
-%!assert (resolve(''), pwd())
+%!assert (resolve(''), stdlib.posix(pwd()))
diff --git a/+stdlib/samepath.m b/+stdlib/samepath.m
@@ -3,6 +3,10 @@
 % true if inputs resolve to same path.
 % Both paths must exist.
 %
+% NOTE: in general on Windows same(".", "not-exist/..") is true, but on
+% Unix it is false.
+% In C/C++ access() or stat() the same behavior is observed Windows vs Unix.
+%
 %%% Inputs
 % * path1, path2: paths to compare
 %%% Outputs
@@ -25,4 +29,4 @@
 
 %!assert(samepath(".", "."))
 %!assert(samepath(".", "./"))
-%!assert(!samepath(".", "not-exist/.."))
+%!assert(!samepath("not-exist", "not-exist/.."))
diff --git a/+stdlib/subprocess_run.m b/+stdlib/subprocess_run.m
@@ -101,3 +101,5 @@
 reader.close()
 
 end
+
+%!testif 0
diff --git a/+stdlib/which.m b/+stdlib/which.m
@@ -54,3 +54,5 @@
 exe = string.empty;
 
 end
+
+%!testif 0
diff --git a/+stdlib/windows_shortname.m b/+stdlib/windows_shortname.m
@@ -30,3 +30,5 @@
 delete(fso);
 
 end
+
+%!testif 0
diff --git a/+stdlib/winpath2wslpath.m b/+stdlib/winpath2wslpath.m
diff --git a/+stdlib/wsl_tempfile.m b/+stdlib/wsl_tempfile.m
diff --git a/+stdlib/wslpath2winpath.m b/+stdlib/wslpath2winpath.m
diff --git a/test/TestFileImpure.m b/test/TestFileImpure.m
diff --git a/test/TestJava.m b/test/TestJava.m
diff --git a/test/TestResolve.m b/test/TestResolve.m

-Original file line number
+Diff line change
 end
 end
++
++
 +%!testif 0