Skip to content

Commit 32ad148

Browse files
committed
test: skip tests that require Java if not JVM
1 parent aa6e2f0 commit 32ad148

File tree

8 files changed

+30
-5
lines changed

8 files changed

+30
-5
lines changed

test/TestFileImpure.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,10 @@ function test_hash(tc)
248248

249249

250250
function test_filesystem_type(tc)
251-
252251
import matlab.unittest.constraints.IsOfClass
253252

253+
tc.assumeTrue(stdlib.has_java)
254+
254255
t = stdlib.filesystem_type(".");
255256

256257
tc.verifyThat(t, IsOfClass('string'))

test/TestFilePure.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ function test_is_absolute(tc, in_is_absolute, ref_is_absolute)
178178

179179

180180
function test_normalize(tc)
181+
tc.assumeTrue(stdlib.has_java)
181182

182183
tc.verifyEqual(stdlib.normalize(""), ".")
183184

@@ -199,16 +200,19 @@ function test_with_suffix(tc)
199200

200201

201202
function test_relative_to(tc, base_relative_to, other_relative_to, ref_relative_to)
203+
tc.assumeTrue(stdlib.has_java)
202204
tc.verifyEqual(stdlib.relative_to(base_relative_to, other_relative_to), string(ref_relative_to))
203205
end
204206

205207

206208
function test_proximate_to(tc, base_relative_to, other_relative_to, ref_proximate_to)
209+
tc.assumeTrue(stdlib.has_java)
207210
tc.verifyEqual(stdlib.proximate_to(base_relative_to, other_relative_to), string(ref_proximate_to))
208211
end
209212

210213

211214
function test_is_subdir(tc, dir_is_subdir, sub_is_subdir, ref_is_subdir)
215+
tc.assumeTrue(stdlib.has_java)
212216
tc.verifyEqual(stdlib.is_subdir(sub_is_subdir, dir_is_subdir), ref_is_subdir)
213217
end
214218

test/TestHash.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ function test_extract(tc)
2020
import matlab.unittest.constraints.IsFile
2121
import matlab.unittest.fixtures.TemporaryFolderFixture
2222

23+
tc.assumeTrue(stdlib.has_java)
24+
2325
fixture = tc.applyFixture(TemporaryFolderFixture);
2426
tmpDir = fixture.Folder;
2527

@@ -37,6 +39,8 @@ function test_extract(tc)
3739

3840
function test_hash(tc, type, hash)
3941

42+
tc.assumeTrue(stdlib.has_java)
43+
4044
r = fileparts(mfilename('fullpath'));
4145
fn = fullfile(r, "hello.tar.zst");
4246

test/TestIntg.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ function setup_path(tc)
1313
methods (Test)
1414

1515
function test_checkRAM(tc)
16+
17+
tc.assumeTrue(stdlib.has_java)
1618
tc.assertTrue(islogical(stdlib.checkRAM(1)))
1719
end
1820

1921
function test_diskfree(tc)
2022

23+
tc.assumeTrue(stdlib.has_java)
2124
tc.assertTrue(isnumeric(stdlib.diskfree('/')))
2225
tc.assertTrue(stdlib.diskfree('/') > 0, 'diskfree')
2326
end

test/TestSubprocess.m

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ function setup_path(tc)
1313

1414
function test_simple_run(tc)
1515

16+
tc.assumeTrue(stdlib.has_java)
17+
1618
if ispc
1719
c = ["cmd", "/c", "dir"];
1820
else
@@ -30,6 +32,8 @@ function test_simple_run(tc)
3032
function test_cwd(tc)
3133
import matlab.unittest.fixtures.TemporaryFolderFixture
3234

35+
tc.assumeTrue(stdlib.has_java)
36+
3337
if ispc
3438
c = ["cmd", "/c", "dir"];
3539
else
@@ -54,6 +58,8 @@ function test_cwd(tc)
5458

5559
function test_env_run(tc)
5660

61+
tc.assumeTrue(stdlib.has_java)
62+
5763
names = ["TEST1", "TEST2"];
5864
vals = ["test123", "test321"];
5965

test/TestSymlink.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function setup_symlink(tc)
2222

2323
tc.TestData.link = stdlib.join(td, "my.lnk");
2424

25-
tc.TestData.this = mfilename("fullpath") + ".m";
25+
tc.TestData.this = stdlib.posix(mfilename("fullpath") + ".m");
2626

2727
tc.assumeTrue(stdlib.create_symlink(tc.TestData.this, tc.TestData.link), ...
2828
"failed to create test link " + tc.TestData.link)
@@ -52,7 +52,7 @@ function test_read_symlink(tc)
5252
t = stdlib.read_symlink(tc.TestData.link);
5353
tc.verifyNotEmpty(t)
5454
tc.verifyThat(t, IsOfClass('string'))
55-
tc.verifyTrue(stdlib.samepath(tc.TestData.this, t))
55+
tc.verifyEqual(tc.TestData.this, t)
5656

5757
end
5858

test/TestSys.m

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,33 @@ function test_platform(tc)
2828

2929
tc.verifyThat(stdlib.isinteractive, IsOfClass('logical'))
3030

31-
tc.verifyThat(stdlib.is_parallel_worker, IsOfClass('logical'))
32-
3331
tc.verifyThat(stdlib.is_windows_powershell, IsOfClass('logical'))
32+
end
3433

34+
function test_is_parallel(tc)
35+
tc.assumeTrue(stdlib.has_java)
36+
tc.verifyThat(stdlib.is_parallel_worker, IsOfClass('logical'))
3537
end
3638

3739
function test_ram(tc)
3840

41+
tc.assumeTrue(stdlib.has_java)
42+
3943
tc.verifyGreaterThan(stdlib.ram_total(), 0)
4044
tc.verifyGreaterThan(stdlib.ram_free(), 0)
4145

4246
end
4347

4448
function test_cpu_count(tc)
4549

50+
tc.assumeTrue(stdlib.has_java)
4651
tc.verifyGreaterThan(stdlib.cpu_count(), 0)
4752

4853
end
4954

5055
function test_cpu_load(tc)
5156

57+
tc.assumeTrue(stdlib.has_java)
5258
tc.verifyGreaterThanOrEqual(stdlib.cpu_load(), 0)
5359

5460
end

test/TestWSL.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ function setup_path(tc)
1313

1414
function test_is_exe_which_wsl(tc)
1515
import matlab.unittest.constraints.IsFile
16+
tc.assumeTrue(stdlib.has_java)
1617
tc.assumeTrue(ispc, "Windows only")
1718
tc.assumeTrue(stdlib.has_wsl(), "did not find Windows Subsystem for Linux")
1819

0 commit comments

Comments
 (0)