test:disk_{avail,cap} param fun

Author: scivision

+stdlib/+dotnet/disk_available.m

@@ -0,0 +1,9 @@
+function f = disk_available(p)
+
+f = uint64(0);
+
+if ~stdlib.exists(p), return, end
+
+f = uint64(System.IO.DriveInfo(stdlib.absolute(p)).AvailableFreeSpace());
+% https://learn.microsoft.com/en-us/dotnet/api/system.io.driveinfo.availablefreespace
+end

+stdlib/+dotnet/disk_capacity.m

@@ -1,5 +1,9 @@
 function f = disk_capacity(d)
 
+f = uint64(0);
+
+if ~stdlib.exists(d), return, end
+
 f = uint64(System.IO.DriveInfo(stdlib.absolute(d)).TotalSize());
 % https://learn.microsoft.com/en-us/dotnet/api/system.io.driveinfo.totalsize
 

+stdlib/+java/disk_available.m

@@ -0,0 +1,5 @@
+function f = disk_available(d)
+
+f = uint64(javaObject("java.io.File", d).getUsableSpace());
+
+end

+stdlib/+python/disk_available.m

@@ -1,11 +1,15 @@
-function f = disk_available(d)
+function f = disk_available(p)
+
+f = uint64(0);
+
+if ~stdlib.exists(p), return, end
 
 try
-  di = py.shutil.disk_usage(d);
+  di = py.shutil.disk_usage(p);
   f = int64(di.free);
   % int64 first is for Matlab <= R2022a
 catch e
-  warning(e.identifier, "disk_available(%s) failed: %s", d, e.message);
+  warning(e.identifier, "disk_available(%s) failed: %s", p, e.message);
   f = [];
 end
 

+stdlib/+python/disk_capacity.m

@@ -1,11 +1,15 @@
-function f = disk_capacity(d)
+function f = disk_capacity(p)
+
+f = uint64(0);
+
+if ~stdlib.exists(p), return, end
 
 try
-  di = py.shutil.disk_usage(d);
+  di = py.shutil.disk_usage(p);
   f = int64(di.total);
   % int64 first is for Matlab <= R2022a
 catch e
-  warning(e.identifier, "disk_capacity(%s) failed: %s", d, e.message);
+  warning(e.identifier, "disk_capacity(%s) failed: %s", p, e.message);
   f = 0;
 end
 

+stdlib/+sys/disk_available.m

@@ -1,5 +1,9 @@
 function t = disk_available(p)
 
+t = uint64(0);
+
+if ~stdlib.exists(p), return, end
+
 if ispc()
   dl = extractBefore(stdlib.absolute(p), 2);
   cmd = "pwsh -c (Get-Volume -DriveLetter " + dl + ").SizeRemaining";

+stdlib/+sys/disk_capacity.m

@@ -1,5 +1,9 @@
 function t = disk_capacity(p)
 
+t = uint64(0);
+
+if ~stdlib.exists(p), return, end
+
 if ispc()
   dl = extractBefore(stdlib.absolute(p), 2);
   cmd = "pwsh -c (Get-Volume -DriveLetter " + dl + ").Size";

+stdlib/disk_available.m

@@ -13,10 +13,9 @@
 if ~stdlib.exists(d), return, end
 
 if stdlib.has_dotnet()
-  f = System.IO.DriveInfo(stdlib.absolute(d)).AvailableFreeSpace();
-  % https://learn.microsoft.com/en-us/dotnet/api/system.io.driveinfo.availablefreespace
+  f = stdlib.dotnet.disk_available(d);
 elseif stdlib.has_java()
-  f = javaObject("java.io.File", d).getUsableSpace();
+  f = stdlib.java.disk_available(d);
 elseif stdlib.has_python()
   f = stdlib.python.disk_available(d);
 end

+stdlib/disk_capacity.m

@@ -9,8 +9,6 @@
 
 f = uint64(0);
 
-if ~stdlib.exists(d), return, end
-
 if stdlib.has_dotnet()
   f = stdlib.dotnet.disk_capacity(d);
 elseif stdlib.has_java()

test/TestDisk.m

@@ -8,30 +8,34 @@
 properties (TestParameter)
 Ps = {".", "", "/", getenv("SystemDrive"), "not-exist"}
 device_fun = {@stdlib.device, @stdlib.sys.device, @stdlib.java.device, @stdlib.python.device}
+disk_available_fun = {@stdlib.disk_available, @stdlib.sys.disk_available, @stdlib.dotnet.disk_available, @stdlib.java.disk_available, @stdlib.python.disk_available}
+disk_capacity_fun  = {@stdlib.disk_capacity,  @stdlib.sys.disk_capacity,  @stdlib.dotnet.disk_capacity,  @stdlib.java.disk_capacity,  @stdlib.python.disk_capacity}
 end
 
 methods (Test)
 
-function test_disk_available(tc, Ps)
+function test_disk_available(tc, Ps, disk_available_fun)
+is_capable(tc, disk_available_fun)
 
 zero = uint64(0);
 
 if stdlib.exists(Ps)
-  tc.verifyGreaterThan(stdlib.disk_available(Ps), zero)
+  tc.verifyGreaterThan(disk_available_fun(Ps), zero)
 else
-  tc.verifyEqual(stdlib.disk_available(Ps), zero)
+  tc.verifyEqual(disk_available_fun(Ps), zero)
 end
 end
 
 
-function test_disk_capacity(tc, Ps)
+function test_disk_capacity(tc, Ps, disk_capacity_fun)
+is_capable(tc, disk_capacity_fun)
 
 zero = uint64(0);
 
 if stdlib.exists(Ps)
-  tc.verifyGreaterThan(stdlib.disk_capacity(Ps), zero)
+  tc.verifyGreaterThan(disk_capacity_fun(Ps), zero)
 else
-  tc.verifyEqual(stdlib.disk_capacity(Ps), zero)
+  tc.verifyEqual(disk_capacity_fun(Ps), zero)
 end
 end
 
@@ -88,5 +92,3 @@ function test_owner(tc)
 
 end
 end
-
-