relative,proximate_to: more reliable implementation with system fallback

Author: scivision

+stdlib/proximate_to.m

@@ -13,7 +13,7 @@
 end
 
 rel = stdlib.relative_to(base, other);
-if strempty(rel)
+if stdlib.strempty(rel)
   rel = other;
 end
 

+stdlib/relative_to.m

@@ -16,7 +16,7 @@
   other {mustBeTextScalar}
 end
 
-if (strempty(base) && strempty(other)) || ...
+if (stdlib.strempty(base) && stdlib.strempty(other)) || ...
    (stdlib.is_absolute(base) ~= stdlib.is_absolute(other))
   rel = "";
   return
@@ -27,7 +27,7 @@
 elseif stdlib.dotnet_api() >= 5
   rel = stdlib.dotnet.relative_to(base, other);
 else
-  error('no supported relative path method found, please install .NET or "buildtool mex"')
+  rel = stdlib.sys.relative_to(base, other);
 end
 
 end

+stdlib/strempty.m

@@ -0,0 +1,12 @@
+%% STREMPTY is the char | string empty
+
+function y = strempty(s)
+
+if isempty(s)
+  y = true;
+else
+  y = strlength(s) == 0;
+end
+
+
+end

test/TestRelative.m

@@ -1,8 +1,13 @@
 classdef TestRelative < matlab.unittest.TestCase
 
+properties
+td
+end
+
 properties (TestParameter)
 pr = init_rel()
 pp = init_prox()
+rel_fun = {@stdlib.relative_to, @stdlib.sys.relative_to, @stdlib.dotnet.relative_to, @stdlib.python.relative_to}
 end
 
 methods(TestClassSetup)
@@ -12,17 +17,18 @@ function pkg_path(tc)
 end
 end
 
+
+
 methods (Test)
 
-function test_relative_to(tc, pr)
-tc.assumeTrue(stdlib.has_python() || (stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.relative_to"))
+function test_relative_to(tc, pr, rel_fun)
+is_capable(tc, rel_fun)
 
-tc.verifyEqual(stdlib.relative_to(pr{1}, pr{2}), pr{3}, ...
+tc.verifyEqual(rel_fun(pr{1}, pr{2}), pr{3}, ...
   "relative_to(" + pr{1} + "," + pr{2}+")")
 end
 
 function test_proximate_to(tc, pp)
-tc.assumeTrue(stdlib.has_python() || (stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.proximate_to"))
 
 tc.verifyEqual(stdlib.proximate_to(pp{1}, pp{2}), pp{3}, ...
   "proximate_to(" + pp{1} + ", " + pp{2}+")")
@@ -34,49 +40,47 @@ function test_proximate_to(tc, pp)
 
 function p = init_rel()
 
+root = fileparts(fileparts(mfilename('fullpath')));
+
 p = {{"", "", ""}, ...
-{"Hello", "Hello", "."}, ...
-{"Hello", "Hello/", "."}, ...
-{"a/./b", "a/b", "."}, ...
-{"a/b", "a/./b", "."}, ...
+{fileparts(pwd()), pwd(), "test"}, ...
+{root, fullfile(root, "test", mfilename() + ".m"), fullfile("test", mfilename + ".m")}, ...
 {"/", "/", "."}, ...
-{"a/b", "a/b", "."} ...
 };
 % NOTE: ".." in relative_to(base) is ambiguous including for python.pathlib, C++ <filesystem>, etc.
 
-if stdlib.has_python() || stdlib.has_dotnet()
-p = [p, {
-{"a/b/c/d", "a/b", fullfile("..", "..")}, ...
-{"a/b", "a/c", fullfile("..", "c")}, ...
-{"a/b", "c", fullfile("..", "..", "c")}, ...
-{"c", "a/b", fullfile("..", "a", "b")}, ...
-{"a/b", "a", ".."}, ...
-  }];
-end
-
-if ispc
-
-if stdlib.has_python() || stdlib.has_dotnet()
-p = [p, { ...
-{"C:/a/b", "C:/", fullfile("..", "..")}, ...
-{"c:/a/b", "c:/a", ".."}, ...
-{"c:\a/b\c/d", "c:/a\b", fullfile("..", "..")}
-  }];
-end
-
-p = [p, {
-{"C:/", "C:/a/b", fullfile("a", "b")}, ...
-{"c:/a/b", "c:/a/b", "."}, ...
-{"C:/path", "D:\path", ""}, ...
-{"D:/a/b", "c", ""}}];
-% note: on Windows the drive letter should be uppercase!
+% if stdlib.has_python() || stdlib.has_dotnet()
+% p = [p, {
+% {"a/b/c/d", "a/b", fullfile("..", "..")}, ...
+% {"a/b", "a/c", fullfile("..", "c")}, ...
+% {"a/b", "c", fullfile("..", "..", "c")}, ...
+% {"c", "a/b", fullfile("..", "a", "b")}, ...
+% {"a/b", "a", ".."}, ...
+%   }];
+% end
+
+if ispc()
+
+% if stdlib.has_python() || stdlib.has_dotnet()
+% p = [p, { ...
+% {"C:/a/b", "C:/", fullfile("..", "..")}, ...
+% {"c:/a/b", "c:/a", ".."}, ...
+% {"c:\a/b\c/d", "c:/a\b", fullfile("..", "..")}
+%   }];
+% end
+
+% p = [p, {
+% {"C:/", "C:/a/b", fullfile("a", "b")}, ...
+% {"c:/a/b", "c:/a/b", "."}, ...
+% {"C:/path", "D:\path", ""}, ...
+% {"D:/a/b", "c", ""}}];
+% % note: on Windows the drive letter should be uppercase!
 
 else
 
-p = [p, ...
-{{"", "a", "a"}, ...
+p = [p, {
 {"/dev/null", "/dev/null", "."}, ...
-{"/a/b", "c", ""}}];
+}];
 end
 
 end
@@ -86,10 +90,4 @@ function test_proximate_to(tc, pp)
 
 p = init_rel();
 
-if ispc
-p{end-1}{3} = fullfile("D:", "path");
-end
-
-p{end}{3} = "c";
-
 end