Skip to content

Commit 6847287

Browse files
committed
test: use folder fixture
1 parent 7af1cd4 commit 6847287

File tree

2 files changed

+18
-45
lines changed

2 files changed

+18
-45
lines changed

+stdlib/+test/TestHDF5.m

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
methods (TestMethodSetup)
1313

1414
function setup_file(tc)
15+
import matlab.unittest.fixtures.TemporaryFolderFixture
16+
fixture = tc.applyFixture(TemporaryFolderFixture);
1517

1618
A0 = 42.;
1719
A1 = [42.; 43.];
@@ -30,31 +32,24 @@ function setup_file(tc)
3032
tc.TestData.utf = utf;
3133
tc.TestData.utf2 = utf2;
3234

33-
basic = tempname + ".h5";
34-
tc.TestData.basic = basic;
35+
tc.TestData.basic = fullfile(fixture.Folder, "basic.h5");
36+
bf = tc.TestData.basic;
3537

3638
% create test data first, so that parallel tests works
37-
stdlib.h5save(basic, '/A0', A0)
38-
stdlib.h5save(basic, '/A1', A1)
39-
stdlib.h5save(basic, '/A2', A2)
40-
stdlib.h5save(basic, '/A3', A3, "size", size(A3))
41-
stdlib.h5save(basic, '/A4', A4)
39+
stdlib.h5save(bf, '/A0', A0)
40+
stdlib.h5save(bf, '/A1', A1)
41+
stdlib.h5save(bf, '/A2', A2)
42+
stdlib.h5save(bf, '/A3', A3, "size", size(A3))
43+
stdlib.h5save(bf, '/A4', A4)
4244

43-
stdlib.h5save(basic, "/utf", utf)
44-
stdlib.h5save(basic, "/utf2", utf2)
45+
stdlib.h5save(bf, "/utf", utf)
46+
stdlib.h5save(bf, "/utf2", utf2)
4547

46-
stdlib.h5save(basic, '/t/x', 12)
47-
stdlib.h5save(basic, '/t/y', 13)
48-
stdlib.h5save(basic, '/j/a/b', 6)
48+
stdlib.h5save(bf, '/t/x', 12)
49+
stdlib.h5save(bf, '/t/y', 13)
50+
stdlib.h5save(bf, '/j/a/b', 6)
4951

50-
tc.assumeTrue(isfile(basic))
51-
end
52-
end
53-
54-
55-
methods (TestMethodTeardown)
56-
function cleanup(tc)
57-
delete(tc.TestData.basic)
52+
tc.assumeTrue(isfile(bf))
5853
end
5954
end
6055

@@ -269,15 +264,6 @@ function test_string(tc, str)
269264
tc.verifyEqual(a, char(str+"hi"))
270265
end
271266

272-
function test_name_only(tc)
273-
274-
[~,name] = fileparts(tempname);
275-
tc.assumeFalse(isfile(name))
276-
277-
stdlib.h5save(name, "/A0", 42);
278-
delete(name)
279-
end
280-
281267

282268
function test_real_only(tc)
283269
basic = tc.TestData.basic;

+stdlib/+test/TestNetCDF.m

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

99
function setup_file(tc)
10+
import matlab.unittest.fixtures.TemporaryFolderFixture
11+
fixture = tc.applyFixture(TemporaryFolderFixture);
1012

1113
A0 = 42.;
1214
A1 = [42.; 43.];
@@ -27,7 +29,7 @@ function setup_file(tc)
2729
tc.TestData.utf1 = utf1;
2830
tc.TestData.utf2 = utf2;
2931

30-
basic = tempname + ".nc";
32+
basic = fullfile(fixture.Folder, "basic.nc");
3133
tc.TestData.basic = basic;
3234

3335
% create test data first, so that parallel tests works
@@ -52,13 +54,6 @@ function setup_file(tc)
5254
end
5355

5456

55-
methods (TestMethodTeardown)
56-
function cleanup(tc)
57-
delete(tc.TestData.basic)
58-
end
59-
end
60-
61-
6257
methods (Test)
6358
function test_get_variables(tc)
6459
basic = tc.TestData.basic;
@@ -226,14 +221,6 @@ function test_rewrite(tc)
226221
tc.verifyEqual(ncread(basic, 'A2'), 3*magic(4))
227222
end
228223

229-
function test_name_only(tc)
230-
[~,name] = fileparts(tempname);
231-
tc.assumeFalse(isfile(name))
232-
233-
stdlib.ncsave(name, "/A0", 42);
234-
delete(name)
235-
end
236-
237224

238225
function test_real_only(tc)
239226
basic = tc.TestData.basic;

0 commit comments

Comments
 (0)