improve test coverage

Author: scivision

+stdlib/+fileio/extract_zstd.m

@@ -10,7 +10,7 @@ function extract_zstd(archive, out_dir)
 
 exe = stdlib.fileio.which("cmake");
 if isempty(exe)
-  extract_zstd_bin(archive, outdir)
+  extract_zstd_bin(archive, out_dir)
 end
 
 [ret, msg] = stdlib.sys.subprocess_run([exe, "-E", "tar", "xf", archive], "cwd", out_dir);

buildfile.m

@@ -18,27 +18,34 @@ function testTask(~)
 end
 
 function coverageTask(~)
-import matlab.unittest.TestRunner;
-import matlab.unittest.Verbosity;
-import matlab.unittest.plugins.CodeCoveragePlugin;
-import matlab.unittest.plugins.XMLPlugin;
-import matlab.unittest.plugins.codecoverage.CoberturaFormat;
+import matlab.unittest.TestRunner
+import matlab.unittest.Verbosity
+import matlab.unittest.plugins.CodeCoveragePlugin
+import matlab.unittest.plugins.XMLPlugin
+import matlab.unittest.plugins.codecoverage.CoberturaFormat
 
-name = "stdlib";
 
-suite = testsuite(name);
+pkg = "stdlib";
+
+suite = testsuite("test/");
+
+% not import to allow use of rest of buildfile with R2022b
+format = matlab.unittest.plugins.codecoverage.CoverageResult;
 
-mkdir('code-coverage');
-mkdir('test-results');
 
 runner = TestRunner.withTextOutput();
-runner.addPlugin(XMLPlugin.producingJUnitFormat('test-results/results.xml'));
-runner.addPlugin(CodeCoveragePlugin.forPackage(name, 'Producing', CoberturaFormat('code-coverage/coverage.xml')));
+runner.addPlugin(CodeCoveragePlugin.forPackage(pkg, Producing=format))
+
+% runner.addPlugin(XMLPlugin.producingJUnitFormat('test-results.xml'))
+% runner.addPlugin(CodeCoveragePlugin.forPackage(pkg, 'Producing', ...
+%     CoberturaFormat('test-coverage.xml')))
+
+run_results = runner.run(suite);
+assert(~isempty(run_results), "no tests found")
 
-results = runner.run(suite);
-assert(~isempty(results), "no tests found")
+assertSuccess(run_results)
 
-assertSuccess(results)
+generateHTMLReport(format.Result)
 end
 
 function publishTask(~)
@@ -51,7 +58,7 @@ function publishTask(~)
 files = r.Files;
 
 % remove nuisance functions
-i = contains(files, [mfilename, "buildfile.m", filesep + "private" + filesep, filesep + "+test" + filesep]);
+i = contains(files, [mfilename, "buildfile.m", filesep + "private" + filesep]);
 files(i) = [];
 
 pkg = what(pkg_name);

test/TestFileImpure.m

@@ -18,14 +18,14 @@ function test_expanduser(tc)
 import matlab.unittest.constraints.EndsWithSubstring
 import matlab.unittest.constraints.StartsWithSubstring
 
-tc.verifyEmpty(stdlib.fileio.expanduser(string.empty))
-tc.verifyEqual(stdlib.fileio.expanduser(""), "")
+tc.verifyEmpty(stdlib.expanduser(string.empty))
+tc.verifyEqual(stdlib.expanduser(""), "")
 
-tc.verifyEqual(stdlib.fileio.expanduser("~abc"), "~abc")
+tc.verifyEqual(stdlib.expanduser("~abc"), "~abc")
 
-tc.verifyThat(stdlib.fileio.expanduser('~/foo'), ~StartsWithSubstring("~"))
+tc.verifyThat(stdlib.expanduser('~/foo'), ~StartsWithSubstring("~"))
 
-tc.verifyThat(stdlib.fileio.expanduser('~/foo'), EndsWithSubstring("foo"))
+tc.verifyThat(stdlib.expanduser('~/foo'), EndsWithSubstring("foo"))
 end
 
 

test/TestFilePure.m

@@ -27,56 +27,56 @@ function test_posix(tc)
 
 function test_filename(tc)
 
-tc.verifyEmpty(stdlib.fileio.filename(string.empty))
-tc.verifyEqual(stdlib.fileio.filename(""), "")
+tc.verifyEmpty(stdlib.filename(string.empty))
+tc.verifyEqual(stdlib.filename(""), "")
 
-tc.verifyEqual(stdlib.fileio.filename("/foo/bar/baz"), "baz")
-tc.verifyEqual(stdlib.fileio.filename("/foo/bar/baz/"), "")
+tc.verifyEqual(stdlib.filename("/foo/bar/baz"), "baz")
+tc.verifyEqual(stdlib.filename("/foo/bar/baz/"), "")
 
-tc.verifyEqual(stdlib.fileio.filename("foo/bar/baz.txt"), "baz.txt")
-tc.verifyEqual(stdlib.fileio.filename("foo/bar/baz.txt.gz"), "baz.txt.gz")
+tc.verifyEqual(stdlib.filename("foo/bar/baz.txt"), "baz.txt")
+tc.verifyEqual(stdlib.filename("foo/bar/baz.txt.gz"), "baz.txt.gz")
 
 end
 
 
 function test_parent(tc)
 
