is_subdir: drop duplicated slashes. add test cases

Author: scivision

+stdlib/is_subdir.m

@@ -1,4 +1,6 @@
 %% IS_SUBDIR is subdir a subdirectory of dir?
+% canonicalization and normalization are NOT performed
+% duplicated slashes are dropped
 
 function s = is_subdir(subdir, dir)
 arguments
@@ -7,16 +9,19 @@
 end
 
 
+s = stdlib.drop_slash(subdir);
+d = stdlib.drop_slash(dir);
+
 if ischar(subdir)
-  w = ~isempty(strfind(dir, "..")) || ~isempty(strfind(subdir, "..")); %#ok<STREMP,UNRCH>
-  s = strfind(subdir, dir) == 1 && (length(subdir) > length(dir));
+  w = ~isempty(strfind(d, "..")) || ~isempty(strfind(s, "..")); %#ok<STREMP,UNRCH>
+  s = strfind(s, d) == 1 && (length(s) > length(d));
 else
-  w = contains(dir, "..") || contains(subdir, "..");
-  s = startsWith(subdir, dir) && (strlength(subdir) > strlength(dir));
+  w = contains(d, "..") || contains(s, "..");
+  s = startsWith(s, d) && (strlength(s) > strlength(d));
 end
 
-if ~strcmp(subdir, dir) && w
-  warning("is_subdir: %s and/or %s is ambiguous input with '..'  consider using stdlib.canonical() first", subdir, dir)
+if ~strcmp(s, d) && w
+  warning("is_subdir: %s and/or %s is ambiguous input with '..'  consider using stdlib.canonical() first", s, d)
 end
 
 end
@@ -27,5 +32,6 @@
 %!assert(!is_subdir("/a/b", "d"))
 %!assert(is_subdir("a/b", "a"))
 %!assert(!is_subdir("a", "a/.c"))
+%!assert(!is_subdir("a/./b/c", "a/b"))
 
 % this is incorrect on Windows at least %assert(is_subdir("a/b", "a/b/.."))

+stdlib/relative_to.m

@@ -10,6 +10,9 @@
 b1 = stdlib.drop_slash(base);
 o1 = stdlib.drop_slash(other);
 
+b1 = strrep(b1, "/./", "/");
+o1 = strrep(o1, "/./", "/");
+
 if strcmp(b1, o1)
   r = ".";
   return

test/TestFilePure.m

@@ -80,6 +80,8 @@
 p_relative_to = {{"", "", "."}, ...
 {"Hello", "Hello", "."}, ...
 {"Hello", "Hello/", "."}, ...
+{"a/./b", "a/b", "."}, ...
+{"a/b", "a/./b", "."}, ...
 {"./this/one", "./this/two", "../two"}, ...
 {"/path/same", "/path/same/hi/..", "hi/.."}, ...
 {"", "/", ""}, ...
@@ -113,9 +115,9 @@
 p_proximate_to = p_relative_to;
 % NOTE: ".." in proximate_to(base) is ambiguous including for python.pathlib, C++ <filesystem>, etc
 
-p_proximate_to{6}{3} = "/";
-p_proximate_to{10}{3} = "c";
-p_proximate_to{11}{3} = "/a/b";
+p_proximate_to{8}{3} = "/";
+p_proximate_to{12}{3} = "c";
+p_proximate_to{13}{3} = "/a/b";
 
 p_proximate_to{end}{3} = "d:/path";
 
@@ -152,6 +154,10 @@
 
 p_is_subdir = {
   {"a/b", "a/b", false}, ...
+  {"a//b/c", "a/b", false}, ...
+  {"a/b", "a//b", false}, ...
+  {"a/./b/c", "a/b", false}, ...
+  {"a/b/c", "a/./b", true}, ...
   {"a/b", "a/b/", false}, ...
   {"a/b", "a", true}, ...
   {"a/.c", "a", true}
@@ -267,7 +273,7 @@ function test_with_suffix(tc)
 
 function test_relative_to(tc, p_relative_to)
 tc.assumeTrue(stdlib.has_java)
-tc.verifyEqual(stdlib.relative_to(p_relative_to{1}, p_relative_to{2}), p_relative_to{3})
+tc.verifyEqual(stdlib.relative_to(p_relative_to{1}, p_relative_to{2}), p_relative_to{3}, "relative_to(" + p_relative_to{1} + "," + p_relative_to{2}+")")
 end