test: improve w/wo java coverage

Author: scivision

buildfile.m

@@ -12,7 +12,7 @@ function checkTask(~)
 function testTask(~)
   addpath(fileparts(mfilename("fullpath")))
 
-  r = runtests(IncludeSubfolders=true, strict=true, UseParallel=true, OutputDetail="Detailed");
+  r = runtests(IncludeSubfolders=true, strict=true, UseParallel=true, OutputDetail="Concise");
 
   assert(~isempty(r), "No tests were run")
   assertSuccess(r)

test/TestFileImpure.m

@@ -1,6 +1,8 @@
 classdef TestFileImpure < matlab.unittest.TestCase
 
 properties(TestParameter)
+use_java = num2cell(unique([stdlib.has_java(), false]))
+
 p_exists = {{pwd(), true}, {mfilename("fullpath") + ".m", true}, {"TestFileImpure.m", true} {tempname, false}}
 % on CI matlabroot can be writable!
 
@@ -20,31 +22,31 @@
 
 methods (Test)
 
-function test_exists(tc, p_exists)
-ok = stdlib.exists(p_exists{1}, stdlib.has_java());
+function test_exists(tc, p_exists, use_java)
+ok = stdlib.exists(p_exists{1}, use_java);
 tc.verifyEqual(ok, p_exists{2})
 end
 
-function test_file_size(tc)
-s = stdlib.file_size(mfilename("fullpath") + ".m", stdlib.has_java());
+function test_file_size(tc, use_java)
+s = stdlib.file_size(mfilename("fullpath") + ".m", use_java);
 tc.verifyGreaterThan(s, 0)
 end
 
 
-function test_is_readable(tc, p_exists)
-ok = stdlib.is_readable(p_exists{1}, stdlib.has_java());
+function test_is_readable(tc, p_exists, use_java)
+ok = stdlib.is_readable(p_exists{1}, use_java);
 tc.verifyEqual(ok, p_exists{2})
 end
 
 
-function test_is_writable(tc, p_is_writable)
-ok = stdlib.is_writable(p_is_writable{1}, stdlib.has_java());
+function test_is_writable(tc, p_is_writable, use_java)
+ok = stdlib.is_writable(p_is_writable{1}, use_java);
 tc.verifyEqual(ok, p_is_writable{2})
 end
 
 
-function test_expanduser(tc, p_expand)
-tc.verifyEqual(stdlib.expanduser(p_expand{1}), p_expand{2})
+function test_expanduser(tc, p_expand, use_java)
+tc.verifyEqual(stdlib.expanduser(p_expand{1}), p_expand{2}, use_java)
 end
 
 

test/TestFilePure.m

@@ -1,23 +1,6 @@
 classdef TestFilePure < matlab.unittest.TestCase
 
 properties (TestParameter)
-
-p_is_absolute
-
-p_filename = {
-  {"", ""}, ...
-  {"/a/b/c", "c"}, ...
-  {"/a/b/c/", ""}, ...
-  {"a/b/c.txt", "c.txt"}, ...
-  {"a/b/c.txt.gz", "c.txt.gz"}
-};
-
-p_stem ={{"/a/b/c", "c"}, {"/a/b/c/", ""}, {"a/b/c/", ""}, ...
-{"a/b/c.txt", "c"}, {"a/b/c.txt.gz", "c.txt"}, ...
-{"a/b/.c", ".c"}}
-
-p_suffix = {{"", ""}, {"/a/b/c", ""}, {"/a/b/c/", ""}, {"a/b/c.txt", ".txt"}, {"a/b/c.txt.gz", ".gz"}, {".stat", ".stat"}, {".stat.txt", ".txt"}}
-
 p_root
 p_root_name
 end
@@ -48,15 +31,6 @@
 
 end
 
-
-function [p_is_absolute] = init_is_absolute()
-p_is_absolute = {{"", false}, {"x", false}, {"x:", false}, {"x:/foo", false}, {"/foo", true}};
-if ispc
-  p_is_absolute{4}{2} = true;
-  p_is_absolute{5}{2} = false;
-end
-end
-
 end
 
 
@@ -72,24 +46,6 @@ function test_posix(tc)
 end
 end
 
-function test_filename(tc, p_filename)
-tc.verifyEqual(stdlib.filename(p_filename{1}), p_filename{2})
-end
-
-function test_suffix(tc, p_suffix)
-tc.verifyEqual(stdlib.suffix(p_suffix{1}), p_suffix{2})
-end
-
-
-function test_stem(tc, p_stem)
-tc.verifyEqual(stdlib.stem(p_stem{1}), p_stem{2})
-end
-
-function test_is_absolute(tc, p_is_absolute)
-ok = stdlib.is_absolute(p_is_absolute{1}, stdlib.has_java());
-tc.verifyEqual(ok, p_is_absolute{2}, p_is_absolute{1})
-end
-
 function test_root(tc, p_root)
 tc.verifyEqual(stdlib.root(p_root{1}), p_root{2})
 end

test/TestFilename.m

