test use working dir

Author: scivision

+stdlib/makedir.m

@@ -8,7 +8,8 @@ function makedir(direc)
 direc = stdlib.expanduser(direc);
 
 if ~stdlib.strempty(direc) && ~isfolder(direc)
-  [~] = mkdir(direc);
+  % char() is for Matlab < R2018a
+  [~] = mkdir(char(direc));
 end
 
 ok = isfolder(direc);

example/TestWindowsCOM.m

@@ -12,11 +12,10 @@ function test_not(tc, Pn)
 end
 
 function test_short_folder(tc)
-import matlab.unittest.constraints.IsFolder
 
 progdir = getenv("PROGRAMFILES");
 if ispc()
-  tc.assertThat(progdir, IsFolder, "$Env:PROGRAMFILES is not a directory")
+  tc.assertThat(progdir, matlab.unittest.constraints.IsFolder, "$Env:PROGRAMFILES is not a directory")
 end
 
 short = windows_shortname(progdir);

test/TestBackend.m

@@ -22,10 +22,14 @@ function test_dirs(tc)
 methods (Test)
 function test_backend(tc)
 import matlab.unittest.constraints.IsSubsetOf
-import matlab.unittest.constraints.IsFile
+
 
 readme = tc.root + "/Readme.md";
-tc.assertThat(readme, IsFile)
+if stdlib.matlabOlderThan('R2018a')
+  tc.assertTrue(isfile(readme))
+else
+  tc.assertThat(readme, matlab.unittest.constraints.IsFile)
+end
 
 [i, b] = stdlib.cpu_load();
 tc.assertThat(b, IsSubsetOf(stdlib.Backend('cpu_load').backends))
@@ -129,7 +133,11 @@ function test_backend(tc)
 
 [i, b] = stdlib.read_symlink('Readme.lnk');
 tc.assertThat(b, IsSubsetOf(stdlib.Backend('read_symlink').backends))
-tc.verifyThat(i, IsFile)
+if stdlib.matlabOlderThan('R2018a')
+  tc.assertTrue(isfile(i))
+else
+  tc.assertThat(i, matlab.unittest.constraints.IsFile)
+end
 
 [i, b] = stdlib.samepath(readme, readme);
 tc.assertThat(b, IsSubsetOf(stdlib.Backend('samepath').backends))

test/TestDisk.m

@@ -134,12 +134,16 @@ function test_is_dev_drive(tc, B_ps)
 
 function test_remove_file(tc)
 
-f = tempname();
+f = "test_remove.tmp";
 
 tc.verifyFalse(stdlib.remove(f), "should not succeed at removing non-existant path")
 
-tc.assumeTrue(stdlib.touch(f), "failed to touch file " + f)
-tc.assumeThat(f, matlab.unittest.constraints.IsFile)
+tc.assertTrue(stdlib.touch(f), "failed to touch file " + f)
+if stdlib.matlabOlderThan('R2018a')
+  tc.assertTrue(isfile(f))
+else
+  tc.assertThat(f, matlab.unittest.constraints.IsFile)
+end
 
 tc.verifyTrue(stdlib.remove(f), "failed to remove file " + f)
 end

test/TestFileImpure.m

@@ -4,33 +4,46 @@
 
 properties (TestParameter)
 ph = {{0, '"stdin"'}, {1, '"stdout"'}, {2, '"stderr"'}, {fopen(tempname()), ''}}
+end
 
-p_file_size = {mfilename("fullpath") + ".m"}
+methods(TestClassSetup)
+function test_dirs(tc)
+tc.applyFixture(matlab.unittest.fixtures.WorkingFolderFixture())
+end
 end
 
 
 methods (Test)
 
-function test_file_size(tc, p_file_size)
-s = stdlib.file_size(p_file_size);
+function test_file_size(tc)
+fn = [mfilename("fullpath"), '.m'];
+s = stdlib.file_size(fn);
 tc.verifyGreaterThan(s, 0)
 end
 
 
 function test_null_file(tc)
+n = stdlib.null_file;
+
 if ispc()
-  tc.verifyEqual(stdlib.null_file, "NUL")
+  tc.verifyEqual(n, "NUL")
+elseif stdlib.matlabOlderThan('R2018a')
+  tc.verifyTrue(isfile(n))
 else
-  tc.verifyThat(stdlib.null_file, matlab.unittest.constraints.IsFile)
+  tc.verifyThat(n, matlab.unittest.constraints.IsFile)
 end
 end
 
 
 function test_makedir(tc)
-d = tempname();
+d = "test_makedir.dir";
 stdlib.makedir(d)
-tc.verifyThat(d, matlab.unittest.constraints.IsFolder)
-rmdir(d)
+
+if stdlib.matlabOlderThan('R2018a')
+  tc.assertTrue(isfolder(d))
+else
+  tc.verifyThat(d, matlab.unittest.constraints.IsFolder)
+end
 end
 
 

test/TestHash.m

@@ -25,7 +25,11 @@ function create_file(tc)
 fprintf(fid, "hello");
 fclose(fid);
 
-tc.assertThat(tc.file, matlab.unittest.constraints.IsFile)
+if stdlib.matlabOlderThan('R2018a')
+  tc.assumeTrue(isfile(tc.file))
+else
+  tc.assertThat(tc.file, matlab.unittest.constraints.IsFile)
+end
 end
 end