username: return char

Author: scivision

+stdlib/+dotnet/get_username.m

@@ -3,6 +3,6 @@
 function n = get_username()
 % https://learn.microsoft.com/en-us/dotnet/api/system.environment.username
 
-n = string(System.Environment.UserName);
+n = char(System.Environment.UserName);
 
 end

+stdlib/+java/get_username.m

@@ -1,10 +1,5 @@
 function n = get_username()
 
-try
-  n = string(javaMethod("getProperty", "java.lang.System", "user.name"));
-catch e
-  warning(e.identifier, "Failed to get username from Java: %s", e.message);
-  n = string.empty;
-end
+n = char(javaMethod("getProperty", "java.lang.System", "user.name"));
 
 end

+stdlib/+python/get_username.m

@@ -1,10 +1,10 @@
 function n = get_username()
 
 try
-  n = string(py.getpass.getuser());
+  n = char(py.getpass.getuser());
 catch e
   warning(e.identifier, "get_username(%s) failed: %s", p, e.message);
-  n = string.empty;
+  n = '';
 end
 
 end

+stdlib/+sys/get_username.m

@@ -1,17 +1,16 @@
 function n = get_username()
 
 if ispc()
-  cmd = "whoami";
+  cmd = 'whoami';
 else
-  cmd = "id -un";
+  cmd = 'id -un';
 end
 [s, n] = system(cmd);
 
 if s == 0
-  n = string(strtrim(n));
+  n = strtrim(n);
 else
-  warning("Failed to get username from system %s: %s", cmd, n);
-  n = string.empty;
+  n = '';
 end
 
 end

test/TestSys.m

@@ -8,9 +8,8 @@
 fun = {@stdlib.isoctave, @stdlib.has_dotnet, ...
        @stdlib.has_java, @stdlib.has_python}
 cpu_arch_fun = {'java', 'dotnet', 'native'}
-ia_fun = {'sys', 'dotnet', 'java', 'python'}
 cr_method = {'sys', 'java', 'python'}
-os_m = {'java', 'python', 'dotnet', 'sys'}
+all_fun = {'java', 'python', 'dotnet', 'sys'}
 end
 
 methods(TestClassSetup)
@@ -35,10 +34,10 @@ function test_is_cygwin(tc)
 tc.verifyFalse(stdlib.is_cygwin())
 end
 
-function test_is_admin(tc, ia_fun)
-tc.assertNotEmpty(which("stdlib." + ia_fun + ".is_admin"))
+function test_is_admin(tc, all_fun)
+tc.assertNotEmpty(which("stdlib." + all_fun + ".is_admin"))
 try
-  i = stdlib.is_admin(ia_fun);
+  i = stdlib.is_admin(all_fun);
   tc.verifyClass(i, "logical")
   tc.verifyNotEmpty(i)
 catch e
@@ -109,9 +108,9 @@ function test_has_python(tc)
 tc.verifyTrue(all(v >= [3, 8, 0]), "expected Python >= 3.8")
 end
 
-function test_os_version(tc, os_m)
+function test_os_version(tc, all_fun)
 try
-  [os, ver] = stdlib.os_version(os_m);
+  [os, ver] = stdlib.os_version(all_fun);
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
   return
@@ -135,24 +134,27 @@ function test_is_parallel(tc)
 tc.verifyClass(ip, 'logical')
 end
 
-function test_hostname(tc, ia_fun)
-tc.assertNotEmpty(which("stdlib." + ia_fun + ".get_hostname"))
+function test_hostname(tc, all_fun)
+tc.assertNotEmpty(which("stdlib." + all_fun + ".get_hostname"))
 try
-  h = stdlib.hostname(ia_fun);
+  h = stdlib.hostname(all_fun);
   tc.verifyGreaterThan(strlength(h), 0)
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
 end
 end
 
-function test_username(tc, ia_fun)
-tc.assertNotEmpty(which("stdlib." + ia_fun + ".get_username"))
+function test_username(tc, all_fun)
+tc.assertNotEmpty(which("stdlib." + all_fun + ".get_username"))
 try
-  u = stdlib.get_username(ia_fun);
-  tc.verifyGreaterThan(strlength(u), 0)
+  u = stdlib.get_username(all_fun);
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
+  return
 end
+
+tc.verifyClass(u, 'char')
+tc.verifyGreaterThan(strlength(u), 0)
 end
 
 
@@ -176,9 +178,9 @@ function test_cpu_arch(tc, cpu_arch_fun)
 tc.verifyGreaterThan(strlength(arch), 0, "CPU architecture should not be empty")
 end
 
-function test_ram_total(tc, ia_fun)
+function test_ram_total(tc, all_fun)
 try
-  t = stdlib.ram_total(ia_fun);
+  t = stdlib.ram_total(all_fun);
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
   return