test: put always java-requiring tests in TestJava

Author: scivision

test/TestFileImpure.m

@@ -119,61 +119,6 @@ function test_samepath(tc, in_same, other_same, ref_same)
 tc.verifyEqual(stdlib.samepath(in_same, other_same), ref_same)
 end
 
-function test_hash(tc)
-import matlab.unittest.constraints.IsFile
-import matlab.unittest.fixtures.TemporaryFolderFixture
-tc.assumeTrue(stdlib.has_java)
-fixture = tc.applyFixture(TemporaryFolderFixture);
-
-fn = stdlib.join(fixture.Folder, "hello");
-fid = fopen(fn, "w");
-tc.assumeGreaterThan(fid, 0);
-fprintf(fid, "hello");
-fclose(fid);
-tc.assumeThat(fn, IsFile)
-
-tc.verifyEqual(stdlib.file_checksum(fn, "md5"), "5d41402abc4b2a76b9719d911017c592")
-tc.verifyEqual(stdlib.file_checksum(fn, "sha256"), "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824")
-
-end
-
-
-function test_filesystem_type(tc)
-import matlab.unittest.constraints.IsOfClass
-
-tc.assumeTrue(stdlib.has_java)
-
-t = stdlib.filesystem_type(".");
-
-tc.verifyThat(t, IsOfClass('string'))
-
-end
-
-
-function test_owner(tc)
-tc.assumeTrue(stdlib.has_java)
-owner = stdlib.get_owner('.');
-L = strlength(owner);
-tc.verifyGreaterThan(L, 0, "expected non-empty username")
-
-end
-
-
-function test_username(tc)
-tc.assumeTrue(stdlib.has_java)
-u = stdlib.get_username();
-L = strlength(u);
-tc.verifyGreaterThan(L, 0, "expected non-empty username")
-
-end
-
-function test_hostname(tc)
-tc.assumeTrue(stdlib.has_java)
-h = stdlib.hostname();
-L = strlength(h);
-tc.verifyGreaterThan(L, 0, "expected non-empty hostname")
-
-end
 
 function test_getpid(tc)
 pid = stdlib.getpid();
@@ -193,33 +138,6 @@ function test_handle2filename(tc)
 tc.verifyEmpty(stdlib.handle2filename(fopen(tempname)))
 end
 
-function test_java_version(tc)
-tc.assumeTrue(stdlib.has_java)
-v = stdlib.java_version();
-L = strlength(v);
-tc.verifyGreaterThanOrEqual(L, 4)
-end
-
-function test_java_api(tc)
-tc.assumeTrue(stdlib.has_java)
-v = stdlib.java_api();
-tc.verifyGreaterThanOrEqual(v, 8)
-end
-
-function test_hard_link_count(tc)
-tc.assumeTrue(stdlib.has_java)
-fn = mfilename("fullpath") + ".m";
-
-if ispc
-  tc.verifyEmpty(stdlib.hard_link_count(fn))
-else
-  tc.verifyGreaterThanOrEqual(stdlib.hard_link_count(fn), 1)
-end
-
-tc.verifyEmpty(stdlib.hard_link_count(tempname))
-
-end
-
 end
 
 end

test/TestHash.m

@@ -6,6 +6,11 @@
 end
 
 methods(TestClassSetup)
+
+function has_java(tc)
+  tc.assumeTrue(stdlib.has_java)
+end
+
 function setup_path(tc)
 import matlab.unittest.fixtures.PathFixture
 cwd = fileparts(mfilename("fullpath"));
@@ -20,8 +25,6 @@ function test_extract(tc)
 import matlab.unittest.constraints.IsFile
 import matlab.unittest.fixtures.TemporaryFolderFixture
 
-tc.assumeTrue(stdlib.has_java)
-
 fixture = tc.applyFixture(TemporaryFolderFixture);
 tmpDir = fixture.Folder;
 
@@ -37,9 +40,8 @@ function test_extract(tc)
 
 end
 
-function test_hash(tc, type, hash)
 
-tc.assumeTrue(stdlib.has_java)
+function test_hash(tc, type, hash)
 
 r = fileparts(mfilename('fullpath'));
 fn = fullfile(r, "hello.tar.zst");
@@ -53,6 +55,24 @@ function test_hash(tc, type, hash)
 
 end
 
+
+function test_hash_text(tc)
+import matlab.unittest.constraints.IsFile
+import matlab.unittest.fixtures.TemporaryFolderFixture
+fixture = tc.applyFixture(TemporaryFolderFixture);
+
+fn = stdlib.join(fixture.Folder, "hello");
+fid = fopen(fn, "w");
+tc.assumeGreaterThan(fid, 0);
+fprintf(fid, "hello");
+fclose(fid);
+tc.assumeThat(fn, IsFile)
+
+tc.verifyEqual(stdlib.file_checksum(fn, "md5"), "5d41402abc4b2a76b9719d911017c592")
+tc.verifyEqual(stdlib.file_checksum(fn, "sha256"), "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824")
+
+end
+
 end
 
 end

test/TestJava.m

