Skip to content

Commit ccf0722

Browse files
committed
test: fail if no java
1 parent a8fa801 commit ccf0722

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

test/TestFileImpure.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ function setup_path(tc)
1717
function test_expanduser(tc)
1818
import matlab.unittest.constraints.EndsWithSubstring
1919
import matlab.unittest.constraints.StartsWithSubstring
20-
tc.assumeTrue(usejava("jvm"), "Java required")
2120

2221
tc.verifyEmpty(stdlib.fileio.expanduser(string.empty))
2322
tc.verifyEqual(stdlib.fileio.expanduser(""), "")
@@ -48,7 +47,6 @@ function test_samepath(tc)
4847

4948

5049
function test_which_name(tc)
51-
tc.assumeTrue(usejava("jvm"), "Java required")
5250

5351
tc.verifyEmpty(stdlib.which(tempname))
5452

@@ -67,7 +65,6 @@ function test_which_name(tc)
6765
function test_is_exe_which_fullpath(tc)
6866
import matlab.unittest.constraints.IsFile
6967
import matlab.unittest.constraints.EndsWithSubstring
70-
tc.assumeTrue(usejava("jvm"), "Java required")
7168

7269
tc.verifyEmpty(stdlib.is_exe(string.empty))
7370
tc.verifyFalse(stdlib.is_exe(""))
@@ -97,7 +94,6 @@ function test_is_exe_which_fullpath(tc)
9794
function test_hash(tc)
9895
import matlab.unittest.constraints.IsFile
9996
import matlab.unittest.fixtures.TemporaryFolderFixture
100-
tc.assumeTrue(usejava("jvm"), "Java required")
10197

10298
fixture = tc.applyFixture(TemporaryFolderFixture);
10399

test/TestFilePure.m

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ function test_stem(tc)
8383

8484
function test_path_tail(tc)
8585

86-
tc.assumeTrue(usejava("jvm"), "Java required for path_tail")
87-
8886
tc.verifyEmpty(stdlib.path_tail(string.empty))
8987
tc.verifyEqual(stdlib.path_tail(""), "")
9088
tc.verifyEqual(stdlib.path_tail("/foo/bar/baz"), "baz")
@@ -97,8 +95,6 @@ function test_path_tail(tc)
9795

9896
function test_is_absolute_path(tc)
9997

100-
tc.assumeTrue(usejava("jvm"), "Java required")
101-
10298
tc.verifyEmpty(stdlib.is_absolute_path(string.empty))
10399
tc.verifyFalse(stdlib.is_absolute_path(""))
104100

@@ -116,8 +112,6 @@ function test_is_absolute_path(tc)
116112
function test_absolute_path(tc)
117113
import matlab.unittest.constraints.StartsWithSubstring
118114

119-
tc.assumeTrue(usejava("jvm"), "Java required")
120-
121115
tc.verifyEmpty(stdlib.absolute_path(string.empty))
122116
tc.verifyEqual(stdlib.absolute_path(""), string(pwd))
123117

@@ -148,8 +142,6 @@ function test_canonical(tc)
148142
import matlab.unittest.fixtures.CurrentFolderFixture
149143
import matlab.unittest.constraints.StartsWithSubstring
150144

151-
tc.assumeTrue(usejava("jvm"), "Java required")
152-
153145
td = tc.applyFixture(TemporaryFolderFixture).Folder;
154146
tc.applyFixture(CurrentFolderFixture(td))
155147

@@ -181,7 +173,6 @@ function test_resolve(tc)
181173
import matlab.unittest.constraints.StartsWithSubstring
182174
import matlab.unittest.constraints.EndsWithSubstring
183175
import matlab.unittest.constraints.ContainsSubstring
184-
tc.assumeTrue(usejava("jvm"), "Java required")
185176

186177
td = tc.applyFixture(TemporaryFolderFixture).Folder;
187178
tc.applyFixture(CurrentFolderFixture(td))

test/TestIntg.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function test_checkRAM(tc)
1919
end
2020

2121
function test_diskfree(tc)
22-
tc.assumeTrue(usejava("jvm"), "Java required")
2322

2423
tc.assertTrue(isnumeric(stdlib.sys.diskfree('/')))
2524
tc.assertTrue(stdlib.sys.diskfree('/') > 0, 'diskfree')

test/TestSys.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ function setup_path(tc)
1212
methods (Test)
1313

1414
function test_simple_run(tc)
15-
tc.assumeTrue(usejava("jvm"), "Java required")
16-
1715
if ispc
1816
c = ["cmd", "/c", "dir"];
1917
else
@@ -29,7 +27,6 @@ function test_simple_run(tc)
2927

3028

3129
function test_env_run(tc)
32-
tc.assumeTrue(usejava("jvm"), "Java required")
3330

3431
names = ["TEST1", "TEST2"];
3532
vals = ["test123", "test321"];
@@ -54,7 +51,7 @@ function test_env_run(tc)
5451

5552
function test_find_fortran(tc)
5653
import matlab.unittest.constraints.IsOfClass
57-
tc.assumeTrue(usejava("jvm"), "Java required")
54+
5855
tc.verifyThat(stdlib.sys.find_fortran_compiler(), IsOfClass('string'))
5956
end
6057

0 commit comments

Comments
 (0)