test: constraints

Author: scivision

+stdlib/+test/TestFileImpure.m

@@ -4,6 +4,7 @@
 
 function test_expanduser(tc)
 import matlab.unittest.constraints.EndsWithSubstring
+import matlab.unittest.constraints.StartsWithSubstring
 import stdlib.expanduser
 tc.assumeTrue(usejava("jvm"), "Java required")
 
@@ -12,7 +13,7 @@ function test_expanduser(tc)
 
 tc.verifyEqual(expanduser("~abc"), "~abc")
 
-tc.verifyFalse(startsWith(expanduser('~/foo'), "~"))
+tc.verifyThat(expanduser('~/foo'), ~StartsWithSubstring("~"))
 
 tc.verifyThat(expanduser('~/foo'), EndsWithSubstring("foo"))
 end

+stdlib/+test/TestFilePure.m

@@ -3,13 +3,14 @@
 methods (Test)
 
 function test_posix(tc)
+import matlab.unittest.constraints.ContainsSubstring
 
 tc.verifyEmpty(stdlib.posix(string.empty))
 tc.verifyEqual(stdlib.posix(""), "")
 
 if ispc
-  tc.verifyFalse(contains(stdlib.posix("c:\foo"), "\"))
-  tc.verifyFalse(all(contains(stdlib.posix(["x:\123", "d:\abc"]), "\")))
+  tc.verifyThat(stdlib.posix("c:\foo"), ~ContainsSubstring("\"))
+  tc.verifyThat(stdlib.posix(["x:\123", "d:\abc"]), ~ContainsSubstring("\"))
 end
 end
 
@@ -106,6 +107,7 @@ function test_is_absolute_path(tc)
 end
 
 function test_absolute_path(tc)
+import matlab.unittest.constraints.StartsWithSubstring
 
 import stdlib.absolute_path
 tc.assumeTrue(usejava("jvm"), "Java required")
@@ -115,7 +117,7 @@ function test_absolute_path(tc)
 
 pabs = absolute_path('2foo');
 pabs2 = absolute_path('4foo');
-tc.verifyFalse(startsWith(pabs, "2"))
+tc.verifyThat(pabs, ~StartsWithSubstring("2"))
 tc.verifyTrue(strncmp(pabs, pabs2, 2))
 
 par1 = absolute_path("../2foo");
@@ -129,7 +131,7 @@ function test_absolute_path(tc)
 
 va = absolute_path("2foo");
 vb = absolute_path("4foo");
-tc.verifyFalse(startsWith(va, "2"))
+tc.verifyThat(va, ~StartsWithSubstring("2"))
 tc.verifyTrue(strncmp(va, vb, 2))
 
 end
@@ -171,6 +173,9 @@ function test_canonical(tc)
 function test_resolve(tc)
 import matlab.unittest.fixtures.TemporaryFolderFixture
 import matlab.unittest.fixtures.CurrentFolderFixture
+import matlab.unittest.constraints.StartsWithSubstring
+import matlab.unittest.constraints.EndsWithSubstring
+import matlab.unittest.constraints.ContainsSubstring
 import stdlib.resolve
 tc.assumeTrue(usejava("jvm"), "Java required")
 
@@ -183,23 +188,23 @@ function test_resolve(tc)
 
 pabs = resolve('2foo');
 pabs2 = resolve('4foo');
-tc.verifyFalse(startsWith(pabs, "2"))
+tc.verifyThat(pabs, ~StartsWithSubstring("2"))
 tc.verifyTrue(strncmp(pabs, pabs2, 2))
 
 par1 = resolve("../2foo");
 tc.verifyNotEmpty(par1)
-tc.verifyFalse(contains(par1, ".."))
+tc.verifyThat(par1, ~ContainsSubstring(".."))
 
 par2 = resolve("../4foo");
 tc.verifyTrue(strncmp(par2, pabs2, 2))
 
 pt1 = resolve("bar/../2foo");
 tc.verifyNotEmpty(pt1)
-tc.verifyFalse(contains(pt1, ".."))
+tc.verifyThat(pt1, ~ContainsSubstring(".."))
 
 va = resolve("2foo");
 vb = resolve("4foo");
-tc.verifyFalse(startsWith(va, "2"))
+tc.verifyThat(va, ~StartsWithSubstring("2"))
 tc.verifyTrue(strncmp(va, vb, 2))
 
 % test existing file

+stdlib/+test/TestHDF5.m

@@ -87,13 +87,14 @@ function test_get_variables(tc)
 
 
 function test_exists(tc)
+import matlab.unittest.constraints.IsScalar
 basic = tc.TestData.basic;
 
 tc.verifyEmpty(stdlib.h5exists(basic, string.empty))
 
 e = stdlib.h5exists(basic, "");
 
-tc.verifyTrue(isscalar(e))
+tc.verifyThat(e, IsScalar)
 tc.verifyFalse(e)
 
 vars = {'A0', 'A1', 'A2', 'A3', 'A4', '/A0'};
@@ -110,6 +111,7 @@ function test_exists(tc)
 
 
 function test_size(tc)
+import matlab.unittest.constraints.IsScalar
 basic = tc.TestData.basic;
 
 tc.verifyEmpty(stdlib.h5ndims(basic, string.empty))
@@ -122,7 +124,7 @@ function test_size(tc)
 
 r = stdlib.h5ndims(basic, '/A1');
 s = stdlib.h5size(basic, '/A1');
-tc.verifyTrue(isscalar(s))
+tc.verifyThat(s, IsScalar)
 tc.verifyEqual(s, 2)
 tc.verifyEqual(r, 1)
 
@@ -157,10 +159,12 @@ function test_size(tc)
 
 
 function test_read(tc)
+import matlab.unittest.constraints.IsScalar
+import matlab.unittest.constraints.IsOfClass
 basic = tc.TestData.basic;
 
 s = h5read(basic, '/A0');
-tc.verifyTrue(isscalar(s))
+tc.verifyThat(s, IsScalar)
 tc.verifyEqual(s, tc.TestData.A0)
 
 s = h5read(basic, '/A1');
@@ -184,7 +188,7 @@ function test_read(tc)
 tc.verifyEqual(s, tc.TestData.utf)
 
 s = h5read(basic, '/utf2');
-tc.verifyTrue(isstring(s))
+tc.verifyThat(s, IsOfClass('string'))
 tc.verifyEqual(s, tc.TestData.utf2)
 
 end

+stdlib/+test/TestNetCDF.m

@@ -78,14 +78,14 @@ function test_get_variables(tc)
 
 
 function test_exists(tc)
-
+import matlab.unittest.constraints.IsScalar
 basic = tc.TestData.basic;
 
 tc.verifyEmpty(stdlib.ncexists(basic, string.empty))
 
 e = stdlib.ncexists(basic, "");
 
-tc.verifyTrue(isscalar(e))
+tc.verifyThat(e, IsScalar)
 tc.verifyFalse(e)
 
 e = stdlib.ncexists(basic, ["A1", "oops"]);
@@ -98,6 +98,7 @@ function test_exists(tc)
 
 
 function test_size(tc)
+import matlab.unittest.constraints.IsScalar
 basic = tc.TestData.basic;
 
 tc.verifyEmpty(stdlib.ncndims(basic, string.empty))
@@ -110,7 +111,7 @@ function test_size(tc)
 
 r = stdlib.ncndims(basic, 'A1');
 s = stdlib.ncsize(basic, 'A1');
-tc.verifyTrue(isscalar(s))
+tc.verifyThat(s, IsScalar)
 tc.verifyEqual(s, 2)
 tc.verifyEqual(r, 1)
 
@@ -156,10 +157,11 @@ function test_size_string(tc)
 
 
 function test_read(tc)
+import matlab.unittest.constraints.IsScalar
 basic = tc.TestData.basic;
 
 s = ncread(basic, 'A0');
-tc.verifyTrue(isscalar(s))
+tc.verifyThat(s, IsScalar)
 tc.verifyEqual(s, 42)
 
 s = ncread(basic, 'A1');
@@ -180,20 +182,21 @@ function test_read(tc)
 end
 
 function test_read_string(tc)
+import matlab.unittest.constraints.IsOfClass
 basic = tc.TestData.basic;
 
 tc.assumeFalse(isMATLABReleaseOlderThan('R2021b'), "NetCDF4 string requires Matlab >= R2021b")
 
 s = ncread(basic, 'utf0');
-tc.verifyTrue(isstring(s))
+tc.verifyThat(s, IsOfClass('string'))
 tc.verifyEqual(s, string(tc.TestData.utf0))
 
 s = ncread(basic, 'utf1');
-tc.verifyTrue(isstring(s))
+tc.verifyThat(s, IsOfClass('string'))
 tc.verifyEqual(s, tc.TestData.utf1)
 
 s = ncread(basic, 'utf2');
-tc.verifyTrue(isstring(s))
+tc.verifyThat(s, IsOfClass('string'))
 tc.verifyEqual(s, tc.TestData.utf2)
 end
 

+stdlib/+test/TestSys.m

@@ -44,8 +44,9 @@ function test_env_run(tc)
 end
 
 function test_find_fortran(tc)
+import matlab.unittest.constraints.IsOfClass
 tc.assumeTrue(usejava("jvm"), "Java required")
-tc.verifyTrue(isstring(stdlib.sys.find_fortran_compiler()))
+tc.verifyThat(stdlib.sys.find_fortran_compiler(), IsOfClass('string'))
 end
 
 function test_cygwin(tc)