tighten logic for corner cases

scivision · scivision · commit 6874c75dc3fe · 2025-06-25T09:21:13.000-05:00
diff --git a/+stdlib/device.m b/+stdlib/device.m
@@ -22,3 +22,6 @@
 end
 
 end
+
+%!assert(device(pwd) >= 0);
+%!assert(isempty(device(tempname())));
diff --git a/+stdlib/expanduser.m b/+stdlib/expanduser.m
@@ -37,7 +37,7 @@
 
 %!assert(expanduser(''), '')
 %!assert(expanduser("~"), homedir())
-%!assert(expanduser("~/"), homedir())
+%!assert(expanduser("~/"), strcat(homedir(), '/'))
 %!assert(expanduser("~user"), "~user")
-%!assert(expanduser("~user/"), "~user")
-%!assert(expanduser("~///c"), strcat(homedir(), "/c"))
+%!assert(expanduser("~user/"), "~user/")
+%!assert(expanduser("~/c"), strcat(homedir(), "/c"))
diff --git a/+stdlib/get_modtime.m b/+stdlib/get_modtime.m
@@ -34,6 +34,6 @@
 
 %!test
 %! p = tempname();
-%! assert(touch(p, []))
+%! assert(touch(p, now))
 %! assert(get_modtime(p) > 0)
 %! delete(p)
diff --git a/+stdlib/get_owner.m b/+stdlib/get_owner.m
@@ -27,4 +27,3 @@
 end
 
 %!assert(!isempty(get_owner(pwd)))
-%!assert(isempty(get_owner(tempname)))
diff --git a/+stdlib/get_permissions.m b/+stdlib/get_permissions.m
@@ -70,4 +70,4 @@
 
 end
 
-%!assert(length(get_permissions('get_permissions.m')) == 9)
+%!assert(length(get_permissions('get_permissions.m')) >= 9)
diff --git a/+stdlib/inode.m b/+stdlib/inode.m
@@ -22,3 +22,6 @@
 end
 
 end
+
+%!assert(inode(pwd) >= 0);
+%!assert(isempty(inode(tempname())));
diff --git a/+stdlib/is_admin.m b/+stdlib/is_admin.m
@@ -4,3 +4,5 @@
 function is_admin()
 error("buildtool mex")
 end
+
+%!testif 0
diff --git a/+stdlib/is_regular_file.m b/+stdlib/is_regular_file.m
@@ -7,7 +7,7 @@
 end
 
 % needs absolute()
-p = stdlib.absolute(p);
+p = stdlib.absolute(p, pwd());
 
 op = javaPathObject(p);
 opt = javaLinkOption();
diff --git a/+stdlib/is_symlink.m b/+stdlib/is_symlink.m
@@ -13,7 +13,8 @@
   switch e.identifier
     case "MATLAB:UndefinedFunction", ok = java.nio.file.Files.isSymbolicLink(javaPathObject(stdlib.absolute(p)));
     case "Octave:undefined-function"
-      [s, err] = stat(p);
+      % use lstat() to work with a broken symlink, like Matlab isSymbolicLink
+      [s, err] = lstat(p);
       ok = err == 0 && S_ISLNK(s.mode);
     otherwise, rethrow(e)
   end
@@ -24,6 +25,7 @@
 %!test
 %! if !ispc
 %! p = tempname();
-%! assert(create_symlink(mfilename("fullpath"), p))
-%! assert(is_symlink(p))
+%! assert(create_symlink("is_symlink.m", p))
+%! assert(is_symlink(p), p)
+%! delete(p)
 %! endif
diff --git a/+stdlib/proximate_to.m b/+stdlib/proximate_to.m
@@ -12,3 +12,5 @@
 function proximate_to(~,~)
 error("buildtool mex")
 end
+
+%!testif 0
diff --git a/+stdlib/relative_to.m b/+stdlib/relative_to.m
@@ -15,3 +15,5 @@
 function relative_to(~,~)
 error("buildtool mex")
 end
