test: improve mex built detection

Author: scivision

test/TestDisk.m

@@ -7,8 +7,7 @@
 methods (Test)
 
 function test_disk_available(tc, Ps)
-tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
-tc.assumeEqual(exist("+stdlib/disk_available", "file"), 3)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/disk_available." + mexext))
 
 zero = uint64(0);
 
@@ -20,8 +19,7 @@ function test_disk_available(tc, Ps)
 end
 
 function test_disk_capacity(tc, Ps)
-tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
-tc.assumeEqual(exist("+stdlib/disk_capacity", "file"), 3)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/disk_capacity." + mexext))
 
 zero = uint64(0);
 

test/TestMex.m

@@ -3,9 +3,8 @@
 methods (Test)
 
 function test_is_char_device(tc)
-tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
-% matlab exist() doesn't work for MEX detection with ".." leading path
-tc.assumeEqual(exist("+stdlib/is_char_device", "file"), 3)
+
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/is_char_device." + mexext))
 
 % /dev/stdin may not be available on CI systems
 if ispc
@@ -19,16 +18,14 @@ function test_is_char_device(tc)
 
 
 function test_is_admin(tc)
-tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
-tc.assumeEqual(exist("+stdlib/is_admin", "file"), 3)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/is_admin." + mexext))
 
 tc.verifyClass(stdlib.is_admin(), "logical")
 end
 
 
 function test_unlink_file(tc)
-tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
-tc.assumeEqual(exist("+stdlib/unlink", "file"), 3)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/unlink." + mexext))
 
 d = tc.createTemporaryFolder();
 
@@ -42,8 +39,7 @@ function test_unlink_file(tc)
 
 
 function test_unlink_empty_dir(tc)
-tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
-tc.assumeEqual(exist("+stdlib/unlink", "file"), 3)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/unlink." + mexext))
 
 d = tc.createTemporaryFolder();
 
@@ -52,8 +48,7 @@ function test_unlink_empty_dir(tc)
 
 
 function test_unlink_recursive(tc)
-tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
-tc.assumeEqual(exist("+stdlib/unlink", "file"), 3)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/unlink." + mexext))
 
 d = tc.createTemporaryFolder();
 

test/TestNormalize.m

@@ -5,6 +5,7 @@
 d = init_drop_slash()
 end
 
+
 methods (Test)
 function test_normalize(tc, p)
 tc.verifyEqual(stdlib.normalize(p{1}), p{2})
@@ -49,15 +50,13 @@ function test_drop_slash(tc, d)
 function d = init_drop_slash()
 d = {...
 {"", ""}, ...
-{'a', 'a'}, ...
 {"a/", "a"}, ...
 {"a/b", "a/b"}, ...
 {"a/b/", "a/b"}, ...
 {"////", "/"}, ...
 {"a////b", "a/b"}, ...
 {"a//b//", "a/b"}, ...
-{"///", "/"}, ...
-{'/', '/'}};
+{"///", "/"}};
 if ispc()
   dd = {...
     {"c:/", "c:/"}, ...
@@ -67,4 +66,15 @@ function test_drop_slash(tc, d)
   };
   d = [d, dd];
 end
+
+if ~isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/drop_slash." + mexext)
+
+dd = {...
+  {'a', 'a'}, ...
+  {'/', '/'}
+};
+d = [d, dd];
+
+end
+
 end

test/TestPermissions.m

@@ -25,12 +25,8 @@ function test_get_permissions(tc, Ps)
 function test_set_permissions(tc)
 
 import matlab.unittest.constraints.StartsWithSubstring
-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)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/set_permissions." + mexext))
 
 tf = tc.createTemporaryFolder();
 

test/TestRelative.m

@@ -7,13 +7,8 @@
 
 methods(TestClassSetup)
 function mex_required(tc)
-import matlab.unittest.fixtures.CurrentFolderFixture
-
-tc.applyFixture(CurrentFolderFixture(".."))
-% matlab exist() doesn't work for MEX detection with ".." leading path
-
-tc.assumeEqual(exist("+stdlib/relative_to", "file"), 3)
-tc.assumeEqual(exist("+stdlib/proximate_to", "file"), 3)
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/relative_to." + mexext))
+tc.assumeTrue(isfile(fileparts(mfilename("fullpath")) + "/../+stdlib/proximate_to." + mexext))
 end
 end