Skip to content

Commit d36af13

Browse files
committed
test compatibility
1 parent 5695df0 commit d36af13

File tree

9 files changed

+24
-11
lines changed

9 files changed

+24
-11
lines changed

Readme.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,16 @@ Matlab R2019b is the minimum required due to use of
1515
syntax.
1616
URLs (e.g. https://, s3:// and similar) are treated as not existing.
1717

18-
Self-tests can be run from the matlab-stdlib/ directory with Matlab R2023a or newer:
18+
Self-tests can be run from the matlab-stdlib/ directory:
1919

2020
```matlab
21+
%% Matlab R2023a or newer
2122
buildtool test
23+
24+
25+
%% Matlab R2021a or newer
26+
addpath .
27+
runtests("test")
2228
```
2329

2430
Functions requiring or optionally benefiting from MEX are indicated in the

test/TestHDF5.m

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313

1414
methods(TestClassSetup)
1515
function setup_file(tc)
16-
import matlab.unittest.constraints.IsFile
16+
17+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
1718

1819
td = tc.createTemporaryFolder();
1920

@@ -53,7 +54,7 @@ function setup_file(tc)
5354
stdlib.h5save(bf, '/t/y', 13)
5455
stdlib.h5save(bf, '/j/a/b', 6)
5556

56-
tc.assumeThat(bf, IsFile)
57+
tc.assumeThat(bf, matlab.unittest.constraints.IsFile)
5758
end
5859
end
5960

@@ -214,12 +215,10 @@ function test_coerce(tc, type)
214215

215216

216217
function test_rewrite(tc)
217-
import matlab.unittest.constraints.IsFile
218218
basic = tc.TestData.basic;
219219

220220
stdlib.h5save(basic, '/A2', 3*magic(4))
221221

222-
tc.assumeThat(basic, IsFile)
223222
tc.verifyEqual(h5read(basic, '/A2'), 3*magic(4))
224223
end
225224

test/TestHash.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function java_required(tc)
1616

1717

1818
function test_hash_text(tc, Ph)
19-
import matlab.unittest.constraints.IsFile
19+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
2020

2121
td = tc.createTemporaryFolder();
2222

@@ -27,7 +27,7 @@ function test_hash_text(tc, Ph)
2727
fprintf(fid, "hello");
2828
fclose(fid);
2929

30-
tc.assumeThat(fn, IsFile)
30+
tc.assumeThat(fn, matlab.unittest.constraints.IsFile)
3131

3232
tc.verifyEqual(stdlib.file_checksum(fn, Ph{1}), Ph{2})
3333

test/TestJava.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ function test_is_regular_file(tc)
124124

125125

126126
function test_touch_modtime(tc)
127+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
127128

128129
tf = tc.createTemporaryFolder();
129130

test/TestMex.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function test_is_admin(tc)
2727

2828

2929
function test_unlink_file(tc)
30+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
3031
tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
3132
tc.assumeEqual(exist("+stdlib/unlink", "file"), 3)
3233

@@ -42,6 +43,7 @@ function test_unlink_file(tc)
4243

4344

4445
function test_unlink_empty_dir(tc)
46+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
4547
tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
4648
tc.assumeEqual(exist("+stdlib/unlink", "file"), 3)
4749

@@ -52,6 +54,7 @@ function test_unlink_empty_dir(tc)
5254

5355

5456
function test_unlink_recursive(tc)
57+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
5558
tc.applyFixture(matlab.unittest.fixtures.CurrentFolderFixture(".."))
5659
tc.assumeEqual(exist("+stdlib/unlink", "file"), 3)
5760

test/TestNetCDF.m

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
methods (TestClassSetup)
88

99
function setup_file(tc)
10-
import matlab.unittest.constraints.IsFile
10+
11+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
1112

1213
td = tc.createTemporaryFolder();
1314

@@ -50,7 +51,7 @@ function setup_file(tc)
5051
stdlib.ncsave(basic, '/t/y', 13)
5152
stdlib.ncsave(basic, '/j/a/b', 6)
5253

53-
tc.assumeThat(basic, IsFile)
54+
tc.assumeThat(basic, matlab.unittest.constraints.IsFile)
5455
end
5556
end
5657

@@ -194,13 +195,11 @@ function test_coerce(tc)
194195

195196

196197
function test_rewrite(tc)
197-
import matlab.unittest.constraints.IsFile
198198
basic = tc.TestData.basic;
199199

200200
A2 = 3*magic(4);
201201
stdlib.ncsave(basic, "A2", A2, "dims", {'x2', size(A2,1), 'y2', size(A2,2)})
202202

203-
tc.assumeThat(basic, IsFile)
204203
tc.verifyEqual(ncread(basic, 'A2'), 3*magic(4))
205204
end
206205

test/TestPermissions.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ function test_set_permissions(tc)
2727
import matlab.unittest.constraints.StartsWithSubstring
2828
import matlab.unittest.fixtures.CurrentFolderFixture
2929

30+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
31+
3032
tc.applyFixture(CurrentFolderFixture(".."))
3133
% matlab exist() doesn't work for MEX detection with ".." leading path
3234

test/TestSubprocess.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function test_simple_run(tc)
2626

2727

2828
function test_cwd(tc)
29+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
2930

3031
if ispc
3132
c = ["cmd", "/c", "dir"];

test/TestSymlink.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
methods(TestClassSetup)
1515
function setup_symlink(tc)
16+
tc.assumeFalse(isMATLABReleaseOlderThan("R2022a"))
17+
1618
tc.tempDir = tc.createTemporaryFolder();
1719

1820
tc.link = tc.tempDir + "/my.lnk";

0 commit comments

Comments
 (0)