testFilename: simpler

Author: scivision

test/TestExpanduser.m

@@ -1,13 +1,23 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2021a', 'impure'}) ...
+          TestTags = {'R2019b', 'impure'}) ...
     TestExpanduser < matlab.unittest.TestCase
 
 properties (TestParameter)
-p
+p = init_exp()
+end
+
+
+methods (Test)
+
+function test_expanduser(tc, p)
+tc.verifyEqual(stdlib.expanduser(p{1}), p{2})
+end
+
+end
+
 end
 
 
-methods (TestParameterDefinition, Static)
 function p = init_exp()
 
 if ispc
@@ -27,14 +37,3 @@
 {"~" + filesep() + "c", fullfile(h, "c")}};
 
 end
-end
-
-methods (Test)
-
-function test_expanduser(tc, p)
-tc.verifyEqual(stdlib.expanduser(p{1}), p{2})
-end
-
-end
-
-end

test/TestFilename.m

@@ -1,32 +1,13 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2021a', 'pure'}) ...
+          TestTags = {'R2019b', 'pure'}) ...
     TestFilename < matlab.unittest.TestCase
 
 properties (TestParameter)
-p
+p = init_p()
 backend = {'regexp', 'pattern'}
 end
 
 
-methods (TestParameterDefinition, Static)
-function p = init_p()
-p = {
-{'', ""}, ...
-{"", ""}, ...
-{"Hi", "Hi"}, ...
-{"/a/b/c", "c"}, ...
-{'a/b/c.txt', "c.txt"}, ...
-{"a///b//c.txt.gz", "c.txt.gz"}, ...
-{"a/b/.hello", ".hello"}
-};
-
-if ispc()
-  p{end+1} = {"c:/df\df.txt", "df.txt"};
-end
-end
-end
-
-
 methods (Test)
 
 function test_filename(tc, p, backend)
@@ -44,3 +25,20 @@ function test_filename_array(tc, backend)
 end
 
 end
+
+
+function p = init_p()
+p = {
+{'', ""}, ...
+{"", ""}, ...
+{"Hi", "Hi"}, ...
+{"/a/b/c", "c"}, ...
+{'a/b/c.txt', "c.txt"}, ...
+{"a///b//c.txt.gz", "c.txt.gz"}, ...
+{"a/b/.hello", ".hello"}
+};
+
+if ispc()
+  p{end+1} = {"c:/df\df.txt", "df.txt"};
+end
+end

test/TestNormalize.m

@@ -1,5 +1,5 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2021a', 'pure'}) ...
+          TestTags = {'R2019b', 'pure'}) ...
     TestNormalize < matlab.unittest.TestCase
 
 properties (TestParameter)
@@ -16,11 +16,28 @@
   {"./a/.", "a"}, ...
   {"../a", "../a"}
 };
-d
+d = init_drop_slash()
 end
 
 
-methods (TestParameterDefinition, Static)
+methods (Test)
+
+function test_normalize(tc, p)
+c = stdlib.normalize(p{1});
+
+tc.verifyEqual(c, p{2}, ...
+  sprintf("normalize(%s)", p{1}))
+end
+
+function test_drop_slash(tc, d)
+tc.verifyEqual(stdlib.drop_slash(d{1}), d{2}, ...
+  sprintf("drop_slash(%s)", d{1}))
+end
+
+end
+
+end
+
 
 function d = init_drop_slash()
 d = {...
@@ -45,24 +62,3 @@
 end
 
 end
-
-end
-
-
-methods (Test)
-
-function test_normalize(tc, p)
-c = stdlib.normalize(p{1});
-
-tc.verifyEqual(c, p{2}, ...
-  sprintf("normalize(%s)", p{1}))
-end
-
-function test_drop_slash(tc, d)
-tc.verifyEqual(stdlib.drop_slash(d{1}), d{2}, ...
-  sprintf("drop_slash(%s)", d{1}))
-end
-
-end
-
-end

test/TestParent.m

@@ -1,12 +1,33 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2021a', 'pure'}) ...
+          TestTags = {'R2019b', 'pure'}) ...
     TestParent < matlab.unittest.TestCase
 
 properties (TestParameter)
-p
+p = init_parent()
 end
 
-methods (TestParameterDefinition, Static)
+
+methods (Test, TestTags=["pure"])
+
+function test_parent(tc, p)
+pr = stdlib.parent(p{1});
+tc.verifyEqual(pr, p{2}, sprintf("parent(%s)", p{1}))
+end
+
+
+function test_parent_array(tc)
+
+in =  ["",  ".", "..", "../..", "a/", "a/b", "ab/.parent", "ab/.parent.txt", "a/b/../.parent.txt"];
+exp = [".", ".", ".", "..",     ".",  "a",   "ab",         "ab",             "a/b/.."];
+
+out = stdlib.parent(in);
+tc.verifyEqual(out, exp)
+end
+
+end
+end
+
+
 function p = init_parent()
 
 p = {
@@ -33,25 +54,3 @@
 p{end+1} = {'a//b', "a"};
 
 end
-end
-
-
-methods (Test, TestTags=["pure"])
-
-function test_parent(tc, p)
-pr = stdlib.parent(p{1});
-tc.verifyEqual(pr, p{2}, sprintf("parent(%s)", p{1}))
-end
-
-
-function test_parent_array(tc)
-
-in =  ["",  ".", "..", "../..", "a/", "a/b", "ab/.parent", "ab/.parent.txt", "a/b/../.parent.txt"];
-exp = [".", ".", ".", "..",     ".",  "a",   "ab",         "ab",             "a/b/.."];
-
-out = stdlib.parent(in);
-tc.verifyEqual(out, exp)
-end
-
-end
-end