test, backend: more efficient, robust

Author: scivision

+stdlib/+dotnet/is_admin.m

@@ -2,10 +2,6 @@
 
 function y = is_admin()
 
-% com.sun.security.auth.module.NTSystem().getGroupIDs();
-% Administrator group SID (S-1-5-32-544) is not an appropriate check .getGroupIDs because it
-% only tells if a user is *allowed* to run as admin, not if they are currently running as admin.
-
 % Use .NET System.Security.Principal to check for admin privileges
 identity = System.Security.Principal.WindowsIdentity.GetCurrent();
 principal = System.Security.Principal.WindowsPrincipal(identity);

+stdlib/+dotnet/ram_total.m

@@ -3,5 +3,11 @@
 function bytes = ram_total()
   % .NET is 2-3x faster than Java for this
   % https://learn.microsoft.com/en-us/dotnet/api/system.gcmemoryinfo.totalavailablememorybytes
-  bytes = uint64(System.GC.GetGCMemoryInfo().TotalAvailableMemoryBytes);
+  try
+    bytes = System.GC.GetGCMemoryInfo().TotalAvailableMemoryBytes;
+  catch
+    bytes = [];
+  end
+
+  bytes = uint64(bytes);
 end

+stdlib/+java/is_admin.m

@@ -1,5 +1,13 @@
-function y = is_admin()
+function ok = is_admin()
 
-y = com.sun.security.auth.module.UnixSystem().getUid() == 0;
+% com.sun.security.auth.module.NTSystem().getGroupIDs();
+% Administrator group SID (S-1-5-32-544) is not an appropriate check .getGroupIDs because it
+% only tells if a user is *allowed* to run as admin, not if they are currently running as admin.
+
+ok = logical.empty;
+
+try %#ok<TRYNC>
+  ok = com.sun.security.auth.module.UnixSystem().getUid() == 0;
+end
 
 end

+stdlib/+python/cpu_load.m

@@ -1,6 +1,12 @@
 function L = cpu_load()
 
-Lavg = py.os.getloadavg();
-L = double(Lavg(1));
+L = [];
+
+try %#ok<TRYNC>
+  L = py.os.getloadavg();
+  L = double(L(1));
+end
+
+
 
 end

+stdlib/+python/ram_free.m

@@ -4,7 +4,7 @@
   vm = py.psutil.virtual_memory();
   n = vm.available;
 catch
-  n = 0;
+  n = [];
 end
 
 n = uint64(n);

+stdlib/+python/ram_total.m

@@ -3,9 +3,8 @@
 try
   vm = py.psutil.virtual_memory();
   n = vm.total;
-catch e
-  warning(e.identifier, 'stdlib.python.ram_total() failed: %s', e.message)
-  n = 0;
+catch
+  n = [];
 end
 
 n = uint64(n);

+stdlib/private/hbackend.m

@@ -10,9 +10,25 @@
   minVersion (1,1) string = ""
 end
 
+if isscalar(backend)
+  % bypass checks
+  m = backend;
+else
+  m = switchyard(backend, name, minVersion);
+end
+
+n = "stdlib." + m + "." + name;
+fun = str2func(n);
+
+end
+
+
+function m = switchyard(backend, name, minVersion)
+
+
 for m = backend
   switch m
-    case "dotnet"
+    case 'dotnet'
       has = @stdlib.has_dotnet;
 
       if endsWith(name, ["create_symlink", "ram_total", "read_symlink"])
@@ -30,7 +46,7 @@
         if ~isunix(), continue, end
       end
 
-    case "python"
+    case 'python'
 
       has = @stdlib.has_python;
 
@@ -46,17 +62,17 @@
         if ~isunix() || stdlib.matlabOlderThan('R2024a'), continue, end
       end
 
-    case "legacy", has = true;
+    case 'legacy', has = true;
 
-    case "native"
+    case 'native'
 
       has = stdlib.strempty(minVersion) || ~stdlib.matlabOlderThan(minVersion);
 
       if endsWith(name, "create_symlink")
         if ~has || ispc(), continue, end
       end
 
-    case "sys"
+    case 'sys'
 
       has = true;
 
@@ -69,8 +85,6 @@
   end
 
   if has()
-    n = "stdlib." + m + "." + name;
-    fun = str2func(n);
     return
   end
 end

test/TestCanonical.m

@@ -10,7 +10,7 @@
 {"not-exist/a/..", "not-exist"}, ...
 {"./not-exist", "not-exist"}
 };
-backend = {"native", "legacy"}
+backend = {'native', 'legacy'}
 end
 
 methods(TestClassSetup)

test/TestDisk.m

@@ -8,12 +8,12 @@
 properties (TestParameter)
 Ps = {".", "", "/", getenv("SystemDrive"), "not-exist"}
 Po = {mfilename("fullpath") + ".m", pwd(), ".", "", "not-exist"}
-java_python_sys = {'sys', 'java', 'python'}
+backend_jps = {'sys', 'java', 'python'}
 id_name = {"inode", "device"}
-all_fun = {'sys', 'dotnet', 'java', 'python'}
+backend_djps = {'sys', 'dotnet', 'java', 'python'}
 disk_ac_name = {'disk_available', 'disk_capacity'}
-is_remove = {'dotnet', 'sys'}
-py_sys = {'python', 'sys'}
+backend_ds = {'dotnet', 'sys'}
+backend_ps = {'python', 'sys'}
 end
 
 methods(TestClassSetup)
