test:simplify

Author: scivision

test/TestFileImpure.m

@@ -1,9 +1,5 @@
 classdef TestFileImpure < matlab.unittest.TestCase
 
-properties (ClassSetupParameter)
-  classToTest = {"TestFileImpure"};
-end
-
 properties(TestParameter)
 p_exists = {{pwd(), true}, {mfilename("fullpath") + ".m", true}, {"TestFileImpure.m", true} {tempname, false}}
 % on CI matlabroot can be writable!
@@ -17,16 +13,14 @@
 {tempname, tempname, false}, ...
 {"..", "./..", true}, ...
 {"..", pwd() + "/..", true}}
-end
 
-properties
-tobj
+ph = {{0, '"stdin"'}, {1, '"stdout"'}, {2, '"stderr"'}, {fopen(tempname), string.empty}}
 end
 
 
 methods (TestParameterDefinition, Static)
 
-function p_expand = init_expand(classToTest) %#ok<INUSD>
+function p_expand = init_expand()
 cwd = fileparts(mfilename("fullpath"));
 top = fullfile(cwd, "..");
 addpath(top)
@@ -42,14 +36,9 @@ function setup_path(tc)
 tc.applyFixture(matlab.unittest.fixtures.PathFixture(top))
 end
 
-function classSetup(tc, classToTest)
-constructor = str2func(classToTest);
-tc.tobj = constructor();
-end
-
 end
 
-methods (Test, ParameterCombination = 'sequential')
+methods (Test)
 
 function test_exists(tc, p_exists)
 tc.verifyEqual(stdlib.exists(p_exists{1}), p_exists{2})
@@ -106,11 +95,8 @@ function test_get_permissions(tc)
 tc.verifyThat(p, StartsWithSubstring("r"))
 end
 
-function test_handle2filename(tc)
-tc.verifyEqual(stdlib.handle2filename(0), '"' + "stdin" + '"')
-tc.verifyEqual(stdlib.handle2filename(1), '"' + "stdout" + '"')
-tc.verifyEqual(stdlib.handle2filename(2), '"' + "stderr" + '"')
-tc.verifyEmpty(stdlib.handle2filename(fopen(tempname)))
+function test_handle2filename(tc, ph)
+tc.verifyEqual(stdlib.handle2filename(ph{1}), string(ph{2}))
 end
 
 end

test/TestFilePure.m

@@ -1,9 +1,5 @@
 classdef TestFilePure < matlab.unittest.TestCase
 
-properties (ClassSetupParameter)
-classToTest = {"TestFilePure"};
-end
-
 properties (TestParameter)
 
 p_is_absolute
@@ -61,14 +57,10 @@
 p_root_name
 end
 
-properties
-tobj
-end
-
 
 methods (TestParameterDefinition, Static)
 
-function [p_root, p_root_name] = init_relative_to(classToTest) %#ok<INUSD>
+function [p_root, p_root_name] = init_relative_to()
 
 p_root = {{"", ""}, ...
 {"a/b", ""}, ...
@@ -92,7 +84,7 @@
 end
 
 
-function [p_is_absolute] = init_is_absolute(classToTest) %#ok<INUSD>
+function [p_is_absolute] = init_is_absolute()
 
 p_is_absolute = {{"", false}, {"x", false}, {"x:", false}, {"x:/foo", false}, {"/foo", true}};
 
@@ -109,11 +101,6 @@
 
 methods (TestClassSetup)
 
-function classSetup(tc, classToTest)
-constructor = str2func(classToTest);
-tc.tobj = constructor();
-end
-
 function setup_path(tc)
 top = fullfile(fileparts(mfilename("fullpath")), "..");
 tc.applyFixture(matlab.unittest.fixtures.PathFixture(top))
@@ -123,7 +110,7 @@ function setup_path(tc)
 
 
 
-methods (Test, ParameterCombination = "sequential")
+methods (Test)
 
 function test_posix(tc)
 import matlab.unittest.constraints.ContainsSubstring

test/TestHDF5.m

@@ -61,7 +61,7 @@ function setup_file(tc)
 end
 
 
-methods (Test, ParameterCombination = 'sequential')
+methods (Test)
 
 function test_auto_chunk_size(tc)
 

test/TestRelative.m

@@ -1,23 +1,15 @@
 classdef TestRelative < matlab.unittest.TestCase
 
-properties (ClassSetupParameter)
-classToTest = {"TestRelative"};
-end
-
 properties (TestParameter)
 p_relative_to
 p_proximate_to
 p_is_subdir
 end
 
-properties
-tobj
-end
-
 
 methods (TestParameterDefinition, Static)
 
-function [p_relative_to, p_proximate_to] = init_relative_to(classToTest) %#ok<INUSD>
+function [p_relative_to, p_proximate_to] = init_relative_to()
 
 p_relative_to = {{"", "", "."}, ...
 {"Hello", "Hello", "."}, ...
@@ -67,7 +59,7 @@
 end
 
 
-function [p_is_subdir] = init_is_subdir(classToTest) %#ok<INUSD>
+function [p_is_subdir] = init_is_subdir()
 
 p_is_subdir = {
     {"a/b", "a/b", false}, ...
@@ -94,11 +86,6 @@
 
 methods (TestClassSetup)
 
-function classSetup(tc, classToTest)
-constructor = str2func(classToTest);
-tc.tobj = constructor();
-end
-
 function setup_path(tc)
 top = fullfile(fileparts(mfilename("fullpath")), "..");
 tc.applyFixture(matlab.unittest.fixtures.PathFixture(top))
@@ -107,7 +94,7 @@ function setup_path(tc)
 end
 
 
-methods (Test, ParameterCombination = "sequential")
+methods (Test)
 
 
 function test_relative_to(tc, p_relative_to)

test/TestWindowsCOM.m

@@ -36,18 +36,16 @@ function test_short_file(tc)
 import matlab.unittest.constraints.IsFile
 
 tc.assumeTrue(ispc, "Windows only")
+p = matlabroot;
+tc.assumeSubstring(p, " ", "name won't shorten if it doesn't have a space")
 
-file = fullfile(matlabroot, "VersionInfo.xml");
-tc.assumeThat(file, IsFile, "VersionInfo.xml missing")
-tc.assumeSubstring(file, " ", "name won't shorten if it doesn't have a space")
+for d = [p, stdlib.posix(p)]
+  s = stdlib.windows_shortname(d);
 
-for f = [file, stdlib.posix(file)]
-    short = stdlib.windows_shortname(f);
-
-    tc.verifySubstring(short, "~")
+  tc.verifySubstring(s, "~")
 end
 
-tc.verifyEqual(stdlib.canonical(short), stdlib.posix(file))
+tc.verifyEqual(stdlib.canonical(s), stdlib.posix(p), "shortname didn't resolve same as canonical")
 
 end