samepath: choose_method

Author: scivision

+stdlib/cpu_arch.m

@@ -12,4 +12,3 @@
 
 end
 
-%!assert(!isempty(cpu_arch()))

+stdlib/get_shell.m

@@ -19,5 +19,3 @@
 end
 
 end
-
-%!assert(ischar(get_shell()))

+stdlib/private/choose_method.m

@@ -60,7 +60,7 @@
 
       has = true;
 
-      if endsWith(name, "is_char_device")
+      if endsWith(name, ["is_char_device", "samepath"])
         if ispc(), continue, end
       end
 

+stdlib/samepath.m

@@ -12,25 +12,17 @@
 %%% Inputs
 % * path1, path2: paths to compare
 
-function y = samepath(path1, path2)
+function y = samepath(path1, path2, method)
 arguments
   path1 {mustBeTextScalar}
   path2 {mustBeTextScalar}
+  method (1,:) string = ["python", "java", "sys", "native"]
 end
 
+% For this function, Python is over 10x faster than Java
 
-if stdlib.has_python()
-  % For this function, Python is over 10x faster than Java
-  y = stdlib.python.samepath(path1, path2);
-elseif stdlib.has_java()
-  y = stdlib.java.samepath(path1, path2);
-elseif isunix()
-  y = stdlib.sys.samepath(path1, path2);
-else
-  % string comparison is not preferred
-  y = stdlib.native.samepath(path1, path2);
-end
+fun = choose_method(method, "samepath");
+
+y = fun(path1, path2);
 
-%!assert(samepath(".", "."))
-%!assert(samepath(".", "./"))
-%!assert(!samepath("not-exist", "not-exist/.."))
+end

test/TestSame.m

@@ -7,7 +7,7 @@
 {"..", pwd() + "/.."}, ...
 {pwd(), pwd() + "/."}}
 
-same_fun = {@stdlib.samepath, @stdlib.sys.samepath, @stdlib.java.samepath, @stdlib.python.samepath, @stdlib.native.samepath}
+fun = {'sys', 'java', 'python', 'native'}
 end
 
 methods(TestClassSetup)
@@ -19,18 +19,25 @@ function pkg_path(tc)
 
 methods(Test)
 
-function test_samepath(tc, p_same, same_fun)
-is_capable(tc, same_fun)
-
-tc.verifyTrue(same_fun(p_same{1}, p_same{2}))
+function test_samepath(tc, p_same, fun)
+tc.assertNotEmpty(which("stdlib." + fun + ".samepath"))
+try
+  y = stdlib.samepath(p_same{:}, fun);
+  tc.verifyTrue(y)
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+end
 end
 
-function test_samepath_notexist(tc, same_fun)
-is_capable(tc, same_fun)
 
-tc.verifyFalse(same_fun("", ""))
+function test_samepath_notexist(tc, fun)
 t = tempname();
-tc.verifyFalse(same_fun(t, t))
+try
+  tc.verifyFalse(stdlib.samepath("", "", fun))
+  tc.verifyFalse(stdlib.samepath(t, t, fun))
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+end
 end
 
 end

test/is_capable.m

@@ -18,13 +18,7 @@ function is_capable(tc, f)
 
 elseif contains(n, "python")
 
-   tc.assumeTrue(stdlib.has_python(), "Python not available")
-
-elseif contains(n, ".sys.")
-
-  if endsWith(n, "samepath")
-    tc.assumeTrue(isunix(), "unix only function")
-  end
+  tc.assumeTrue(stdlib.has_python(), "Python not available")
 
 end