@@ -26,13 +26,11 @@ function test_dirs(tc)
 
 methods (Test)
 
-function test_disk_ac(tc, Ps, all_fun, disk_ac_name)
-n = "stdlib." + all_fun + "." + disk_ac_name;
+function test_disk_ac(tc, Ps, backend_djps, disk_ac_name)
 h = str2func("stdlib." + disk_ac_name);
-tc.assertNotEmpty(which(n))
 
 try
-  r = h(Ps, all_fun);
+  r = h(Ps, backend_djps);
   if stdlib.exists(Ps)
     tc.verifyGreaterThanOrEqual(r, 0)
   else
@@ -44,9 +42,9 @@ function test_disk_ac(tc, Ps, all_fun, disk_ac_name)
 end
 
 
-function test_is_removable(tc, is_remove)
+function test_is_removable(tc, backend_ds)
 try
-  y = stdlib.is_removable(pwd(), is_remove);
+  y = stdlib.is_removable(pwd(), backend_ds);
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
   return
@@ -56,46 +54,42 @@ function test_is_removable(tc, is_remove)
 end
 
 
-function test_is_mount(tc, py_sys)
+function test_is_mount(tc, backend_ps)
 try
-  y = stdlib.is_mount(pwd(), py_sys);
+  y = stdlib.is_mount(pwd(), backend_ps);
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
   return
 end
 
 tc.verifyClass(y, 'logical')
-tc.verifyTrue(stdlib.is_mount("/", py_sys))
-tc.verifyFalse(stdlib.is_mount(tempname(), py_sys))
+tc.verifyTrue(stdlib.is_mount("/", backend_ps))
+tc.verifyFalse(stdlib.is_mount(tempname(), backend_ps))
 
 if ispc()
   sd = getenv("SystemDrive");
   tc.assertTrue(sd == stdlib.root_name(sd), sd)
-  tc.verifyFalse(stdlib.is_mount(sd, py_sys), sd)
-  tc.verifyTrue(stdlib.is_mount(sd + "/", py_sys), sd)
-  tc.verifyTrue(stdlib.is_mount(sd + "\", py_sys), sd)
+  tc.verifyFalse(stdlib.is_mount(sd, backend_ps), sd)
+  tc.verifyTrue(stdlib.is_mount(sd + "/", backend_ps), sd)
+  tc.verifyTrue(stdlib.is_mount(sd + "\", backend_ps), sd)
 end
 end
 
 
-function test_hard_link_count(tc, java_python_sys)
-fname = "hard_link_count";
-n = "stdlib." + java_python_sys + "." + fname;
-h = str2func("stdlib." + fname);
-tc.assertNotEmpty(which(n))
+function test_hard_link_count(tc, backend_jps)
 P = mfilename("fullpath") + ".m";
 try
-  r = h(P, java_python_sys);
+  r = stdlib.hard_link_count(P, backend_jps);
   tc.verifyGreaterThanOrEqual(r, 1)
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
 end
 end
 
 
-function test_filesystem_type(tc, Ps, all_fun)
+function test_filesystem_type(tc, Ps, backend_djps)
 try
-  t = stdlib.filesystem_type(Ps, all_fun);
+  t = stdlib.filesystem_type(Ps, backend_djps);
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
   return
@@ -125,27 +119,27 @@ function test_remove_file(tc)
 end
 
 
-function test_inode_device(tc, java_python_sys, id_name)
+function test_inode_device(tc, backend_jps, id_name)
 
 h = str2func("stdlib." + id_name);
 
 try
-    ip = h(pwd(), java_python_sys);
+    ip = h(pwd(), backend_jps);
     tc.verifyClass(ip, 'uint64')
     tc.verifyGreaterThan(ip, 0)
 
-    tc.verifyEqual(h(".", java_python_sys), ip)
+    tc.verifyEqual(h(".", backend_jps), ip)
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
 end
 
 end
 
 
-function test_owner(tc, Po, all_fun)
+function test_owner(tc, Po, backend_djps)
 
 try
-  o = stdlib.get_owner(Po, all_fun);
+  o = stdlib.get_owner(Po, backend_djps);
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
   return
@@ -160,9 +154,9 @@ function test_owner(tc, Po, all_fun)
 end
 
 
-function test_owner_array(tc, all_fun)
+function test_owner_array(tc, backend_djps)
 try
-  o = stdlib.get_owner([".", pwd(), "not-exist", ""], all_fun);
+  o = stdlib.get_owner([".", pwd(), "not-exist", ""], backend_djps);
   L = strlength(o);
   tc.verifyEqual(L(3:4), [0, 0])
   tc.verifyGreaterThan(strlength(o(1:2)), 0);

test/TestExists.m

@@ -13,7 +13,7 @@
 % on CI matlabroot can be writable!
 fname = {'is_readable', 'is_writable'}
 backend = {'java', 'native', 'legacy'}
-icm = {'python', 'sys'}
+backend_ps = {'python', 'sys'}
 end
 
 methods(TestClassSetup)
@@ -57,12 +57,12 @@ function test_is_rw_array(tc, backend, fname)
 end
 
 
-function test_is_char_device(tc, icm)
+function test_is_char_device(tc, backend_ps)
 % /dev/stdin may not be available on CI systems
 n = stdlib.null_file();
 
 try
-  tc.verifyTrue(stdlib.is_char_device(n, icm), n)
+  tc.verifyTrue(stdlib.is_char_device(n, backend_ps), n)
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
 end