@@ -0,0 +1,19 @@
+classdef TestFilename < matlab.unittest.TestCase
+
+properties (TestParameter)
+p = {
+{"", ""}, ...
+{"/a/b/c", "c"}, ...
+{"/a/b/c/", ""}, ...
+{"a/b/c.txt", "c.txt"}, ...
+{"a/b/c.txt.gz", "c.txt.gz"}
+};
+end
+
+methods (Test)
+function test_filename(tc, p)
+tc.verifyEqual(stdlib.filename(p{1}), p{2})
+end
+end
+
+end

test/TestIsAbsolute.m

@@ -0,0 +1,26 @@
+classdef TestIsAbsolute < matlab.unittest.TestCase
+
+properties (TestParameter)
+p
+use_java = num2cell(unique([stdlib.has_java(), false]))
+end
+
+methods (TestParameterDefinition, Static)
+function p = init_is_absolute()
+p = {{"", false}, {"x", false}, {"x:", false}, {"x:/foo", false}, {"/foo", true}};
+if ispc
+    p{4}{2} = true;
+    p{5}{2} = false;
+end
+end
+
+end
+
+methods (Test)
+function test_is_absolute(tc, p, use_java)
+ok = stdlib.is_absolute(p{1}, use_java);
+tc.verifyEqual(ok, p{2}, p{1})
+end
+end
+
+end

test/TestRelative.m

@@ -64,13 +64,13 @@
 methods (Test)
 
 function test_relative_to(tc, p_relative_to)
-tc.assumeTrue(stdlib.has_java)
+tc.assumeTrue(stdlib.has_java())
 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
 
 
 function test_proximate_to(tc, p_proximate_to)
-tc.assumeTrue(stdlib.has_java)
+tc.assumeTrue(stdlib.has_java())
 tc.verifyEqual(stdlib.proximate_to(p_proximate_to{1}, p_proximate_to{2}), p_proximate_to{3}, "proximate_to(" + p_proximate_to{1} + "," + p_proximate_to{2}+")")
 end
 

test/TestStem.m

@@ -0,0 +1,17 @@
+classdef TestStem < matlab.unittest.TestCase
+
+properties (TestParameter)
+
+p = {{"/a/b/c", "c"}, {"/a/b/c/", ""}, {"a/b/c/", ""}, ...
+{"a/b/c.txt", "c"}, {"a/b/c.txt.gz", "c.txt"}, ...
+{"a/b/.c", ".c"}}
+
+end
+
+methods (Test)
+function test(tc, p)
+tc.verifyEqual(stdlib.stem(p{1}), p{2})
+end
+end
+
+end

test/TestSuffix.m

@@ -0,0 +1,13 @@
+classdef TestSuffix < matlab.unittest.TestCase
+
+properties (TestParameter)
+p = {{"", ""}, {"/a/b/c", ""}, {"/a/b/c/", ""}, {"a/b/c.txt", ".txt"}, {"a/b/c.txt.gz", ".gz"}, {".stat", ".stat"}, {".stat.txt", ".txt"}}
+end
+
+methods (Test)
+function test(tc, p)
+tc.verifyEqual(stdlib.suffix(p{1}), p{2})
+end
+end
+
+end

test/TestWhich.m

@@ -1,11 +1,15 @@
 classdef TestWhich < matlab.unittest.TestCase
 
+properties (TestParameter)
+use_java = num2cell(unique([stdlib.has_java(), false]))
+end
+
 
 methods (Test)
 
-function test_which_name(tc)
+function test_which_name(tc, use_java)
 
-tc.verifyEmpty(stdlib.which(tempname))
+tc.verifyEmpty(stdlib.which(tempname, getenv('PATH'), use_java))
 
 if ispc
   n = "pwsh.exe";
@@ -17,19 +21,17 @@ function test_which_name(tc)
 % Unix-like OS may have Matlab as alias which is not visible to
 % stdlib.which()
 % virus scanners may block stdlib.which("cmd.exe") on Windows
-tc.verifyNotEmpty(stdlib.which(n))
+tc.verifyNotEmpty(stdlib.which(n, getenv('PATH'), use_java))
 
 end
 
 
-function test_is_exe_which_fullpath(tc)
+function test_is_exe_which_fullpath(tc, use_java)
 import matlab.unittest.constraints.IsFile
 import matlab.unittest.constraints.EndsWithSubstring
 
-u = stdlib.has_java();
-
-tc.verifyFalse(stdlib.is_exe("", u))
-tc.verifyFalse(stdlib.is_exe(tempname, u))
+tc.verifyFalse(stdlib.is_exe("", use_java))
+tc.verifyFalse(stdlib.is_exe(tempname, use_java))
 
 n = "matlab";
 %% is_exe test
@@ -39,9 +41,9 @@ function test_is_exe_which_fullpath(tc)
 else
   fp = p;
 end
-tc.verifyTrue(stdlib.is_exe(fp, u))
+tc.verifyTrue(stdlib.is_exe(fp, use_java))
 %% which: test absolute path
-exe = stdlib.which(p);
+exe = stdlib.which(p, getenv('PATH'), use_java);
 
 if ispc
   tc.verifyThat(exe, EndsWithSubstring(".exe"))