test: device,inode: compact, stricter

Author: scivision

+stdlib/+java/device.m

@@ -1,6 +1,6 @@
 function i = device(p)
 
 opt = javaMethod("values", "java.nio.file.LinkOption");
-i = javaMethod("getAttribute", "java.nio.file.Files", javaPathObject(p), "unix:dev", opt);
+i = uint64(javaMethod("getAttribute", "java.nio.file.Files", javaPathObject(p), "unix:dev", opt));
 
 end

+stdlib/device.m

@@ -1,17 +1,13 @@
 %% DEVICE filesystem device index of path
 
-function i = device(p)
+function i = device(file, method)
 arguments
-  p {mustBeTextScalar}
+  file {mustBeTextScalar}
+  method (1,:) string = ["java", "python", "sys"]
 end
 
-if isunix() && stdlib.has_java()
-  i = stdlib.java.device(p);
-elseif stdlib.has_python()
-  i = stdlib.python.device(p);
-else
-  i = stdlib.sys.device(p);
-end
+fun = choose_method(method, "device");
+i = fun(file);
 
 end
 

+stdlib/inode.m

@@ -2,18 +2,14 @@
 %
 % Windows always returns 0, Unix returns inode number.
 
-function i = inode(p)
+function i = inode(file, method)
 arguments
-  p {mustBeTextScalar}
+  file {mustBeTextScalar}
+  method (1,:) string = ["java", "python", "sys"]
 end
 
-if isunix() && stdlib.has_java()
-  i = stdlib.java.inode(p);
-elseif stdlib.has_python()
-  i = stdlib.python.inode(p);
-else
-  i = stdlib.sys.inode(p);
-end
+fun = choose_method(method, "inode");
+i = fun(file);
 
 end
 

+stdlib/private/choose_method.m

@@ -20,7 +20,7 @@
       end
     case "java"
       has = @stdlib.has_java;
-      if endsWith(name, "hard_link_count")
+      if endsWith(name, ["device", "hard_link_count", "inode"])
         if ~isunix(), continue, end
       end
     case "python"

+stdlib/samepath.m

@@ -7,6 +7,8 @@
 % Unix it is false.
 % In C/C++ access() or stat() the same behavior is observed Windows vs Unix.
 %
+% Ref: https://devblogs.microsoft.com/oldnewthing/20220128-00/?p=106201
+%
 %%% Inputs
 % * path1, path2: paths to compare
 

test/TestDisk.m

@@ -7,8 +7,8 @@
 properties (TestParameter)
 Ps = {".", "", "/", getenv("SystemDrive"), "not-exist"}
 Po = {mfilename("fullpath") + ".m", pwd(), ".", "", tempname()}
-device_fun = {@stdlib.device, @stdlib.sys.device, @stdlib.java.device, @stdlib.python.device}
-inode_fun = {@stdlib.inode, @stdlib.sys.inode, @stdlib.java.inode, @stdlib.python.inode}
+id_fun = {'sys', 'java', 'python'}
+id_name = {"inode", "device"}
 disk_ac_fun = {'sys', 'dotnet', 'java', 'python'}
 disk_ac_name = {'disk_available', 'disk_capacity'}
 hl_fun = {'java', 'python'}
@@ -31,10 +31,11 @@ function test_disk_ac(tc, Ps, disk_ac_fun, disk_ac_name)
 tc.assertNotEmpty(which(n))
 
 try
+  r = h(Ps, disk_ac_fun);
   if stdlib.exists(Ps)
-    tc.verifyGreaterThanOrEqual(h(Ps), 0)
+    tc.verifyGreaterThanOrEqual(r, 0)
   else
-    tc.verifyEqual(h(Ps), uint64(0))
+    tc.verifyEqual(r, uint64(0))
   end
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
@@ -47,8 +48,10 @@ function test_hard_link_count(tc, hl_fun)
 n = "stdlib." + hl_fun + "." + fname;
 h = str2func("stdlib." + fname);
 tc.assertNotEmpty(which(n))
+P = mfilename("fullpath") + ".m";
 try
-  tc.verifyGreaterThanOrEqual(h(mfilename("fullpath") + ".m"), 1)
+  r = h(P, hl_fun);
+  tc.verifyGreaterThanOrEqual(r, 1)
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
 end
@@ -87,19 +90,20 @@ function test_remove_file(tc)
 end
 
 
-function test_device(tc, device_fun)
-is_capable(tc, device_fun)
-
-tc.verifyGreaterThan(device_fun(pwd()), uint64(0))
-tc.verifyEqual(device_fun("."), device_fun(pwd()))
+function test_inode_device(tc, id_fun, id_name)
+n = "stdlib." + id_fun + "." + id_name;
+h = str2func("stdlib." + id_name);
+tc.assertNotEmpty(which(n))
 
+try
+    ip = h(pwd(), id_fun);
+    tc.verifyClass(ip, 'uint64')
+    tc.verifyGreaterThan(ip, 0)
+    tc.verifyEqual(h(".", id_fun), ip)
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
 end
 
-
-function test_inode(tc, inode_fun)
-is_capable(tc, inode_fun)
-
-tc.verifyEqual(inode_fun("."), inode_fun(pwd()))
 end
 
 

test/TestExists.m

@@ -34,7 +34,8 @@ function test_is_rw(tc, Ps, method, fname)
 h = str2func("stdlib." + fname);
 tc.assertNotEmpty(which(n))
 try
-  tc.verifyEqual(h(Ps{1}, method), Ps{2})
+  r = h(Ps{1}, method);
+  tc.verifyEqual(r, Ps{2})
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
 end

test/is_capable.m

@@ -25,7 +25,7 @@ function is_capable(tc, f)
   japi = stdlib.java_api();
   tc.assumeGreaterThan(japi, 0, "Java not available")
 
-  if endsWith(n, ["device", "inode","is_admin"])
+  if endsWith(n, "is_admin")
     tc.assumeTrue(isunix())
   end