1 files changed, 64 insertions, 18 deletions
diff --git a/tests/function/path/testscript b/tests/function/path/testscript
index 1ed89ca..6321b3d 100644
--- a/tests/function/path/testscript
+++ b/tests/function/path/testscript
@@ -80,36 +80,35 @@ s = ($posix ? '/' : '\')
   }
 }
 
-: canonicalize
+: absolute
 :
 {
-  $* <'print $canonicalize([path] a/b)'           >"a$(s)b"            : path
-  $* <'print $canonicalize([paths] a/b a/c)'      >"a$(s)b a$(s)c"     : paths
-  $* <'print $canonicalize([dir_path] a/b)'       >"a$(s)b$s"          : dir-path
-  $* <'print $canonicalize([dir_paths] a/b a/c/)' >"a$(s)b$s a$(s)c$s" : dir-paths
-  $* <'print $path.canonicalize(a/b)'             >"a$(s)b"            : untyped
-  $* <'print $path.canonicalize(a/b/ a/c)'        >"a$(s)b$s a$(s)c"   : mixed
+  $* <'print $absolute($src_root)' >"true"  : true
+  $* <'print $path.absolute(a/b)'  >"false" : false
 }
 
-: normalize
+: simple
 :
 {
-  $* <'print $normalize([path] a/../b)'              >"b"        : path
-  $* <'print $normalize([paths] a/../b a/../c)'      >"b c"      : paths
-  $* <'print $normalize([dir_path] a/../b)'          >"b$s"      : dir-path
-  $* <'print $normalize([dir_paths] a/../b a/../c/)' >"b$s c$s"  : dir-paths
-  $* <'print $path.normalize(a/../b)'                >"b"        : untyped
-  $* <'print $path.normalize(a/../b/ a/../c)'        >"b$s c"    : mixed
+  $* <'print $simple([path] a)' >"true"  : true
+  $* <'print $path.simple(a/b)' >"false" : false
 }
 
-: actualize
+: sub_path
 :
-if! $posix
 {
-  mkdir Foo;
-  $* <'print $path.actualize($out_base/foo)' >~'/.+\\Foo/'
+  $* <'print $sub_path($src_base, $src_root)' >"true"  : true-absolute
+  $* <'print $path.sub_path(a/b/c, a/b)'      >"true"  : true-relative
+  $* <'print $path.sub_path(a/b/c, a/d)'      >"false" : false
 }
 
+: super_path
+:
+{
+  $* <'print $super_path($src_base, true-absolute)' >"true"  : true-absolute
+  $* <'print $path.super_path(a/b/c, b/c)'          >"true"  : true-relative
+  $* <'print $path.super_path(a/b/c, c/a)'          >"false" : false
+}
 
 : directory
 :
@@ -205,6 +204,53 @@ if! $posix
   EOO
 }
 
+: complete
+:
+{
+  $* <'print $complete([path] a)'     >"$~$(s)a"     : path
+  $* <'print $complete([dir_path] a)' >"$~$(s)a$(s)" : dir-path
+  $* <'print $path.complete(a)'       >"$~$(s)a"     : untyped
+
+  echo $path.complete(a)              > "$~$(s)a"    : testscript
+}
+
+: canonicalize
+:
+{
+  $* <'print $canonicalize([path] a/b)'           >"a$(s)b"            : path
+  $* <'print $canonicalize([paths] a/b a/c)'      >"a$(s)b a$(s)c"     : paths
+  $* <'print $canonicalize([dir_path] a/b)'       >"a$(s)b$s"          : dir-path
+  $* <'print $canonicalize([dir_paths] a/b a/c/)' >"a$(s)b$s a$(s)c$s" : dir-paths
+  $* <'print $path.canonicalize(a/b)'             >"a$(s)b"            : untyped
+  $* <'print $path.canonicalize(a/b/ a/c)'        >"a$(s)b$s a$(s)c"   : mixed
+}
+
+: normalize
+:
+{
+  $* <'print $normalize([path] a/../b)'              >"b"        : path
+  $* <'print $normalize([paths] a/../b a/../c)'      >"b c"      : paths
+  $* <'print $normalize([dir_path] a/../b)'          >"b$s"      : dir-path
+  $* <'print $normalize([dir_paths] a/../b a/../c/)' >"b$s c$s"  : dir-paths
+  $* <'print $path.normalize(a/../b)'                >"b"        : untyped
+  $* <'print $path.normalize(a/../b/ a/../c)'        >"b$s c"    : mixed
+}
+
+: try_normalize
+:
+{
+  $* <'print $try_normalize([path] a/../b)'                      >"b"      : valid
+  $* <'print $path.try_normalize($root_directory($src_root)/..)' >"[null]" : invalid
+}
+
+: actualize
+:
+if! $posix
+{
+  mkdir Foo;
+  $* <'print $path.actualize($out_base/foo)' >~'/.+\\Foo/'
+}
+
 : sort
 :
 {