normalize: choose_method

Author: scivision

+stdlib/+java/normalize.m

@@ -11,6 +11,4 @@
   end
 end
 
-
-
-end
+end

+stdlib/normalize.m

@@ -11,20 +11,14 @@
 %
 % MEX code is about 4-5x faster than plain Matlab below
 
-function n = normalize(p)
+function n = normalize(file, method)
 arguments
-  p {mustBeTextScalar}
+  file {mustBeTextScalar}
+  method (1,:) string = ["java", "python", "native"]
 end
 
-if stdlib.has_java()
-  n = stdlib.java.normalize(p);
-elseif stdlib.has_python()
-  n = stdlib.python.normalize(p);
-else
-  n = stdlib.native.normalize(p);
-end
-
-end
+fun = choose_method(method, "normalize");
 
+n = fun(file);
 
-%!testif 0
+end

test/TestNormalize.m

@@ -3,7 +3,7 @@
 properties (TestParameter)
 p = init_norm()
 d = init_drop_slash()
-norm_fun = {@stdlib.normalize, @stdlib.native.normalize, @stdlib.java.normalize, @stdlib.python.normalize}
+fun = {'native', 'java', 'python'}
 end
 
 methods(TestClassSetup)
@@ -15,10 +15,16 @@ function pkg_path(tc)
 
 methods (Test, TestTags="pure")
 
-function test_normalize(tc, p, norm_fun)
-is_capable(tc, norm_fun)
+function test_normalize(tc, p, fun)
+tc.assertNotEmpty(which("stdlib." + fun + ".normalize"))
+try
+  c = stdlib.normalize(p{1}, fun);
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+  return
+end
 
-tc.verifyEqual(norm_fun(p{1}), p{2}, ...
+tc.verifyEqual(c, p{2}, ...
   sprintf("normalize(%s)   mex: %d", p{1}, stdlib.is_mex_fun("stdlib.normalize")))
 end