-tc.verifyEmpty(stdlib.fileio.parent(string.empty))
-tc.verifyEqual(stdlib.fileio.parent(""), "")
+tc.verifyEmpty(stdlib.parent(string.empty))
+tc.verifyEqual(stdlib.parent(""), "")
 
-tc.verifyEqual(stdlib.fileio.parent("/foo/bar/baz"), "/foo/bar")
-tc.verifyEqual(stdlib.fileio.parent("/foo/bar/baz/"), "/foo/bar")
+tc.verifyEqual(stdlib.parent("/foo/bar/baz"), "/foo/bar")
+tc.verifyEqual(stdlib.parent("/foo/bar/baz/"), "/foo/bar")
 
-tc.verifyEqual(stdlib.fileio.parent("foo/bar/baz/"), "foo/bar")
+tc.verifyEqual(stdlib.parent("foo/bar/baz/"), "foo/bar")
 
 end
 
 function test_suffix(tc)
 
-tc.verifyEmpty(stdlib.fileio.suffix(string.empty))
-tc.verifyEqual(stdlib.fileio.suffix(""), "")
+tc.verifyEmpty(stdlib.suffix(string.empty))
+tc.verifyEqual(stdlib.suffix(""), "")
 
-tc.verifyEqual(stdlib.fileio.suffix("/foo/bar/baz"), "")
-tc.verifyEqual(stdlib.fileio.suffix("/foo/bar/baz/"), "")
+tc.verifyEqual(stdlib.suffix("/foo/bar/baz"), "")
+tc.verifyEqual(stdlib.suffix("/foo/bar/baz/"), "")
 
-tc.verifyEqual(stdlib.fileio.suffix("foo/bar/baz.txt"), ".txt")
-tc.verifyEqual(stdlib.fileio.suffix("foo/bar/baz.txt.gz"), ".gz")
+tc.verifyEqual(stdlib.suffix("foo/bar/baz.txt"), ".txt")
+tc.verifyEqual(stdlib.suffix("foo/bar/baz.txt.gz"), ".gz")
 
 end
 
 
 function test_stem(tc)
 
-tc.verifyEmpty(stdlib.fileio.stem(string.empty))
-tc.verifyEqual(stdlib.fileio.stem(""), "")
+tc.verifyEmpty(stdlib.stem(string.empty))
+tc.verifyEqual(stdlib.stem(""), "")
 
-tc.verifyEqual(stdlib.fileio.stem("/foo/bar/baz"), "baz")
-tc.verifyEqual(stdlib.fileio.stem("/foo/bar/baz/"), "")
+tc.verifyEqual(stdlib.stem("/foo/bar/baz"), "baz")
+tc.verifyEqual(stdlib.stem("/foo/bar/baz/"), "")
 
-tc.verifyEqual(stdlib.fileio.stem("foo/bar/baz/"), "")
+tc.verifyEqual(stdlib.stem("foo/bar/baz/"), "")
 
-tc.verifyEqual(stdlib.fileio.stem("foo/bar/baz.txt"), "baz")
-tc.verifyEqual(stdlib.fileio.stem("foo/bar/baz.txt.gz"), "baz.txt")
+tc.verifyEqual(stdlib.stem("foo/bar/baz.txt"), "baz")
+tc.verifyEqual(stdlib.stem("foo/bar/baz.txt.gz"), "baz.txt")
 
 end
 
@@ -136,6 +136,15 @@ function test_absolute_path(tc)
 
 end
 
+function test_normalize(tc)
+
+tc.verifyEmpty(stdlib.normalize(string.empty))
+tc.verifyEqual(stdlib.normalize(""), "")
+
+pabs = stdlib.normalize('2foo//');
+tc.verifyEqual(pabs, "2foo")
+end
+
 
 function test_canonical(tc)
 import matlab.unittest.fixtures.TemporaryFolderFixture
@@ -160,9 +169,9 @@ function test_canonical(tc)
 tc.verifyEqual(pt1, "2foo")
 
 % test existing file
-r = stdlib.fileio.parent(mfilename('fullpath'));
+r = stdlib.parent(mfilename('fullpath'));
 rp = fullfile(r, "..");
-tc.verifyEqual(stdlib.canonical(rp), stdlib.fileio.parent(r))
+tc.verifyEqual(stdlib.canonical(rp), stdlib.parent(r))
 
 end
 
@@ -203,9 +212,9 @@ function test_resolve(tc)
 tc.verifyTrue(strncmp(va, vb, 2))
 
 % test existing file
-r = stdlib.fileio.parent(mfilename('fullpath'));
+r = stdlib.parent(mfilename('fullpath'));
 rp = fullfile(r, "..");
-tc.verifyEqual(stdlib.resolve(rp), stdlib.fileio.parent(r))
+tc.verifyEqual(stdlib.resolve(rp), stdlib.parent(r))
 
 end
 

test/TestWSL.m

@@ -50,7 +50,7 @@ function test_wsl_path(tc)
 tc.verifyNotEmpty(wsl_temp, "could not get WSL tempfile")
 
 wsl_path = stdlib.sys.wslpath2winpath(wsl_temp);
-tc.verifyTrue(stdlib.fileio.is_wsl_path(wsl_path), "could not convert WSL path to Windows path")
+tc.verifyTrue(stdlib.is_wsl_path(wsl_path), "could not convert WSL path to Windows path")
 
 win_path = stdlib.sys.winpath2wslpath(wsl_path);
 tc.verifyNotEmpty(win_path, "could not convert Windows path to WSL path")