relative_to: choose_method

Author: scivision

+stdlib/private/choose_method.m

@@ -27,8 +27,6 @@
       end
     case {"legacy", "sys"}, has = true;
     case "native", has = stdlib.strempty(minVersion) || ~isMATLABReleaseOlderThan(minVersion);
-    case "sys"
-      has = true;
     otherwise
       has = str2func("stdlib.has_" + m);
   end

+stdlib/relative_to.m

@@ -10,16 +10,15 @@
 % javaPathObject(base).relativize(javaPathObject(other))
 % https://docs.oracle.com/javase/8/docs/api/java/nio/file/Path.html#relativize-java.nio.file.Path-
 
-function rel = relative_to(base, other)
+function rel = relative_to(base, other, method)
 arguments
   base {mustBeTextScalar}
   other {mustBeTextScalar}
+  method (1,:) string = ["python", "native"]
 end
 
-if stdlib.has_python()
-  rel = stdlib.python.relative_to(base, other);
-else
-  rel = stdlib.native.relative_to(base, other);
-end
+fun = choose_method(method, "relative_to");
+
+rel = fun(base, other);
 
 end

test/TestRelative.m

@@ -7,7 +7,7 @@
 properties (TestParameter)
 pr = init_rel()
 pp = init_prox()
-rel_fun = {@stdlib.relative_to, @stdlib.native.relative_to, @stdlib.python.relative_to}
+rel_fun = {"native", "python"}
 end
 
 methods(TestClassSetup)
@@ -18,13 +18,12 @@ function pkg_path(tc)
 end
 
 
-
 methods (Test)
 
 function test_relative_to(tc, pr, rel_fun)
-is_capable(tc, rel_fun)
+is_capable(tc, str2func("stdlib." + rel_fun + ".relative_to"))
 
-tc.verifyEqual(rel_fun(pr{1}, pr{2}), pr{3}, ...
+tc.verifyEqual(stdlib.relative_to(pr{1}, pr{2}, rel_fun), pr{3}, ...
   "relative_to(" + pr{1} + "," + pr{2}+")")
 end