test: use createTemporaryFolder()

test symlink: more robust tempdir use

Author: scivision

test/TestHDF5.m

@@ -13,9 +13,9 @@
 
 methods(TestClassSetup)
 function setup_file(tc)
-import matlab.unittest.fixtures.TemporaryFolderFixture
 import matlab.unittest.constraints.IsFile
-fixture = tc.applyFixture(TemporaryFolderFixture);
+
+td = stdlib.posix(tc.createTemporaryFolder());
 
 A0 = 42.;
 A1 = [42.; 43.];
@@ -34,7 +34,7 @@ function setup_file(tc)
 tc.TestData.utf = utf;
 tc.TestData.utf2 = utf2;
 
-tc.TestData.basic = stdlib.posix(fixture.Folder) + "/basic.h5";
+tc.TestData.basic = td + "/basic.h5";
 bf = tc.TestData.basic;
 
 % create test data first, so that parallel tests works

test/TestHash.m

@@ -1,9 +1,5 @@
 classdef TestHash < matlab.unittest.TestCase
 
-properties
-Folder
-end
-
 properties (TestParameter)
 type = {'sha256', 'md5'}
 hash = {"36c1bbbdfd8d04ef546ffb15b9c0a65767fd1fe9a6135a257847e3a51fb1426c", "d58cfb32e075781ba59082a8b18287f9"}
@@ -16,12 +12,6 @@ function java_required(tc)
 end
 end
 
-methods(TestMethodSetup)
-function setup_tempdir(tc)
-  tc.Folder = stdlib.posix(tc.createTemporaryFolder());
-end
-end
-
 
 methods (Test, ParameterCombination = 'sequential')
 
@@ -35,8 +25,10 @@ function test_extract(tc)
 
 tc.assumeNotEmpty(stdlib.which("cmake"), "CMake not available")
 
-stdlib.extract_zstd(fn, tc.Folder)
-tc.verifyThat( tc.Folder + "/test/hello.txt", IsFile)
+td = stdlib.posix(tc.createTemporaryFolder());
+
+stdlib.extract_zstd(fn, td)
+tc.verifyThat(td + "/test/hello.txt", IsFile)
 
 end
 
@@ -59,7 +51,9 @@ function test_hash(tc, type, hash)
 function test_hash_text(tc)
 import matlab.unittest.constraints.IsFile
 
-fn = tc.Folder + "/hello";
+td = stdlib.posix(tc.createTemporaryFolder());
+
+fn = td + "/hello";
 fid = fopen(fn, "w");
 tc.addTeardown(@fclose, fid)
 

test/TestJava.m

@@ -127,11 +127,10 @@ function test_is_regular_file(tc)
 
 
 function test_touch_modtime(tc)
-import matlab.unittest.fixtures.TemporaryFolderFixture
 
-fixture = tc.applyFixture(TemporaryFolderFixture);
+tf = stdlib.posix(tc.createTemporaryFolder());
 
-fn = fullfile(fixture.Folder, "modtime.txt");
+fn = fullfile(tf, "modtime.txt");
 
 tc.verifyTrue(stdlib.touch(fn, datetime("yesterday")))
 t0 = stdlib.get_modtime(fn);

test/TestNetCDF.m

@@ -8,9 +8,8 @@
 
 function setup_file(tc)
 import matlab.unittest.constraints.IsFile
-import matlab.unittest.fixtures.TemporaryFolderFixture
 
-fixture = tc.applyFixture(TemporaryFolderFixture);
+td = stdlib.posix(tc.createTemporaryFolder());
 
 A0 = 42.;
 A1 = [42.; 43.];
@@ -31,7 +30,7 @@ function setup_file(tc)
 tc.TestData.utf1 = utf1;
 tc.TestData.utf2 = utf2;
 
-basic = stdlib.posix(fixture.Folder) + "/basic.nc";
+basic = td + "/basic.nc";
 tc.TestData.basic = basic;
 
 % create test data first, so that parallel tests works

test/TestPermissions.m

@@ -26,17 +26,16 @@ function test_get_permissions(tc, Ps)
 function test_set_permissions(tc)
 
 import matlab.unittest.constraints.StartsWithSubstring
-import matlab.unittest.fixtures.TemporaryFolderFixture
 import matlab.unittest.fixtures.CurrentFolderFixture
 
 tc.applyFixture(CurrentFolderFixture(".."))
 % matlab exist() doesn't work for MEX detection with ".." leading path
 
 tc.assumeEqual(exist("+stdlib/set_permissions", "file"), 3)
 
-fixture = tc.applyFixture(TemporaryFolderFixture);
+tf = stdlib.posix(tc.createTemporaryFolder());
 
-nr = fullfile(fixture.Folder, "no-read");
+nr = fullfile(tf, "no-read");
 
 tc.verifyTrue(stdlib.touch(nr))
 tc.verifyTrue(stdlib.set_permissions(nr, -1, 0, 0))
