test:cpu_arch parameter fun

Author: scivision

+stdlib/+dotnet/cpu_arch.m

@@ -0,0 +1,4 @@
+function a = cpu_arch()
+a = string(System.Runtime.InteropServices.RuntimeInformation.OSArchitecture);
+% https://learn.microsoft.com/en-us/dotnet/core/compatibility/interop/7.0/osarchitecture-emulation
+end

+stdlib/+java/cpu_arch.m

@@ -0,0 +1,5 @@
+function a = cpu_arch()
+
+a = string(javaMethod("getProperty", "java.lang.System", "os.arch"));
+
+end

+stdlib/cpu_arch.m

@@ -3,10 +3,9 @@
 function a = cpu_arch()
 
 if stdlib.has_dotnet()
-  a = System.Runtime.InteropServices.RuntimeInformation.OSArchitecture;
-  % https://learn.microsoft.com/en-us/dotnet/core/compatibility/interop/7.0/osarchitecture-emulation
+  a = stdlib.dotnet.cpu_arch();
 elseif stdlib.has_java()
-  a = javaMethod("getProperty", "java.lang.System", "os.arch");
+  a = stdlib.java.cpu_arch();
 else
   a = computer('arch');
 end

test/TestSys.m

@@ -7,6 +7,7 @@
 properties (TestParameter)
 fun = {stdlib.isoctave, stdlib.has_dotnet, ...
        stdlib.has_java, stdlib.has_python}
+cpu_arch_fun = {@stdlib.cpu_arch, @stdlib.dotnet.cpu_arch, @stdlib.java.cpu_arch}
 ram_free_fun = {@stdlib.ram_free, @stdlib.sys.ram_free, @stdlib.java.ram_free, @stdlib.python.ram_free}
 ram_total_fun = {@stdlib.ram_total, @stdlib.sys.ram_total, @stdlib.dotnet.ram_total @stdlib.java.ram_total}
 end
@@ -103,9 +104,10 @@ function test_xcode_version(tc)
 end
 
 
-function test_cpu_arch(tc)
+function test_cpu_arch(tc, cpu_arch_fun)
+is_capable(tc, cpu_arch_fun)
 
-arch = stdlib.cpu_arch();
+arch = cpu_arch_fun();
 tc.verifyGreaterThan(strlength(arch), 0, "CPU architecture should not be empty")
 end
 

test/is_capable.m

@@ -12,7 +12,7 @@ function is_capable(tc, f)
 
   tc.assumeGreaterThan(dapi, 0)
 
-  if contains(n, "ram_total")
+  if endsWith(n, "ram_total")
     tc.assumeGreaterThanOrEqual(dapi, 6);
   end