+
+%!testif 0
diff --git a/+stdlib/remove.m b/+stdlib/remove.m
@@ -2,20 +2,33 @@
 % optional: mex
 %
 % Matlab or GNU Octave delete() has trouble with not being able to delete
-% open files on Windows. This function overcomes that limitation by returning
+% open files on Windows. This function mitigates that limitation by returning
 % a boolean success status.
 
 function ok = remove(apath)
 arguments
   apath {mustBeTextScalar}
 end
 
+ok = false;
+
+if stdlib.isoctave() && ~stdlib.exists(apath)
+  return
+end
+
 %% fallback for if MEX not compiled
-try
+try %#ok<*TRYNC>
   delete(apath);
   ok = true;
-catch
+end
+
+[~, id] = lastwarn();
+
+if strcmp(id, 'MATLAB:DELETE:FileNotFound')
   ok = false;
 end
 
+
 end
+
+%!assert(!remove(tempname()))
diff --git a/+stdlib/root.m b/+stdlib/root.m
@@ -10,7 +10,6 @@
 
 end
 
-%!assert(root(''), '')
 %!assert(root('/'), '/')
 %!test
 %! if ispc
diff --git a/+stdlib/root_dir.m b/+stdlib/root_dir.m
@@ -29,3 +29,5 @@
 end
 
 end
+
+%!assert(root_dir(pwd()) == '/')
diff --git a/+stdlib/set_modtime.m b/+stdlib/set_modtime.m
@@ -10,10 +10,9 @@
 try
   utc = convertTo(datetime(t, "TimeZone", "UTC"), "posixtime");
 catch e
-  if strcmp(e.identifier, "Octave:undefined-function")
-    utc = t;
-  else
-    rethrow(e);
+  switch e.identifier
+    case "Octave:undefined-function", utc = t;
+    otherwise, rethrow(e);
   end
 end
 
@@ -23,7 +22,7 @@
 
 %!test
 %! p = tempname();
-%! t = time()
-%! assert(touch(p, []))
+%! t = now();
+%! assert(touch(p, t))
 %! assert(set_modtime(p, t))
 %! delete(p)
diff --git a/+stdlib/set_permissions.m b/+stdlib/set_permissions.m
@@ -42,3 +42,5 @@
 end
 
 end
+
+%testif 0
diff --git a/+stdlib/touch.m b/+stdlib/touch.m
@@ -3,34 +3,22 @@
 function ok = touch(p, t)
 arguments
   p {mustBeTextScalar}
-  t datetime {mustBeScalarOrEmpty} = datetime.empty
+  t (1,1) datetime = datetime("now")
 end
 
-ok = false;
-
 if ~stdlib.exists(p)
   fid = fopen(p, "w");
   ok = fid > 0 && fclose(fid) == 0;
-  if isempty(t)
-    return
-  end
-end
-
-if isempty(t)
-  t = datetime("now");
 end
 
-try
+if ok
   ok = stdlib.set_modtime(p, t);
-catch e
-  if ~strcmp(e.identifier, "MATLAB:undefinedVarOrClass")
-    rethrow(e)
-  end
 end
 
 end
 
 %!test
 %! f = tempname();
-%! assert (touch(f, []))
+%! assert (touch(f, now()))
 %! assert (isfile(f))
+%! delete(f)

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,3 @@`
`27`	`27`	`end`
`28`	`28`
`29`	`29`	`%!assert(!isempty(get_owner(pwd)))`
`30`		`-%!assert(isempty(get_owner(tempname)))`
Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,4 @@`
`70`	`70`
`71`	`71`	`end`
`72`	`72`
`73`		`-%!assert(length(get_permissions('get_permissions.m')) == 9)`
	`73`	`+%!assert(length(get_permissions('get_permissions.m')) >= 9)`