@@ -46,7 +45,7 @@ function test_set_permissions(tc)
 tc.verifyThat(p, StartsWithSubstring("-"), "no-read permission failed to set")
 end
 
-nw = fullfile(fixture.Folder, "no-write");
+nw = fullfile(tf, "no-write");
 
 tc.verifyTrue(stdlib.touch(nw))
 tc.verifyTrue(stdlib.set_permissions(nw, 0, -1, 0))

test/TestSubprocess.m

@@ -26,22 +26,20 @@ function test_simple_run(tc)
 
 
 function test_cwd(tc)
-import matlab.unittest.fixtures.TemporaryFolderFixture
 
 if ispc
   c = ["cmd", "/c", "dir"];
 else
   c = ["ls", "-l"];
 end
 
-fixture = tc.applyFixture(TemporaryFolderFixture);
-td = fixture.Folder;
-
 [s, m, e] = stdlib.subprocess_run(c);
 tc.assertEqual(s, 0, "status non-zero")
 tc.verifyGreaterThan(strlength(m), 0, "empty directory not expected")
 tc.verifyEqual(strlength(e), 0, e)
 
+td = stdlib.posix(tc.createTemporaryFolder());
+
 [s, mc, e] = stdlib.subprocess_run(c, "cwd", td);
 tc.assertEqual(s, 0, "status non-zero")
 tc.verifyNotEqual(m, mc, "expected different directory to have different contents")

test/TestSymlink.m

@@ -1,7 +1,9 @@
 classdef TestSymlink < matlab.unittest.TestCase
 
 properties
-d
+target
+link
+tempDir
 end
 
 properties (TestParameter)
@@ -10,30 +12,24 @@
 
 
 methods(TestClassSetup)
-
 function setup_symlink(tc)
-import matlab.unittest.fixtures.CurrentFolderFixture
-import matlab.unittest.fixtures.TemporaryFolderFixture
-
-fixture = tc.applyFixture(TemporaryFolderFixture);
-td = stdlib.posix(fixture.Folder);
-tc.applyFixture(CurrentFolderFixture(td))
+tc.tempDir = stdlib.posix(tc.createTemporaryFolder());
 
-tc.d.link = td + "/my.lnk";
+tc.link = tc.tempDir + "/my.lnk";
 
-tc.d.this = stdlib.posix(mfilename("fullpath") + ".m");
-
-tc.assumeTrue(stdlib.create_symlink(tc.d.this, tc.d.link), ...
-    "failed to create test link " + tc.d.link)
+tc.target = stdlib.posix(mfilename("fullpath") + ".m");
 
+tc.assumeTrue(stdlib.create_symlink(tc.target, tc.link), ...
+    "failed to create test link " + tc.link)
 end
 end
 
 
 methods (Test)
 
 function test_is_symlink(tc, p)
-tc.verifyEqual(stdlib.is_symlink(p{1}), p{2})
+tc.verifyTrue(stdlib.is_symlink(tc.link), "failed to detect own link")
+tc.verifyEqual(stdlib.is_symlink(p{1}), p{2}, p{1})
 end
 
 
@@ -43,32 +39,32 @@ function test_read_symlink(tc)
 tc.verifyEqual(stdlib.read_symlink(""), "")
 tc.verifyEqual(stdlib.read_symlink("file:///"), "")
 tc.verifyEqual(stdlib.read_symlink("not-exist"), "")
-tc.verifyEqual(stdlib.read_symlink(tc.d.this), "")
+tc.verifyEqual(stdlib.read_symlink(tc.target), "")
 
-t = stdlib.read_symlink(tc.d.link);
+t = stdlib.read_symlink(tc.link);
 tc.verifyNotEmpty(t)
 tc.verifyThat(t, IsOfClass('string'))
-tc.verifyEqual(tc.d.this, t)
+tc.verifyEqual(tc.target, t)
 
 end
 
 
 function test_create_symlink(tc)
-
 tc.verifyFalse(stdlib.create_symlink("", tempname))
 tc.verifyFalse(stdlib.create_symlink("file:///", tempname))
-tc.verifyFalse(stdlib.create_symlink(tc.d.this, tc.d.link))
-tc.verifyTrue(stdlib.create_symlink(tc.d.this, "another.lnk"))
-tc.verifyTrue(stdlib.is_symlink("another.lnk"))
+tc.verifyFalse(stdlib.create_symlink(tc.target, tc.link), "should fail for existing symlink")
 
+ano = tc.tempDir + "/another.lnk";
+tc.verifyTrue(stdlib.create_symlink(tc.target, ano))
+tc.verifyTrue(stdlib.is_symlink(ano))
 end
 
 end
 end
 
 
 function p = init_symlink()
-p = {{"not-exist", false}, {"my.lnk", true}, ...
+p = {{"not-exist", false}, ...
   {mfilename("fullpath") + ".m", false}, ...
   {"", false}, ...
   {"file:///", false}};