@@ -0,0 +1,87 @@
+classdef TestJava < matlab.unittest.TestCase
+
+methods(TestClassSetup)
+
+function has_java(tc)
+  tc.assumeTrue(stdlib.has_java)
+end
+
+end
+
+methods(Test)
+
+function test_filesystem_type(tc)
+import matlab.unittest.constraints.IsOfClass
+
+t = stdlib.filesystem_type(".");
+
+tc.verifyThat(t, IsOfClass('string'))
+end
+
+
+function test_owner(tc)
+owner = stdlib.get_owner('.');
+L = strlength(owner);
+tc.verifyGreaterThan(L, 0, "expected non-empty username")
+end
+
+
+function test_username(tc)
+u = stdlib.get_username();
+L = strlength(u);
+tc.verifyGreaterThan(L, 0, "expected non-empty username")
+end
+
+function test_hostname(tc)
+h = stdlib.hostname();
+L = strlength(h);
+tc.verifyGreaterThan(L, 0, "expected non-empty hostname")
+end
+
+
+function test_java_version(tc)
+v = stdlib.java_version();
+L = strlength(v);
+tc.verifyGreaterThanOrEqual(L, 4)
+end
+
+
+function test_java_api(tc)
+v = stdlib.java_api();
+tc.verifyGreaterThanOrEqual(v, 8)
+end
+
+
+function test_hard_link_count(tc)
+fn = mfilename("fullpath") + ".m";
+
+if ispc
+    tc.verifyEmpty(stdlib.hard_link_count(fn))
+else
+    tc.verifyGreaterThanOrEqual(stdlib.hard_link_count(fn), 1)
+end
+
+tc.verifyEmpty(stdlib.hard_link_count(tempname))
+end
+
+function test_is_parallel(tc)
+import matlab.unittest.constraints.IsOfClass
+tc.verifyThat(stdlib.is_parallel_worker, IsOfClass('logical'))
+end
+
+function test_ram(tc)
+tc.verifyGreaterThan(stdlib.ram_total(), 0)
+tc.verifyGreaterThan(stdlib.ram_free(), 0)
+end
+
+function test_cpu_count(tc)
+tc.verifyGreaterThan(stdlib.cpu_count(), 0)
+end
+
+function test_cpu_load(tc)
+tc.verifyGreaterThanOrEqual(stdlib.cpu_load(), 0)
+end
+
+end
+
+end

test/TestSubprocess.m

@@ -1,6 +1,11 @@
 classdef TestSubprocess < matlab.unittest.TestCase
 
 methods (TestClassSetup)
+
+function has_java(tc)
+  tc.assumeTrue(stdlib.has_java)
+end
+
 function setup_path(tc)
 import matlab.unittest.fixtures.PathFixture
 cwd = fileparts(mfilename("fullpath"));
@@ -13,8 +18,6 @@ function setup_path(tc)
 
 function test_simple_run(tc)
 
-tc.assumeTrue(stdlib.has_java)
-
 if ispc
   c = ["cmd", "/c", "dir"];
 else
@@ -32,8 +35,6 @@ function test_simple_run(tc)
 function test_cwd(tc)
 import matlab.unittest.fixtures.TemporaryFolderFixture
 
-tc.assumeTrue(stdlib.has_java)
-
 if ispc
   c = ["cmd", "/c", "dir"];
 else
@@ -58,8 +59,6 @@ function test_cwd(tc)
 
 function test_env_run(tc)
 
-tc.assumeTrue(stdlib.has_java)
-
 names = ["TEST1", "TEST2"];
 vals = ["test123", "test321"];
 

test/TestSys.m

@@ -33,34 +33,5 @@ function test_platform(tc)
 tc.verifyThat(stdlib.is_windows_powershell, IsOfClass('logical'))
 end
 
-function test_is_parallel(tc)
-import matlab.unittest.constraints.IsOfClass
-tc.assumeTrue(stdlib.has_java)
-tc.verifyThat(stdlib.is_parallel_worker, IsOfClass('logical'))
-end
-
-function test_ram(tc)
-
-tc.assumeTrue(stdlib.has_java)
-
-tc.verifyGreaterThan(stdlib.ram_total(), 0)
-tc.verifyGreaterThan(stdlib.ram_free(), 0)
-
-end
-
-function test_cpu_count(tc)
-
-tc.assumeTrue(stdlib.has_java)
-tc.verifyGreaterThan(stdlib.cpu_count(), 0)
-
-end
-
-function test_cpu_load(tc)
-
-tc.assumeTrue(stdlib.has_java)
-tc.verifyGreaterThanOrEqual(stdlib.cpu_load(), 0)
-
-end
-
 end
 end

test/TestWSL.m

@@ -1,6 +1,11 @@
 classdef TestWSL < matlab.unittest.TestCase
 
 methods (TestClassSetup)
+
+function has_java(tc)
+  tc.assumeTrue(stdlib.has_java)
+end
+
 function setup_path(tc)
 import matlab.unittest.fixtures.PathFixture
 cwd = fileparts(mfilename("fullpath"));
@@ -13,7 +18,6 @@ function setup_path(tc)
 
 function test_is_exe_which_wsl(tc)
 import matlab.unittest.constraints.IsFile
-tc.assumeTrue(stdlib.has_java)
 tc.assumeTrue(ispc, "Windows only")
 tc.assumeTrue(stdlib.has_wsl(), "did not find Windows Subsystem for Linux")