test: constraints for better auto-error message

Author: scivision

+stdlib/+test/TestFileImpure.m

@@ -3,6 +3,7 @@
 methods (Test)
 
 function test_expanduser(tc)
+import matlab.unittest.constraints.EndsWithSubstring
 import stdlib.expanduser
 tc.assumeTrue(usejava("jvm"), "Java required")
 
@@ -13,7 +14,7 @@ function test_expanduser(tc)
 
 tc.verifyFalse(startsWith(expanduser('~/foo'), "~"))
 
-tc.verifyTrue(endsWith(expanduser('~/foo'), "foo"))
+tc.verifyThat(expanduser('~/foo'), EndsWithSubstring("foo"))
 end
 
 
@@ -53,6 +54,7 @@ function test_which_name(tc)
 
 function test_is_exe_which_fullpath(tc)
 import matlab.unittest.constraints.IsFile
+import matlab.unittest.constraints.EndsWithSubstring
 tc.assumeTrue(usejava("jvm"), "Java required")
 
 tc.verifyEmpty(stdlib.is_exe(string.empty))
@@ -72,9 +74,9 @@ function test_is_exe_which_fullpath(tc)
 exe = stdlib.which(p);
 
 if ispc
-  tc.verifyTrue(endsWith(exe, ".exe"))
+  tc.verifyThat(exe, EndsWithSubstring(".exe"))
 else
-  tc.verifyFalse(endsWith(exe, ".exe"))
+  tc.verifyThat(exe, ~EndsWithSubstring(".exe"))
 end
 tc.verifyThat(exe, IsFile)
 

+stdlib/+test/TestFilePure.m

@@ -138,6 +138,7 @@ function test_absolute_path(tc)
 function test_canonical(tc)
 import matlab.unittest.fixtures.TemporaryFolderFixture
 import matlab.unittest.fixtures.CurrentFolderFixture
+import matlab.unittest.constraints.StartsWithSubstring
 import stdlib.canonical
 
 tc.assumeTrue(usejava("jvm"), "Java required")
@@ -150,11 +151,11 @@ function test_canonical(tc)
 tc.verifyEqual(canonical(""), "")
 
 pabs = canonical('2foo');
-tc.verifyTrue(startsWith(pabs, "2foo"))
+tc.verifyThat(pabs, StartsWithSubstring("2foo"))
 
 par1 = canonical("../2foo");
 tc.verifyNotEmpty(par1)
-tc.verifyTrue(startsWith(par1, ".."))
+tc.verifyThat(par1, StartsWithSubstring(".."))
 
 pt1 = canonical("bar/../2foo");
 tc.verifyEqual(pt1, "2foo")

+stdlib/+test/TestHDF5.m

@@ -13,6 +13,7 @@
 
 function setup_file(tc)
 import matlab.unittest.fixtures.TemporaryFolderFixture
+import matlab.unittest.constraints.IsFile
 fixture = tc.applyFixture(TemporaryFolderFixture);
 
 A0 = 42.;
@@ -49,7 +50,7 @@ function setup_file(tc)
 stdlib.h5save(bf, '/t/y', 13)
 stdlib.h5save(bf, '/j/a/b', 6)
 
-tc.assumeTrue(isfile(bf))
+tc.assumeThat(bf, IsFile)
 end
 end
 
@@ -220,11 +221,12 @@ function test_coerce(tc)
 
 
 function test_rewrite(tc)
+import matlab.unittest.constraints.IsFile
 basic = tc.TestData.basic;
 
 stdlib.h5save(basic, '/A2', 3*magic(4))
 
-tc.assumeTrue(isfile(basic))
+tc.assumeThat(basic, IsFile)
 tc.verifyEqual(h5read(basic, '/A2'), 3*magic(4))
 end
 

+stdlib/+test/TestNetCDF.m

@@ -7,6 +7,7 @@
 methods (TestMethodSetup)
 
 function setup_file(tc)
+import matlab.unittest.constraints.IsFile
 import matlab.unittest.fixtures.TemporaryFolderFixture
 fixture = tc.applyFixture(TemporaryFolderFixture);
 
@@ -49,7 +50,7 @@ function setup_file(tc)
 stdlib.ncsave(basic, '/t/y', 13)
 stdlib.ncsave(basic, '/j/a/b', 6)
 
-tc.assumeTrue(isfile(basic))
+tc.assumeThat(basic, IsFile)
 end
 end
 
@@ -213,11 +214,12 @@ function test_coerce(tc)
 
 
 function test_rewrite(tc)
+import matlab.unittest.constraints.IsFile
 basic = tc.TestData.basic;
 
 stdlib.ncsave(basic, "A2", 3*magic(4))
 
-tc.assumeTrue(isfile(basic))
+tc.assumeThat(basic, IsFile)
 tc.verifyEqual(ncread(basic, 'A2'), 3*magic(4))
 end
 

+stdlib/+test/TestSys.m

@@ -38,7 +38,7 @@ function test_env_run(tc)
 
   [ret, out] = stdlib.subprocess_run(cmd, env=env);
   tc.verifyEqual(ret, 0)
-  tc.verifyTrue(contains(out, vals(i)))
+  tc.verifySubstring(out, vals(i))
 end
 
 end

+stdlib/+test/TestWSL.m

@@ -3,7 +3,7 @@
 methods (Test)
 
 function test_is_exe_which_wsl(tc)
-
+import matlab.unittest.constraints.IsFile
 tc.assumeTrue(ispc, "Windows only")
 tc.assumeTrue(stdlib.sys.has_wsl(), "did not find Windows Subsystem for Linux")
 
@@ -22,7 +22,7 @@ function test_is_exe_which_wsl(tc)
 
 tc.assumeEqual(ret, 0, "failed to compile " + src)
 out = stdlib.sys.wslpath2winpath(out_wsl);
-tc.assumeTrue(isfile(out), "cc failed to produce output file " + out)
+tc.assumeThat(out, IsFile, "cc failed to produce output file " + out)
 
 tc.verifyTrue(stdlib.is_exe(out), "is_exe() failed to detect WSL executable " + out)
 

+stdlib/+test/TestWindowsCOM.m

@@ -3,15 +3,16 @@
 methods (Test)
 
 function test_shortname(tc)
+import matlab.unittest.constraints.IsFolder
 
 tc.assumeTrue(ispc, "Windows only")
 
 progdir = stdlib.fileio.posix(getenv("PROGRAMFILES"));
-tc.assumeTrue(isfolder(progdir), "Env:ProgramFiles not defined")
+tc.assumeThat(progdir, IsFolder, "PROGRAMFILES is not a directory")
 
 short = stdlib.fileio.windows_shortname(progdir);
 
-tc.verifyTrue(contains(short, "PROGRA~1"), short + " did not contain PROGRA~1")
+tc.verifySubstring(short, "PROGRA~1")
 
 tc.verifyEqual(stdlib.canonical(short), progdir)