Skip to content

Commit ef94843

Browse files
committed
test: assume that java available where needed
1 parent 9182764 commit ef94843

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

+stdlib/+test/TestFileImpure.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
function test_expanduser(tc)
66
import stdlib.expanduser
7+
tc.assumeTrue(usejava("jvm"), "Java required")
78

89
tc.verifyEmpty(expanduser(string.empty))
910
tc.verifyEqual(expanduser(""), "")
@@ -23,7 +24,7 @@ function test_makedir(tc)
2324

2425
function test_samepath(tc)
2526
import stdlib.fileio.samepath
26-
tc.assumeTrue(usejava("jvm"), "Java required for samepath")
27+
tc.assumeTrue(usejava("jvm"), "Java required")
2728

2829
tc.verifyEmpty(samepath(string.empty, string.empty))
2930
tc.verifyTrue(samepath("", ""))
@@ -34,6 +35,7 @@ function test_samepath(tc)
3435

3536

3637
function test_which_name(tc)
38+
tc.assumeTrue(usejava("jvm"), "Java required")
3739

3840
tc.verifyEmpty(stdlib.which(tempname))
3941

@@ -51,6 +53,7 @@ function test_which_name(tc)
5153

5254
function test_is_exe_which_fullpath(tc)
5355
import matlab.unittest.constraints.IsFile
56+
tc.assumeTrue(usejava("jvm"), "Java required")
5457

5558
tc.verifyEmpty(stdlib.is_exe(string.empty))
5659
tc.verifyFalse(stdlib.is_exe(""))
@@ -80,6 +83,7 @@ function test_is_exe_which_fullpath(tc)
8083
function test_hash(tc)
8184
import matlab.unittest.constraints.IsFile
8285
import matlab.unittest.fixtures.TemporaryFolderFixture
86+
tc.assumeTrue(usejava("jvm"), "Java required")
8387

8488
fixture = tc.applyFixture(TemporaryFolderFixture);
8589

+stdlib/+test/TestFilePure.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function test_path_tail(tc)
3333
function test_is_absolute_path(tc)
3434

3535
import stdlib.is_absolute_path
36-
% path need not exist
36+
tc.assumeTrue(usejava("jvm"), "Java required")
3737

3838
tc.verifyEmpty(is_absolute_path(string.empty))
3939
tc.verifyFalse(is_absolute_path(""))
@@ -52,8 +52,7 @@ function test_is_absolute_path(tc)
5252
function test_absolute_path(tc)
5353

5454
import stdlib.absolute_path
55-
56-
tc.assumeTrue(usejava("jvm"), "Java required for absolute_path")
55+
tc.assumeTrue(usejava("jvm"), "Java required")
5756

5857
tc.verifyEmpty(absolute_path(string.empty))
5958
tc.verifyEqual(absolute_path(""), string(pwd))
@@ -83,8 +82,7 @@ function test_absolute_path(tc)
8382
function test_canonical(tc)
8483

8584
import stdlib.canonical
86-
87-
tc.assumeTrue(usejava("jvm"), "Java required for absolute_path")
85+
tc.assumeTrue(usejava("jvm"), "Java required")
8886

8987
tc.verifyEmpty(canonical(string.empty))
9088
tc.verifyEqual(canonical(""), string(pwd))

+stdlib/+test/TestIntg.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function test_checkRAM(tc)
99
end
1010

1111
function test_diskfree(tc)
12-
tc.assumeTrue(usejava("jvm"), "Java required for path_tail")
12+
tc.assumeTrue(usejava("jvm"), "Java required")
1313

1414
tc.assertTrue(isnumeric(stdlib.sys.diskfree('/')))
1515
tc.assertTrue(stdlib.sys.diskfree('/') > 0, 'diskfree')

+stdlib/+test/TestSys.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
methods (Test)
44

55
function test_simple_run(tc)
6+
tc.assumeTrue(usejava("jvm"), "Java required")
67

78
if ispc
89
c = 'dir';
@@ -18,6 +19,7 @@ function test_simple_run(tc)
1819

1920

2021
function test_env_run(tc)
22+
tc.assumeTrue(usejava("jvm"), "Java required")
2123

2224
names = ["TEST1", "TEST2"];
2325
vals = ["test123", "test321"];
@@ -41,6 +43,7 @@ function test_env_run(tc)
4143
end
4244

4345
function test_find_fortran(tc)
46+
tc.assumeTrue(usejava("jvm"), "Java required")
4447
tc.verifyTrue(isstring(stdlib.sys.find_fortran_compiler()))
4548
end
4649

0 commit comments

Comments
 (0)