Mercurial > octave
changeset 21317:a4faec57f4c8
maint: remove semicolon after %!assert tests to follow Octave conventions.
* testfun.txi: Remove semicolons from examples in manual and update remaider
of text to reflect changes.
* bsxfun.cc, cellfun.cc, data.cc, hash.cc, lu.cc, nproc.cc,
rcond.cc, regexp.cc, sparse-xpow.cc, strfns.cc, symtab.cc, time.cc,
variables.cc, ov-class.cc, ov-cx-diag.cc, ov-struct.cc, ov.cc, oct-parse.in.yy,
pt-mat.cc, CMatrix.cc, oct-inttypes.cc, md5sum.m, blkdiag.m, cell2mat.m,
interp1.m, interp2.m, interpft.m, num2str.m, repmat.m, ntsc2rgb.m, expm.m,
inputname.m, polyvalm.m, blackman.m, hamming.m, hanning.m, eigs.m, median.m,
binopdf.m, strsplit.m, strtok.m, assert.m, example.m, datevec.m, bug-38565.tst,
build-sparse-tests.sh, classdef.tst, classes.tst, diag-perm.tst, index.tst,
io.tst, logical-index.tst, nest.tst, parser.tst, prefer.tst, struct.tst:
maint: remove semicolon after %!assert tests to follow Octave conventions.
line wrap: on
line diff
--- a/doc/interpreter/testfun.txi Sun Feb 21 07:43:16 2016 -0800 +++ b/doc/interpreter/testfun.txi Sun Feb 21 08:10:36 2016 -0800 @@ -175,9 +175,9 @@ @group %!shared @var{a} %! @var{a} = [1, 2, 3; 4, 5, 6]; -%!assert (kron ([1; 2], @var{a}), [ @var{a}; 2*@var{a} ]); -%!assert (kron ([1, 2], @var{a}), [ @var{a}, 2*@var{a} ]); -%!assert (kron ([1,2; 3,4], @var{a}), [ @var{a},2*@var{a}; 3*@var{a},4*@var{a} ]); +%!assert (kron ([1; 2], @var{a}), [ @var{a}; 2*@var{a} ]) +%!assert (kron ([1, 2], @var{a}), [ @var{a}, 2*@var{a} ]) +%!assert (kron ([1,2; 3,4], @var{a}), [ @var{a},2*@var{a}; 3*@var{a},4*@var{a} ]) @end group @end example @@ -194,7 +194,7 @@ %!function @var{a} = fn (@var{b}) %! @var{a} = 2*@var{b}; %!endfunction -%!assert (fn(2), 4); +%!assert (fn(2), 4) @end group @end example @@ -211,7 +211,7 @@ %!function @var{a} = fn (@var{b}) %! @var{a} = 2*@var{b}; %!endfunction -%! assert (fn(2), 4); +%!assert (fn(2), 4) @end group @end example @@ -302,15 +302,15 @@ output = input; endfunction -%!fail ("must_be_zero (1)"); -%!assert (must_be_zero (0), 0); -%!error <Nonzero> must_be_zero (1); -%!xtest error ("This code generates an error"); +%!fail ("must_be_zero (1)") +%!assert (must_be_zero (0), 0) +%!error <Nonzero> must_be_zero (1) +%!xtest error ("This code generates an error") @end group @end example @noindent -When putting this a file @file{must_be_zero.m}, and running the test, we see +When putting this in a file @file{must_be_zero.m}, and running the test, we see @example @group @@ -318,13 +318,13 @@ @result{} >>>>> /path/to/must_be_zero.m - ***** fail ("must_be_zero (1)"); - ***** assert (must_be_zero (0), 0); - ***** error <Nonzero> must_be_zero (1); - ***** xtest error ("This code generates an error"); +***** fail ("must_be_zero (1)") +***** assert (must_be_zero (0), 0) +***** error <Nonzero> must_be_zero (1) +***** xtest error ("This code generates an error") !!!!! known failure This code generates an error -PASSES 4 out of 4 tests (1 expected failures) +PASSES 3 out of 4 tests (1 expected failure) @end group @end example
--- a/libinterp/corefcn/bsxfun.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/bsxfun.cc Sun Feb 21 08:10:36 2016 -0800 @@ -741,7 +741,7 @@ %!assert (bsxfun ("minus", ones ([4, 0, 4]), ones ([4, 1, 4])), zeros ([4, 0, 4])) %% The test below is a very hard case to treat -%!assert (bsxfun (f, ones ([4, 1, 4, 1]), ones ([1, 4, 1, 4])), zeros ([4, 4, 4, 4])); +%!assert (bsxfun (f, ones ([4, 1, 4, 1]), ones ([1, 4, 1, 4])), zeros ([4, 4, 4, 4])) %!shared a, b, aa, bb %! a = randn (3, 1, 3);
--- a/libinterp/corefcn/cellfun.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/cellfun.cc Sun Feb 21 08:10:36 2016 -0800 @@ -980,10 +980,10 @@ %! assert (c, {".d", ".h"}); ## Tests for bug #40467 -%!assert (cellfun (@isreal, {1 inf nan []}), [true, true, true, true]); -%!assert (cellfun (@isreal, {1 inf nan []}, "UniformOutput", false), {true, true, true, true}); -%!assert (cellfun (@iscomplex, {1 inf nan []}), [false, false, false, false]); -%!assert (cellfun (@iscomplex, {1 inf nan []}, "UniformOutput", false), {false, false, false, false}); +%!assert (cellfun (@isreal, {1 inf nan []}), [true, true, true, true]) +%!assert (cellfun (@isreal, {1 inf nan []}, "UniformOutput", false), {true, true, true, true}) +%!assert (cellfun (@iscomplex, {1 inf nan []}), [false, false, false, false]) +%!assert (cellfun (@iscomplex, {1 inf nan []}, "UniformOutput", false), {false, false, false, false}) %!error cellfun (1) %!error cellfun ("isclass", 1)
--- a/libinterp/corefcn/data.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/data.cc Sun Feb 21 08:10:36 2016 -0800 @@ -702,10 +702,10 @@ %!assert (rem ([1, 2, 3; -1, -2, -3], 2), [1, 0, 1; -1, 0, -1]) %!assert (rem ([1, 2, 3; -1, -2, -3], 2 * ones (2, 3)),[1, 0, 1; -1, 0, -1]) -%!assert (rem ([0, 1, 2], [0, 0, 1]), [NaN, NaN, 0]); +%!assert (rem ([0, 1, 2], [0, 0, 1]), [NaN, NaN, 0]) %!assert (rem (uint8 ([1, 2, 3; -1, -2, -3]), uint8 (2)), uint8 ([1, 0, 1; -1, 0, -1])) %!assert (uint8 (rem ([1, 2, 3; -1, -2, -3], 2 * ones (2, 3))),uint8 ([1, 0, 1; -1, 0, -1])) -%!assert (rem (uint8 ([0, 1, 2]), [0, 0, 1]), uint8 ([0, 0, 0])); +%!assert (rem (uint8 ([0, 1, 2]), [0, 0, 1]), uint8 ([0, 0, 0])) ## Test sparse implementations %!shared xs @@ -1441,9 +1441,9 @@ ## Test non-square size %!assert (diag ([1,2,3], 6, 3), [1 0 0; 0 2 0; 0 0 3; 0 0 0; 0 0 0; 0 0 0]) -%!assert (diag (1, 2, 3), [1,0,0; 0,0,0]); -%!assert (diag ({1}, 2, 3), {1,[],[]; [],[],[]}); -%!assert (diag ({1,2}, 3, 4), {1,[],[],[]; [],2,[],[]; [],[],[],[]}); +%!assert (diag (1, 2, 3), [1,0,0; 0,0,0]) +%!assert (diag ({1}, 2, 3), {1,[],[]; [],[],[]}) +%!assert (diag ({1,2}, 3, 4), {1,[],[],[]; [],2,[],[]; [],[],[],[]}) ## Test out-of-range diagonals %!assert (diag (ones (3,3), 4), zeros (0, 1)) @@ -2146,8 +2146,8 @@ /* ## Test concatenation with all zero matrices -%!assert (horzcat ("", 65*ones (1,10)), "AAAAAAAAAA"); -%!assert (horzcat (65*ones (1,10), ""), "AAAAAAAAAA"); +%!assert (horzcat ("", 65*ones (1,10)), "AAAAAAAAAA") +%!assert (horzcat (65*ones (1,10), ""), "AAAAAAAAAA") %!assert (class (horzcat (int64 (1), int64 (1))), "int64") %!assert (class (horzcat (int64 (1), int32 (1))), "int64") @@ -5713,15 +5713,15 @@ %!shared q %! q = rand (1e3, 3); -%!assert (norm (q, 3, "rows"), sum (q.^3, 2).^(1/3), sqrt (eps)); -%!assert (norm (q, "fro", "rows"), sum (q.^2, 2).^(1/2), sqrt (eps)); -%!assert (norm (q, "fro", "rows"), sqrt (sumsq (q, 2)), sqrt (eps)); -%!assert (norm (q, "fro", "cols"), sqrt (sumsq (q, 1)), sqrt (eps)); -%!assert (norm (q, 3, "cols"), sum (q.^3, 1).^(1/3), sqrt (eps)); -%!assert (norm (q, "inf", "rows"), norm (q, Inf, "rows")); -%!assert (norm (q, "inf", "cols"), norm (q, Inf, "cols")); -%!assert (norm (q, [], "rows"), norm (q, 2, "rows")); -%!assert (norm (q, [], "cols"), norm (q, 2, "cols")); +%!assert (norm (q, 3, "rows"), sum (q.^3, 2).^(1/3), sqrt (eps)) +%!assert (norm (q, "fro", "rows"), sum (q.^2, 2).^(1/2), sqrt (eps)) +%!assert (norm (q, "fro", "rows"), sqrt (sumsq (q, 2)), sqrt (eps)) +%!assert (norm (q, "fro", "cols"), sqrt (sumsq (q, 1)), sqrt (eps)) +%!assert (norm (q, 3, "cols"), sum (q.^3, 1).^(1/3), sqrt (eps)) +%!assert (norm (q, "inf", "rows"), norm (q, Inf, "rows")) +%!assert (norm (q, "inf", "cols"), norm (q, Inf, "cols")) +%!assert (norm (q, [], "rows"), norm (q, 2, "rows")) +%!assert (norm (q, [], "cols"), norm (q, 2, "cols")) %!test %! ## Test for norm returning NaN on sparse matrix (bug #30631)
--- a/libinterp/corefcn/hash.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/hash.cc Sun Feb 21 08:10:36 2016 -0800 @@ -184,10 +184,10 @@ /* ## MD2 test suite (RFC 1319) -%!assert (hash ("md2", ""), "8350e5a3e24c153df2275c9f80692773"); -%!assert (hash ("md2", "a"), "32ec01ec4a6dac72c0ab96fb34c0b5d1"); -%!assert (hash ("md2", "abc"), "da853b0d3f88d99b30283a69e6ded6bb"); -%!assert (hash ("md2", "message digest"), "ab4f496bfb2a530b219ff33031fe06b0"); +%!assert (hash ("md2", ""), "8350e5a3e24c153df2275c9f80692773") +%!assert (hash ("md2", "a"), "32ec01ec4a6dac72c0ab96fb34c0b5d1") +%!assert (hash ("md2", "abc"), "da853b0d3f88d99b30283a69e6ded6bb") +%!assert (hash ("md2", "message digest"), "ab4f496bfb2a530b219ff33031fe06b0") %!assert (hash ("md2", "abcdefghijklmnopqrstuvwxyz"), %! "4e8ddff3650292ab5a4108c3aa47940b"); %!assert (hash ("md2", ["ABCDEFGHIJKLMNOPQRSTUVWXYZ", ... @@ -198,10 +198,10 @@ %! "d5976f79d83d3a0dc9806c3c66f3efd8"); ## MD4 test suite (RFC 1320) -%!assert (hash ("md4", ""), "31d6cfe0d16ae931b73c59d7e0c089c0"); -%!assert (hash ("md4", "a"), "bde52cb31de33e46245e05fbdbd6fb24"); -%!assert (hash ("md4", "abc"), "a448017aaf21d8525fc10ae87aa6729d"); -%!assert (hash ("md4", "message digest"), "d9130a8164549fe818874806e1c7014b"); +%!assert (hash ("md4", ""), "31d6cfe0d16ae931b73c59d7e0c089c0") +%!assert (hash ("md4", "a"), "bde52cb31de33e46245e05fbdbd6fb24") +%!assert (hash ("md4", "abc"), "a448017aaf21d8525fc10ae87aa6729d") +%!assert (hash ("md4", "message digest"), "d9130a8164549fe818874806e1c7014b") %!assert (hash ("md4", "abcdefghijklmnopqrstuvwxyz"), %! "d79e1c308aa5bbcdeea8ed63df412da9"); %!assert (hash ("md4", ["ABCDEFGHIJKLMNOPQRSTUVWXYZ", ... @@ -212,10 +212,10 @@ %! "e33b4ddc9c38f2199c3e7b164fcc0536"); ## MD5 test suite (RFC 1321) -%!assert (hash ("md5", ""), "d41d8cd98f00b204e9800998ecf8427e"); -%!assert (hash ("md5", "a"), "0cc175b9c0f1b6a831c399e269772661"); -%!assert (hash ("md5", "abc"), "900150983cd24fb0d6963f7d28e17f72"); -%!assert (hash ("md5", "message digest"), "f96b697d7cb7938d525a2f31aaf161d0"); +%!assert (hash ("md5", ""), "d41d8cd98f00b204e9800998ecf8427e") +%!assert (hash ("md5", "a"), "0cc175b9c0f1b6a831c399e269772661") +%!assert (hash ("md5", "abc"), "900150983cd24fb0d6963f7d28e17f72") +%!assert (hash ("md5", "message digest"), "f96b697d7cb7938d525a2f31aaf161d0") %!assert (hash ("md5", "abcdefghijklmnopqrstuvwxyz"), %! "c3fcd3d76192e4007dfb496cca67e13b"); %!assert (hash ("md5", ["ABCDEFGHIJKLMNOPQRSTUVWXYZ", ... @@ -226,9 +226,9 @@ %! "57edf4a22be3c955ac49da2e2107b67a"); ## SHA1 test suite (RFC 3174) and more -%!assert (hash ("sha1", ""), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); -%!assert (hash ("sha1", "a"), "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8"); -%!assert (hash ("sha1", "abc"), "a9993e364706816aba3e25717850c26c9cd0d89d"); +%!assert (hash ("sha1", ""), "da39a3ee5e6b4b0d3255bfef95601890afd80709") +%!assert (hash ("sha1", "a"), "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8") +%!assert (hash ("sha1", "abc"), "a9993e364706816aba3e25717850c26c9cd0d89d") %!assert (hash ("sha1", ["abcdbcdecdefdefgefghfghighijhi", ... %! "jkijkljklmklmnlmnomnopnopq"]), %! "84983e441c3bd26ebaae4aa1f95129e5e54670f1"); @@ -261,10 +261,10 @@ %! "417a81a538327af927da3e"]); ## Test special character behavior (bug #31689) -%!assert (hash ("md2", "abc\0"), "5a636d615002a7874ac1c9e9a43361f7"); -%!assert (hash ("md4", "abc\0"), "0ee5201897ecb206c4eaba1d2da5224d"); -%!assert (hash ("md5", "abc\0"), "147a664a2ca9410911e61986d3f0d52a"); -%!assert (hash ("sha1", "abc\0"), "686483805ac47ca14e03514f7481a7973b401762"); +%!assert (hash ("md2", "abc\0"), "5a636d615002a7874ac1c9e9a43361f7") +%!assert (hash ("md4", "abc\0"), "0ee5201897ecb206c4eaba1d2da5224d") +%!assert (hash ("md5", "abc\0"), "147a664a2ca9410911e61986d3f0d52a") +%!assert (hash ("sha1", "abc\0"), "686483805ac47ca14e03514f7481a7973b401762") %!assert (hash ("sha224", "abc\0"), %! "fbc8e47920e108bb1d0b631d18b36ae9b1549d28362aa15ebe960cfb"); %!assert (hash ("sha256", "abc\0"),
--- a/libinterp/corefcn/lu.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/lu.cc Sun Feb 21 08:10:36 2016 -0800 @@ -485,7 +485,7 @@ } /* -%!assert(lu ([1, 2; 3, 4]), [3, 4; 1/3, 2/3], eps); +%!assert(lu ([1, 2; 3, 4]), [3, 4; 1/3, 2/3], eps) %!test %! [l, u] = lu ([1, 2; 3, 4]);
--- a/libinterp/corefcn/nproc.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/nproc.cc Sun Feb 21 08:10:36 2016 -0800 @@ -76,9 +76,9 @@ /* ## Must always report at least 1 cpu available -%!assert (nproc () >= 1); -%!assert (nproc ("all") >= 1); -%!assert (nproc ("current") >= 1); +%!assert (nproc () >= 1) +%!assert (nproc ("all") >= 1) +%!assert (nproc ("current") >= 1) %!test %! c = nproc ("current");
--- a/libinterp/corefcn/rcond.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/rcond.cc Sun Feb 21 08:10:36 2016 -0800 @@ -97,9 +97,9 @@ %!shared x, sx %! x = [-5.25, -2.25; -2.25, 1] * eps () + ones (2) / 2; %! sx = [-5.25, -2.25; -2.25, 1] * eps ("single") + ones (2) / 2; -%!assert (rcond (x) < eps ()); -%!assert (rcond (sx) < eps ('single')); -%!assert (rcond (x*i) < eps ()); -%!assert (rcond (sx*i) < eps ('single')); +%!assert (rcond (x) < eps ()) +%!assert (rcond (sx) < eps ('single')) +%!assert (rcond (x*i) < eps ()) +%!assert (rcond (sx*i) < eps ('single')) */
--- a/libinterp/corefcn/regexp.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/regexp.cc Sun Feb 21 08:10:36 2016 -0800 @@ -1121,8 +1121,8 @@ %! assert (a, {"oo"}); %! assert (b, {"f", " bar"}); -%!assert (regexp ("\n", '\n'), 1); -%!assert (regexp ("\n", "\n"), 1); +%!assert (regexp ("\n", '\n'), 1) +%!assert (regexp ("\n", "\n"), 1) %!test # Bug #45407, escape sequences are silently converted %! assert (regexprep ('s', 's', 'x\.y'), 'x.y'); @@ -1283,8 +1283,8 @@ %!assert (regexpi ({'asdfg-dfd';'-dfd-dfd-';'qasfdfdaq'}, {'-';'f';'q'}), {6;[3,7];[1,9]}) %!assert (regexpi ('Strings', {'t', 's'}), {2, [1, 7]}) -%!assert (regexpi ("\n", '\n'), 1); -%!assert (regexpi ("\n", "\n"), 1); +%!assert (regexpi ("\n", '\n'), 1) +%!assert (regexpi ("\n", "\n"), 1) */ static octave_value @@ -1484,10 +1484,10 @@ %!assert (regexprep ("a[b]c{d}e-f=g", "[^A-Z0-9_]", "_", "once", "ignorecase"), "a_b]c{d}e-f=g") ## End conditions on replacement -%!assert (regexprep ("abc", "(b)", ".$1"), "a.bc"); -%!assert (regexprep ("abc", "(b)", "$1"), "abc"); -%!assert (regexprep ("abc", "(b)", "$1."), "ab.c"); -%!assert (regexprep ("abc", "(b)", "$1.."), "ab..c"); +%!assert (regexprep ("abc", "(b)", ".$1"), "a.bc") +%!assert (regexprep ("abc", "(b)", "$1"), "abc") +%!assert (regexprep ("abc", "(b)", "$1."), "ab.c") +%!assert (regexprep ("abc", "(b)", "$1.."), "ab..c") ## Test cell array arguments %!assert (regexprep ("abc", {"b","a"}, "?"), "??c") @@ -1497,6 +1497,6 @@ # Nasty lookbehind expression %!assert (regexprep ('x^(-1)+y(-1)+z(-1)=0', '(?<=[a-z]+)\(\-[1-9]*\)', '_minus1'),'x^(-1)+y_minus1+z_minus1=0') -%!assert (regexprep ("\n", '\n', "X"), "X"); -%!assert (regexprep ("\n", "\n", "X"), "X"); +%!assert (regexprep ("\n", '\n', "X"), "X") +%!assert (regexprep ("\n", "\n", "X"), "X") */
--- a/libinterp/corefcn/sparse-xpow.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/sparse-xpow.cc Sun Feb 21 08:10:36 2016 -0800 @@ -241,8 +241,8 @@ } /* -%!assert (sparse (2) .^ [3, 4], sparse ([8, 16])); -%!assert (sparse (2i) .^ [3, 4], sparse ([-0-8i, 16])); +%!assert (sparse (2) .^ [3, 4], sparse ([8, 16])) +%!assert (sparse (2i) .^ [3, 4], sparse ([-0-8i, 16])) */ // -*- 1 -*-
--- a/libinterp/corefcn/strfns.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/strfns.cc Sun Feb 21 08:10:36 2016 -0800 @@ -145,8 +145,8 @@ } /* -%!assert (char (), ''); -%!assert (char (100), "d"); +%!assert (char (), '') +%!assert (char (100), "d") %!assert (char (100,100), ["d";"d"]) %!assert (char ({100,100}), ["d";"d"]) %!assert (char ([100,100]), ["dd"]) @@ -264,8 +264,8 @@ } /* -%!assert (strvcat (""), ""); -%!assert (strvcat (100) == "d"); +%!assert (strvcat (""), "") +%!assert (strvcat (100) == "d") %!assert (strvcat (100,100), ["d";"d"]) %!assert (strvcat ({100,100}), ["d";"d"]) %!assert (strvcat ([100,100]), ["dd"])
--- a/libinterp/corefcn/symtab.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/symtab.cc Sun Feb 21 08:10:36 2016 -0800 @@ -1914,7 +1914,7 @@ If the first assert fails, this is no longer the case and the tests need to be updated to use some other function. -%!assert (! strcmp (which ("bar"), "")); +%!assert (! strcmp (which ("bar"), "")) %!function x = bar () %! x = 5;
--- a/libinterp/corefcn/time.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/time.cc Sun Feb 21 08:10:36 2016 -0800 @@ -453,11 +453,11 @@ } /* -%!assert (ischar (strftime ("%%%n%t%H%I%k%l", localtime (time ())))); -%!assert (ischar (strftime ("%M%p%r%R%s%S%T", localtime (time ())))); -%!assert (ischar (strftime ("%X%Z%z%a%A%b%B", localtime (time ())))); -%!assert (ischar (strftime ("%c%C%d%e%D%h%j", localtime (time ())))); -%!assert (ischar (strftime ("%m%U%w%W%x%y%Y", localtime (time ())))); +%!assert (ischar (strftime ("%%%n%t%H%I%k%l", localtime (time ())))) +%!assert (ischar (strftime ("%M%p%r%R%s%S%T", localtime (time ())))) +%!assert (ischar (strftime ("%X%Z%z%a%A%b%B", localtime (time ())))) +%!assert (ischar (strftime ("%c%C%d%e%D%h%j", localtime (time ())))) +%!assert (ischar (strftime ("%m%U%w%W%x%y%Y", localtime (time ())))) %!error strftime () %!error strftime ("foo", 1)
--- a/libinterp/corefcn/variables.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/corefcn/variables.cc Sun Feb 21 08:10:36 2016 -0800 @@ -629,10 +629,10 @@ %!assert (exist ("print_usage", "dir"), 0) ## Don't search path for rooted relative filenames -%!assert (exist ("plot.m", "file"), 2); -%!assert (exist ("./plot.m", "file"), 0); -%!assert (exist ("./%nonexistentfile%", "file"), 0); -%!assert (exist ("%nonexistentfile%", "file"), 0); +%!assert (exist ("plot.m", "file"), 2) +%!assert (exist ("./plot.m", "file"), 0) +%!assert (exist ("./%nonexistentfile%", "file"), 0) +%!assert (exist ("%nonexistentfile%", "file"), 0) ## Don't search path for absolute filenames %!test
--- a/libinterp/octave-value/ov-class.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/octave-value/ov-class.cc Sun Feb 21 08:10:36 2016 -0800 @@ -1749,9 +1749,9 @@ } /* -%!assert (class (1.1), "double"); -%!assert (class (single (1.1)), "single"); -%!assert (class (uint8 (1)), "uint8"); +%!assert (class (1.1), "double") +%!assert (class (single (1.1)), "single") +%!assert (class (uint8 (1)), "uint8") %!testif HAVE_JAVA %! jobj = javaObject ("java.lang.StringBuffer"); %! assert (class (jobj), "java.lang.StringBuffer");
--- a/libinterp/octave-value/ov-cx-diag.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/octave-value/ov-cx-diag.cc Sun Feb 21 08:10:36 2016 -0800 @@ -240,6 +240,6 @@ /* %% bug #36368 -%!assert (diag ([1+i, 1-i])^2 , diag ([2i, -2i]), 4*eps); +%!assert (diag ([1+i, 1-i])^2 , diag ([2i, -2i]), 4*eps) */
--- a/libinterp/octave-value/ov-struct.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/octave-value/ov-struct.cc Sun Feb 21 08:10:36 2016 -0800 @@ -2014,9 +2014,9 @@ %! assert (struct2cell (s), vals'); %! assert (fieldnames (s), keys'); -%!assert (cell2struct ({1; 2}, {"a"; "b"}), struct ("a", 1, "b", 2)); - -%!assert (cell2struct ({}, {"f"}, 3), struct ("f", {})); +%!assert (cell2struct ({1; 2}, {"a"; "b"}), struct ("a", 1, "b", 2)) + +%!assert (cell2struct ({}, {"f"}, 3), struct ("f", {})) */ // FIXME: we should be including builtin-defun-decls.h but doing that
--- a/libinterp/octave-value/ov.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/octave-value/ov.cc Sun Feb 21 08:10:36 2016 -0800 @@ -3034,8 +3034,8 @@ %! [~, ~, p] = lu ([1,2;3,4]); %!endfunction -%!assert (typeinfo (__test_dpm__ (false)), "permutation matrix"); -%!assert (typeinfo (__test_dpm__ (true)), "matrix"); +%!assert (typeinfo (__test_dpm__ (false)), "permutation matrix") +%!assert (typeinfo (__test_dpm__ (true)), "matrix") */ DEFUN (disable_diagonal_matrix, args, nargout, @@ -3069,17 +3069,17 @@ %!shared x, xi, fx, fxi %! [x, xi, fx, fxi] = __test_ddm__ (false); -%!assert (typeinfo (x), "diagonal matrix"); -%!assert (typeinfo (xi), "complex diagonal matrix"); -%!assert (typeinfo (fx), "float diagonal matrix"); -%!assert (typeinfo (fxi), "float complex diagonal matrix"); +%!assert (typeinfo (x), "diagonal matrix") +%!assert (typeinfo (xi), "complex diagonal matrix") +%!assert (typeinfo (fx), "float diagonal matrix") +%!assert (typeinfo (fxi), "float complex diagonal matrix") %!shared x, xi, fx, fxi %! [x, xi, fx, fxi] = __test_ddm__ (true); -%!assert (typeinfo (x), "matrix"); -%!assert (typeinfo (xi), "complex matrix"); -%!assert (typeinfo (fx), "float matrix"); -%!assert (typeinfo (fxi), "float complex matrix"); +%!assert (typeinfo (x), "matrix") +%!assert (typeinfo (xi), "complex matrix") +%!assert (typeinfo (fx), "float matrix") +%!assert (typeinfo (fxi), "float complex matrix") */ DEFUN (disable_range, args, nargout, @@ -3111,7 +3111,7 @@ %! r = base:limit; %!endfunction -%!assert (typeinfo (__test_dr__ (false)), "range"); -%!assert (typeinfo (__test_dr__ (true)), "matrix"); +%!assert (typeinfo (__test_dr__ (false)), "range") +%!assert (typeinfo (__test_dr__ (true)), "matrix") */
--- a/libinterp/parse-tree/oct-parse.in.yy Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/parse-tree/oct-parse.in.yy Sun Feb 21 08:10:36 2016 -0800 @@ -5052,7 +5052,7 @@ %!assert (eval ("x"), 1) %!assert (eval ("x;")) -%!assert (eval ("x;"), 1); +%!assert (eval ("x;"), 1) %!test %! y = eval ("x");
--- a/libinterp/parse-tree/pt-mat.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/libinterp/parse-tree/pt-mat.cc Sun Feb 21 08:10:36 2016 -0800 @@ -1123,8 +1123,8 @@ /* ## test concatenation with all zero matrices -%!assert ([ "" 65*ones(1,10) ], "AAAAAAAAAA"); -%!assert ([ 65*ones(1,10) "" ], "AAAAAAAAAA"); +%!assert ([ "" 65*ones(1,10) ], "AAAAAAAAAA") +%!assert ([ 65*ones(1,10) "" ], "AAAAAAAAAA") %!test %! c = {"foo"; "bar"; "bazoloa"};
--- a/liboctave/array/CMatrix.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/liboctave/array/CMatrix.cc Sun Feb 21 08:10:36 2016 -0800 @@ -3550,7 +3550,7 @@ %!assert ([1+i 2+i 3+i] * [ 4+i ; 5+i ; 6+i], 29+21i, 1e-14) %!assert ([1+i 2+i ; 3+i 4+i ] * [5+i ; 6+i], [15 + 14i ; 37 + 18i], 1e-14) %!assert ([1+i 2+i ; 3+i 4+i ] * [5+i 6+i ; 7+i 8+i], [17 + 15i 20 + 17i; 41 + 19i 48 + 21i], 1e-14) -%!assert ([1 i]*[i 0]', -i); +%!assert ([1 i]*[i 0]', -i) ## Test some simple identities %!shared M, cv, rv
--- a/liboctave/util/oct-inttypes.cc Sun Feb 21 07:43:16 2016 -0800 +++ b/liboctave/util/oct-inttypes.cc Sun Feb 21 08:10:36 2016 -0800 @@ -792,23 +792,23 @@ %!assert ((int64 (2**62)+1)**1, int64 (2**62)+1) %!assert ((int64 (2**30)+1)**2, int64 (2**60+2**31) + 1) -%!assert (uint8 (char (128)), uint8 (128)); -%!assert (uint8 (char (255)), uint8 (255)); -%!assert (int8 (char (128)), int8 (128)); -%!assert (int8 (char (255)), int8 (255)); +%!assert (uint8 (char (128)), uint8 (128)) +%!assert (uint8 (char (255)), uint8 (255)) +%!assert (int8 (char (128)), int8 (128)) +%!assert (int8 (char (255)), int8 (255)) -%!assert (uint16 (char (128)), uint16 (128)); -%!assert (uint16 (char (255)), uint16 (255)); -%!assert (int16 (char (128)), int16 (128)); -%!assert (int16 (char (255)), int16 (255)); +%!assert (uint16 (char (128)), uint16 (128)) +%!assert (uint16 (char (255)), uint16 (255)) +%!assert (int16 (char (128)), int16 (128)) +%!assert (int16 (char (255)), int16 (255)) -%!assert (uint32 (char (128)), uint32 (128)); -%!assert (uint32 (char (255)), uint32 (255)); -%!assert (int32 (char (128)), int32 (128)); -%!assert (int32 (char (255)), int32 (255)); +%!assert (uint32 (char (128)), uint32 (128)) +%!assert (uint32 (char (255)), uint32 (255)) +%!assert (int32 (char (128)), int32 (128)) +%!assert (int32 (char (255)), int32 (255)) -%!assert (uint64 (char (128)), uint64 (128)); -%!assert (uint64 (char (255)), uint64 (255)); -%!assert (int64 (char (128)), int64 (128)); -%!assert (int64 (char (255)), int64 (255)); +%!assert (uint64 (char (128)), uint64 (128)) +%!assert (uint64 (char (255)), uint64 (255)) +%!assert (int64 (char (128)), int64 (128)) +%!assert (int64 (char (255)), int64 (255)) */
--- a/scripts/deprecated/md5sum.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/deprecated/md5sum.m Sun Feb 21 08:10:36 2016 -0800 @@ -61,7 +61,7 @@ endfunction -%!assert (md5sum ("abc\0", true), "147a664a2ca9410911e61986d3f0d52a"); +%!assert (md5sum ("abc\0", true), "147a664a2ca9410911e61986d3f0d52a") %!test %! tfile = tempname ();
--- a/scripts/general/blkdiag.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/general/blkdiag.m Sun Feb 21 08:10:36 2016 -0800 @@ -72,7 +72,7 @@ ## tests involving empty matrices %!assert (blkdiag ([],[],[]), []) %!assert (blkdiag ([],[1,2;3,4],[],5,[]), [1,2,0;3,4,0;0,0,5]) -%!assert (blkdiag (zeros (1,0,1),[1,2,3],1,0,5,zeros (0,1,1)), [0,0,0,0,0,0,0;1,2,3,0,0,0,0;0,0,0,1,0,0,0;0,0,0,0,0,0,0;0,0,0,0,0,5,0]); +%!assert (blkdiag (zeros (1,0,1),[1,2,3],1,0,5,zeros (0,1,1)), [0,0,0,0,0,0,0;1,2,3,0,0,0,0;0,0,0,1,0,0,0;0,0,0,0,0,0,0;0,0,0,0,0,5,0]) ## tests involving sparse matrices %!assert (blkdiag (sparse ([1,2;3,4]),[5,6;7,8]), sparse ([1,2,0,0;3,4,0,0;0,0,5,6;0,0,7,8])) %!assert (blkdiag (sparse ([1,2;3,4]),[5,6]), sparse ([1,2,0,0;3,4,0,0;0,0,5,6]))
--- a/scripts/general/cell2mat.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/general/cell2mat.m Sun Feb 21 08:10:36 2016 -0800 @@ -93,8 +93,8 @@ %! C = {[1], [2 3 4]; [5; 9], [6 7 8; 10 11 12]}; %! cell2mat (C) -%!assert (cell2mat ({}), []); -%!assert (cell2mat ([]), []); +%!assert (cell2mat ({}), []) +%!assert (cell2mat ([]), []) %!test %! C = {[1], [2 3 4]; [5; 9], [6 7 8; 10 11 12]}; %! D = C; D(:,:,2) = C;
--- a/scripts/general/interp1.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/general/interp1.m Sun Feb 21 08:10:36 2016 -0800 @@ -634,8 +634,8 @@ %! interp1 (fliplr (xp),fliplr (yp),xi,style),100*eps) %!assert (ppval (interp1 (xp,yp,style,"pp"),xi), %! interp1 (xp,yp,xi,style,"extrap"),10*eps) -%!assert (interp1 ([1 2 2 3], [1 2 3 4], 2), 3); -%!assert (interp1 ([3 2 2 1], [4 3 2 1], 2), 2); +%!assert (interp1 ([1 2 2 3], [1 2 3 4], 2), 3) +%!assert (interp1 ([3 2 2 1], [4 3 2 1], 2), 2) %!error interp1 (1,1,1, style) ## ENDBLOCK
--- a/scripts/general/interp2.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/general/interp2.m Sun Feb 21 08:10:36 2016 -0800 @@ -540,8 +540,8 @@ %! assert (interp2 (X, 2.5, 2.5, "nearest"), 3); ## re-order monotonically decreasing (bug #41838). -%!assert (interp2 ([1 2 3], [3 2 1], magic (3), 2.5, 3), 3.5); -%!assert (interp2 ([3 2 1], [1 2 3], magic (3), 1.5, 1), 3.5); +%!assert (interp2 ([1 2 3], [3 2 1], magic (3), 2.5, 3), 3.5) +%!assert (interp2 ([3 2 1], [1 2 3], magic (3), 1.5, 1), 3.5) %!shared z, zout, tol %! z = [1 3 5; 3 5 7; 5 7 9];
--- a/scripts/general/interpft.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/general/interpft.m Sun Feb 21 08:10:36 2016 -0800 @@ -118,9 +118,9 @@ %!shared n,y %! x = [0:10]'; y = sin(x); n = length (x); -%!assert (interpft (y, n), y, 20*eps); -%!assert (interpft (y', n), y', 20*eps); -%!assert (interpft ([y,y],n), [y,y], 20*eps); +%!assert (interpft (y, n), y, 20*eps) +%!assert (interpft (y', n), y', 20*eps) +%!assert (interpft ([y,y],n), [y,y], 20*eps) ## Test case with complex input from bug #39566 %!test @@ -129,10 +129,10 @@ %! assert (interpft (x, 6), y, 10*eps); ## Test for correct spectral symmetry with even/odd lengths -%!assert (max (abs (imag (interpft ([1:8], 20)))), 0, 20*eps); -%!assert (max (abs (imag (interpft ([1:8], 21)))), 0, 21*eps); -%!assert (max (abs (imag (interpft ([1:9], 20)))), 0, 20*eps); -%!assert (max (abs (imag (interpft ([1:9], 21)))), 0, 21*eps); +%!assert (max (abs (imag (interpft ([1:8], 20)))), 0, 20*eps) +%!assert (max (abs (imag (interpft ([1:8], 21)))), 0, 21*eps) +%!assert (max (abs (imag (interpft ([1:9], 20)))), 0, 20*eps) +%!assert (max (abs (imag (interpft ([1:9], 21)))), 0, 21*eps) ## Test input validation %!error interpft ()
--- a/scripts/general/num2str.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/general/num2str.m Sun Feb 21 08:10:36 2016 -0800 @@ -195,7 +195,7 @@ %!assert (num2str (123.456, 4), "123.5") %!assert (num2str ([1, 1.34; 3, 3.56], "%5.1f"), ["1.0 1.3"; "3.0 3.6"]) %!assert (num2str (1.234 + 27.3i), "1.234+27.3i") -%!assert (num2str ([true false true]), "1 0 1"); +%!assert (num2str ([true false true]), "1 0 1") %!assert (num2str (19440606), "19440606") %!assert (num2str (2^33), "8589934592")
--- a/scripts/general/repmat.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/general/repmat.m Sun Feb 21 08:10:36 2016 -0800 @@ -151,8 +151,8 @@ %!assert (repmat (x, [1 3; 1 3], [1; 3]), repmat (x, [1 1 3])) %!assert (repmat (x, [1 1], 4), repmat (x, [1 3; 1 3], [1; 4])) %!assert (repmat (x, [1 1], 4), repmat (x, [1 3; 1 3], [1 2; 3 4])) -%!assert (repmat (x, [1 1], 4), repmat (x, [1 1 4])); -%!assert (repmat (x, [1 1], 4), repmat (x, 1, [1 4])); +%!assert (repmat (x, [1 1], 4), repmat (x, [1 1 4])) +%!assert (repmat (x, [1 1], 4), repmat (x, 1, [1 4])) ## Test various methods of providing size parameters %!shared x
--- a/scripts/image/ntsc2rgb.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/image/ntsc2rgb.m Sun Feb 21 08:10:36 2016 -0800 @@ -104,7 +104,7 @@ %! assert (ntsc2rgb (rgb2ntsc (rgb_img)), rgb_img, 1e-3); ## test cropping of rgb output -%!assert (ntsc2rgb ([1.5 0 0]), [1 1 1]); +%!assert (ntsc2rgb ([1.5 0 0]), [1 1 1]) ## Test scaling of output. After conversion, cut of negative values ## and scaling of all the others relative to the maximum above 1.
--- a/scripts/linear-algebra/expm.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/linear-algebra/expm.m Sun Feb 21 08:10:36 2016 -0800 @@ -143,8 +143,8 @@ endfunction -%!assert (norm (expm ([1 -1;0 1]) - [e -e; 0 e]) < 1e-5); -%!assert (expm ([1 -1 -1;0 1 -1; 0 0 1]), [e -e -e/2; 0 e -e; 0 0 e], 1e-5); +%!assert (norm (expm ([1 -1;0 1]) - [e -e; 0 e]) < 1e-5) +%!assert (expm ([1 -1 -1;0 1 -1; 0 0 1]), [e -e -e/2; 0 e -e; 0 0 e], 1e-5) %!assert (expm (10), expm (10)) %!assert (full (expm (eye (3))), expm (full (eye (3))))
--- a/scripts/miscellaneous/inputname.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/miscellaneous/inputname.m Sun Feb 21 08:10:36 2016 -0800 @@ -80,8 +80,8 @@ %!function r = __foo__ (x, y) %! r = inputname (2); %!endfunction -%!assert (__foo__ (pi, e), "e"); -%!assert (feval (@__foo__, pi, e), "e"); +%!assert (__foo__ (pi, e), "e") +%!assert (feval (@__foo__, pi, e), "e") %!error inputname () %!error inputname (1,2)
--- a/scripts/polynomial/polyvalm.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/polynomial/polyvalm.m Sun Feb 21 08:10:36 2016 -0800 @@ -61,7 +61,7 @@ endfunction -%!assert (! any (polyvalm ([], [1, 2; 3, 4]))(:)); +%!assert (! any (polyvalm ([], [1, 2; 3, 4]))(:)) %!assert (polyvalm ([1, 2, 3, 4], [3, -4, 1; -2, 0, 2; -1, 4, -3]), [117, -124, 11; -70, 36, 38; -43, 92, -45]) %!error <must be a square matrix> polyvalm ([1, 1, 1], [1, 2; 3, 4; 5, 6])
--- a/scripts/signal/blackman.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/signal/blackman.m Sun Feb 21 08:10:36 2016 -0800 @@ -78,8 +78,8 @@ %! assert (A(ceil (N/2)), 1, 1e-6); %! assert ([A(1), A(length (A))], zeros (1,2), 1e-6); -%!assert (blackman (15), blackman (15, "symmetric")); -%!assert (blackman (16)(1:15), blackman (15, "periodic")); +%!assert (blackman (15), blackman (15, "symmetric")) +%!assert (blackman (16)(1:15), blackman (15, "periodic")) %!test %! N = 16; %! A = blackman (N, "periodic");
--- a/scripts/signal/hamming.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/signal/hamming.m Sun Feb 21 08:10:36 2016 -0800 @@ -76,8 +76,8 @@ %! A = hamming (N); %! assert (A(ceil (N/2)), 1); -%!assert (hamming (15), hamming (15, "symmetric")); -%!assert (hamming (16)(1:15), hamming (15, "periodic")); +%!assert (hamming (15), hamming (15, "symmetric")) +%!assert (hamming (16)(1:15), hamming (15, "periodic")) %!test %! N = 16; %! A = hamming (N, "periodic");
--- a/scripts/signal/hanning.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/signal/hanning.m Sun Feb 21 08:10:36 2016 -0800 @@ -67,17 +67,17 @@ endfunction -%!assert (hanning (1), 1); -%!assert (hanning (2), zeros (2,1)); -%!assert (hanning (15), flip (hanning (15)), 5*eps); -%!assert (hanning (16), flip (hanning (16)), 5*eps); +%!assert (hanning (1), 1) +%!assert (hanning (2), zeros (2,1)) +%!assert (hanning (15), flip (hanning (15)), 5*eps) +%!assert (hanning (16), flip (hanning (16)), 5*eps) %!test %! N = 15; %! A = hanning (N); %! assert (A(ceil (N/2)), 1); -%!assert (hanning (15), hanning (15, "symmetric")); -%!assert (hanning (16)(1:15), hanning (15, "periodic")); +%!assert (hanning (15), hanning (15, "symmetric")) +%!assert (hanning (16)(1:15), hanning (15, "periodic")) %!test %! N = 16; %! A = hanning (N, "periodic");
--- a/scripts/sparse/eigs.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/sparse/eigs.m Sun Feb 21 08:10:36 2016 -0800 @@ -1137,6 +1137,6 @@ %! tmp = abs (Z - ZZ); %! assert (max (tmp(:)) < 5e-11); -%!assert (eigs (diag (1:5), 5, "sa"), [1;2;3;4;5]); -%!assert (eigs (diag (1:5), 5, "la"), [5;4;3;2;1]); -%!assert (eigs (diag (1:5), 3, "be"), [1;4;5]); +%!assert (eigs (diag (1:5), 5, "sa"), [1;2;3;4;5]) +%!assert (eigs (diag (1:5), 5, "la"), [5;4;3;2;1]) +%!assert (eigs (diag (1:5), 3, "be"), [1;4;5])
--- a/scripts/statistics/base/median.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/statistics/base/median.m Sun Feb 21 08:10:36 2016 -0800 @@ -110,8 +110,8 @@ %! b = rand (3,4,6,5); %! x = sort (a, 4); %! y = sort (b, 3); -%!assert (median (a, 4), x(:, :, :, 3)); -%!assert (median (b, 3), (y(:, :, 3, :) + y(:, :, 4, :))/2); +%!assert (median (a, 4), x(:, :, :, 3)) +%!assert (median (b, 3), (y(:, :, 3, :) + y(:, :, 4, :))/2) ## Test input validation %!error median ()
--- a/scripts/statistics/distributions/binopdf.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/statistics/distributions/binopdf.m Sun Feb 21 08:10:36 2016 -0800 @@ -89,9 +89,9 @@ %!assert (binopdf ([x, NaN], 2, 0.5), [y, NaN], tol) ## Test Special input values -%!assert (binopdf (0, 3, 0), 1); -%!assert (binopdf (2, 2, 1), 1); -%!assert (binopdf (1, 2, 1), 0); +%!assert (binopdf (0, 3, 0), 1) +%!assert (binopdf (2, 2, 1), 1) +%!assert (binopdf (1, 2, 1), 0) ## Test class of input preserved %!assert (binopdf (single ([x, NaN]), 2, 0.5), single ([y, NaN]))
--- a/scripts/strings/strsplit.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/strings/strsplit.m Sun Feb 21 08:10:36 2016 -0800 @@ -263,7 +263,7 @@ %!assert (strsplit (["a,bc,,de"], ",", false, "delimitertype", "r"), {"a", "bc", "", "de"}) %!assert (strsplit (["a,bc,de"], ",", true, "delimitertype", "r"), {"a", "bc", "de"}) %!assert (strsplit (["a,bc,de"], "[, ]", true, "delimitertype", "r"), {"a", "bc", "de"}) -%!assert (strsplit ("hello \t world", true, "delimitertype", "r"), {"hello", "world"}); +%!assert (strsplit ("hello \t world", true, "delimitertype", "r"), {"hello", "world"}) %!assert (strsplit ("foo\tbar", '\t', "delimitertype", "r"), {"foo", "bar"}) %!assert (strsplit ("foo\tbar", '\t', "delimitertype", "s"), {"foo", "bar"})
--- a/scripts/strings/strtok.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/strings/strtok.m Sun Feb 21 08:10:36 2016 -0800 @@ -211,7 +211,7 @@ ## Test 'bad' string orientations %!assert (strtok (" this ".'), "this".'); # delimiter at start and end -%!assert (strtok (" this ".',"jkl "), "this".'); +%!assert (strtok (" this ".',"jkl "), "this".') ## Test with TAB, LF, VT, FF, and CR %!test
--- a/scripts/testfun/assert.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/testfun/assert.m Sun Feb 21 08:10:36 2016 -0800 @@ -447,8 +447,8 @@ %!error <Abs err 4.4409e-0?16 exceeds tol> assert (3, 3+2*eps, eps) ## vectors -%!assert ([1,2,3],[1,2,3]); -%!assert ([1;2;3],[1;2;3]); +%!assert ([1,2,3],[1,2,3]) +%!assert ([1;2;3],[1;2;3]) %!error <Abs err 1 exceeds tol 0> assert ([2,2,3,3],[1,2,3,4]); %!error <Abs err 1 exceeds tol 0.5> assert ([2,2,3,3],[1,2,3,4],0.5); %!error <Rel err 1 exceeds tol 0.1> assert ([2,2,3,5],[1,2,3,4],-0.1); @@ -460,7 +460,7 @@ %!error <Dimensions don't match> assert ([1;2;3],[1;2]); ## matrices -%!assert ([1,2;3,4],[1,2;3,4]); +%!assert ([1,2;3,4],[1,2;3,4]) %!error <\(1,2\)\s+4\s+2> assert ([1,4;3,4],[1,2;3,4]) %!error <Dimensions don't match> assert ([1,3;2,4;3,5],[1,2;3,4]) %!test # 2-D matrix
--- a/scripts/testfun/example.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/testfun/example.m Sun Feb 21 08:10:36 2016 -0800 @@ -103,7 +103,7 @@ %! x = sin (t); %! plot (t,x) -%!assert (example ("example", 1), "\n example (\"example\");"); +%!assert (example ("example", 1), "\n example (\"example\");") %!test %! [code, idx] = example ("example");
--- a/scripts/time/datevec.m Sun Feb 21 07:43:16 2016 -0800 +++ b/scripts/time/datevec.m Sun Feb 21 08:10:36 2016 -0800 @@ -367,7 +367,7 @@ %! assert (d, [1 2; 3 4]); ## Other tests -%!assert (datenum (datevec ([-1e4:1e4])), [-1e4:1e4]'); +%!assert (datenum (datevec ([-1e4:1e4])), [-1e4:1e4]') %!test %! t = linspace (-2e5, 2e5, 10993); %! assert (all (abs (datenum (datevec (t)) - t') < 1e-5));
--- a/test/bug-38565.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/bug-38565.tst Sun Feb 21 08:10:36 2016 -0800 @@ -6,4 +6,4 @@ %! endif %!endfunction -%!assert (eval ("f 10;"), "10"); +%!assert (eval ("f 10;"), "10")
--- a/test/build-sparse-tests.sh Sun Feb 21 07:43:16 2016 -0800 +++ b/test/build-sparse-tests.sh Sun Feb 21 08:10:36 2016 -0800 @@ -571,10 +571,10 @@ %!assert (issparse (as')) %!assert (issparse (-as)) %!assert (!as, sparse (!af)) -%!assert (as.', sparse (af.')); -%!assert (as', sparse (af')); -%!assert (-as, sparse (-af)); -%!assert (!as, sparse (!af)); +%!assert (as.', sparse (af.')) +%!assert (as', sparse (af')) +%!assert (-as, sparse (-af)) +%!assert (!as, sparse (!af)) %!error [i,j] = size (af);as(i-1,j+1); %!error [i,j] = size (af);as(i+1,j-1); %!test @@ -595,28 +595,28 @@ %! [i,j,v,m,n] = find (as); %! x = sparse (i,j,v,m,n); %! assert (x, as); -%!assert (issparse (horzcat (as,as))); -%!assert (issparse (vertcat (as,as))); -%!assert (issparse (cat (1,as,as))); -%!assert (issparse (cat (2,as,as))); -%!assert (issparse ([as,as])); -%!assert (issparse ([as;as])); -%!assert (horzcat (as,as), sparse ([af,af])); -%!assert (vertcat (as,as), sparse ([af;af])); -%!assert (horzcat (as,as,as), sparse ([af,af,af])); -%!assert (vertcat (as,as,as), sparse ([af;af;af])); -%!assert ([as,as], sparse ([af,af])); -%!assert ([as;as], sparse ([af;af])); -%!assert ([as,as,as], sparse ([af,af,af])); -%!assert ([as;as;as], sparse ([af;af;af])); -%!assert (cat (2,as,as), sparse ([af,af])); -%!assert (cat (1,as,as), sparse ([af;af])); -%!assert (cat (2,as,as,as), sparse ([af,af,af])); -%!assert (cat (1,as,as,as), sparse ([af;af;af])); -%!assert (issparse ([as,af])); -%!assert (issparse ([af,as])); -%!assert ([as,af], sparse ([af,af])); -%!assert ([as;af], sparse ([af;af])); +%!assert (issparse (horzcat (as,as))) +%!assert (issparse (vertcat (as,as))) +%!assert (issparse (cat (1,as,as))) +%!assert (issparse (cat (2,as,as))) +%!assert (issparse ([as,as])) +%!assert (issparse ([as;as])) +%!assert (horzcat (as,as), sparse ([af,af])) +%!assert (vertcat (as,as), sparse ([af;af])) +%!assert (horzcat (as,as,as), sparse ([af,af,af])) +%!assert (vertcat (as,as,as), sparse ([af;af;af])) +%!assert ([as,as], sparse ([af,af])) +%!assert ([as;as], sparse ([af;af])) +%!assert ([as,as,as], sparse ([af,af,af])) +%!assert ([as;as;as], sparse ([af;af;af])) +%!assert (cat (2,as,as), sparse ([af,af])) +%!assert (cat (1,as,as), sparse ([af;af])) +%!assert (cat (2,as,as,as), sparse ([af,af,af])) +%!assert (cat (1,as,as,as), sparse ([af;af;af])) +%!assert (issparse ([as,af])) +%!assert (issparse ([af,as])) +%!assert ([as,af], sparse ([af,af])) +%!assert ([as;af], sparse ([af;af])) EOF } @@ -682,9 +682,9 @@ %!testif HAVE_UMFPACK # inverse %! assert (inv (bs)*bs, sparse (eye (rows (bs))), 1e-10); -%!assert (bf\as', bf\af', 100*eps); -%!assert (bs\af', bf\af', 100*eps); -%!assert (bs\as', sparse (bf\af'), 100*eps); +%!assert (bf\as', bf\af', 100*eps) +%!assert (bs\af', bf\af', 100*eps) +%!assert (bs\as', sparse (bf\af'), 100*eps) EOF } @@ -845,8 +845,8 @@ %% Point tests %!test idx = ridx(:) + rows (as) * (cidx (:)-1); %!assert (sparse (as(idx)), sparse (af(idx))) -%!assert (as(idx), sparse (af(idx))); -%!assert (as(idx'), sparse (af(idx'))); +%!assert (as(idx), sparse (af(idx))) +%!assert (as(idx'), sparse (af(idx'))) %!assert (as(flipud (idx(:))), sparse (af(flipud (idx(:))))) %!assert (as([idx,idx]), sparse (af([idx,idx]))) %!assert (as(reshape ([idx;idx], [1,length(idx),2])), sparse(af(reshape ([idx;idx], [1,length(idx),2])))) @@ -981,24 +981,24 @@ %! tcf = tf + tf'; tcs = sparse (tcf); %! xf = diag (1:n) + fliplr (diag (1:n)).*beta; %! xs = sparse (xf); -%!assert (ds\xf, df\xf, 1e-10); -%!assert (ds\xs, sparse (df\xf), 1e-10); -%!assert (pds\xf, pdf\xf, 1e-10); -%!assert (pds\xs, sparse (pdf\xf), 1e-10); -%!assert (ls\xf, lf\xf, 1e-10); -%!assert (sparse (ls\xs), sparse (lf\xf), 1e-10); +%!assert (ds\xf, df\xf, 1e-10) +%!assert (ds\xs, sparse (df\xf), 1e-10) +%!assert (pds\xf, pdf\xf, 1e-10) +%!assert (pds\xs, sparse (pdf\xf), 1e-10) +%!assert (ls\xf, lf\xf, 1e-10) +%!assert (sparse (ls\xs), sparse (lf\xf), 1e-10) %!testif HAVE_UMFPACK %! assert (pls\xf, plf\xf, 1e-10); %!testif HAVE_UMFPACK %! assert (sparse (pls\xs), sparse (plf\xf), 1e-10); -%!assert (us\xf, uf\xf, 1e-10); -%!assert (sparse (us\xs), sparse (uf\xf), 1e-10); +%!assert (us\xf, uf\xf, 1e-10) +%!assert (sparse (us\xs), sparse (uf\xf), 1e-10) %!testif HAVE_UMFPACK %! assert (pus\xf, puf\xf, 1e-10); %!testif HAVE_UMFPACK %! assert (sparse (pus\xs), sparse (puf\xf), 1e-10); -%!assert (bs\xf, bf\xf, 1e-10); -%!assert (sparse (bs\xs), sparse (bf\xf), 1e-10); +%!assert (bs\xf, bf\xf, 1e-10) +%!assert (sparse (bs\xs), sparse (bf\xf), 1e-10) %!testif HAVE_UMFPACK %! assert (cs\xf, cf\xf, 1e-10); %!testif HAVE_UMFPACK @@ -1007,10 +1007,10 @@ %! assert (bcs\xf, bcf\xf, 1e-10); %!testif HAVE_UMFPACK %! assert (sparse (bcs\xs), sparse (bcf\xf), 1e-10); -%!assert (ts\xf, tf\xf, 1e-10); -%!assert (sparse (ts\xs), sparse (tf\xf), 1e-10); -%!assert (tcs\xf, tcf\xf, 1e-10); -%!assert (sparse (tcs\xs), sparse (tcf\xf), 1e-10); +%!assert (ts\xf, tf\xf, 1e-10) +%!assert (sparse (ts\xs), sparse (tf\xf), 1e-10) +%!assert (tcs\xf, tcf\xf, 1e-10) +%!assert (sparse (tcs\xs), sparse (tcf\xf), 1e-10) EOF
--- a/test/classdef/classdef.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/classdef/classdef.tst Sun Feb 21 08:10:36 2016 -0800 @@ -39,13 +39,13 @@ %! p = foo_value_class (4, 4*12, 50e3); %! i = p.rate / (12 * 100); %! amt = (p.principle * i) / (1 - (1 + i)^(-p.term)); -%!assert (isempty (q.rate)); -%!assert (isempty (q.principle)); -%!assert (isempty (q.term)); -%!assert (class (p), "foo_value_class"); -%!assert (p.term, 48); -%!assert (p.rate, 4.0); -%!assert (p.principle, 50e3); +%!assert (isempty (q.rate)) +%!assert (isempty (q.principle)) +%!assert (isempty (q.term)) +%!assert (class (p), "foo_value_class") +%!assert (p.term, 48) +%!assert (p.rate, 4.0) +%!assert (p.principle, 50e3) %!assert (p.amount, amt, eps ()) %!assert (amount (p), amt, eps ()) %!xtest @@ -56,9 +56,9 @@ %!error <property `rate' is not constant> foo_value_class.rate %% Static method and Constant Property -%!assert (foo_static_method_constant_property.radians_per_cycle, 2*pi); -%!assert (foo_static_method_constant_property().radians_per_cycle, 2*pi); -%!assert (foo_static_method_constant_property().pie, pi); +%!assert (foo_static_method_constant_property.radians_per_cycle, 2*pi) +%!assert (foo_static_method_constant_property().radians_per_cycle, 2*pi) +%!assert (foo_static_method_constant_property().pie, pi) %!error <property `frequency' is not constant> foo_static_method_constant_property.frequency %!error <method `cosine' is not static> foo_static_method_constant_property.cosine %!test
--- a/test/classes/classes.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/classes/classes.tst Sun Feb 21 08:10:36 2016 -0800 @@ -324,13 +324,13 @@ %!shared x1, x2, x3 %!test x1 = Blork (); %!test x2 = [x1 x1]; -%!assert (isa (x2, 'Blork') && isequal (size (x2), [1 2])); +%!assert (isa (x2, 'Blork') && isequal (size (x2), [1 2])) %!test x2 = [x1 51]; -%!assert (isa (x2, 'Blork') && isequal (size (x2), [1 2])); +%!assert (isa (x2, 'Blork') && isequal (size (x2), [1 2])) %!test x3 = [x2; x2]; -%!assert (isa (x3, 'Blork') && isequal (size (x3), [2 2])); +%!assert (isa (x3, 'Blork') && isequal (size (x3), [2 2])) %!test x3 = [x2; [51 x1]]; -%!assert (isa (x3, 'Blork') && isequal (size (x3), [2 2])); +%!assert (isa (x3, 'Blork') && isequal (size (x3), [2 2])) %!error <dimension mismatch> x4 = [x1 x3]; %!error <dimension mismatch> x4 = [x1; x3];
--- a/test/diag-perm.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/diag-perm.tst Sun Feb 21 08:10:36 2016 -0800 @@ -181,15 +181,15 @@ %! assert (typeinfo (Dslice), "diagonal matrix"); ## preserve dense matrix structure when scaling -%!assert (typeinfo (rand (8) * (3 * eye (8))), "matrix"); -%!assert (typeinfo ((3 * eye (8)) * rand (8)), "matrix"); +%!assert (typeinfo (rand (8) * (3 * eye (8))), "matrix") +%!assert (typeinfo ((3 * eye (8)) * rand (8)), "matrix") ## preserve sparse matrix structure when scaling -%!assert (typeinfo (sprand (8, 8, .5) * (3 * eye (8))), "sparse matrix"); -%!assert (typeinfo (sprand (8, 8, .5) * (3 * eye (8))'), "sparse matrix"); -%!assert (typeinfo (((3 + 2 * I ()) * eye (8)) * sprand (8, 8, .5)), "sparse complex matrix"); -%!assert (typeinfo (((3 + 2 * I ()) * eye (8))' * sprand (8, 8, .5)), "sparse complex matrix"); -%!assert (typeinfo (sprand (8, 8, .5) * ((3 + 2 * I ()) * eye (8)).'), "sparse complex matrix"); +%!assert (typeinfo (sprand (8, 8, .5) * (3 * eye (8))), "sparse matrix") +%!assert (typeinfo (sprand (8, 8, .5) * (3 * eye (8))'), "sparse matrix") +%!assert (typeinfo (((3 + 2 * I ()) * eye (8)) * sprand (8, 8, .5)), "sparse complex matrix") +%!assert (typeinfo (((3 + 2 * I ()) * eye (8))' * sprand (8, 8, .5)), "sparse complex matrix") +%!assert (typeinfo (sprand (8, 8, .5) * ((3 + 2 * I ()) * eye (8)).'), "sparse complex matrix") ## scaling a matrix with exceptional values does not introduce new ones. %!test
--- a/test/index.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/index.tst Sun Feb 21 08:10:36 2016 -0800 @@ -209,13 +209,13 @@ %!shared d, dd %! d = diag ([1, 2, 3]); %! dd = diag ([1, 2, 3], 6, 3); -%!assert (d(1), 1); -%!assert (dd(1), 1); -%!assert (d(3, 3), 3); -%!assert (dd(3, 3), 3); -%!assert (d(2), 0); -%!assert (dd(2), 0); -%!assert (dd(6,1), 0); +%!assert (d(1), 1) +%!assert (dd(1), 1) +%!assert (d(3, 3), 3) +%!assert (dd(3, 3), 3) +%!assert (d(2), 0) +%!assert (dd(2), 0) +%!assert (dd(6,1), 0) %!error d(6,6); %!error dd(6,6); %!error d(3,6);
--- a/test/io.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/io.tst Sun Feb 21 08:10:36 2016 -0800 @@ -648,30 +648,30 @@ %! assert (count, 4); %! fclose (id); -%!assert (sprintf ("%1s", "foo"), "foo"); -%!assert (sprintf ("%.s", "foo"), char (zeros (1, 0))); -%!assert (sprintf ("%1.s", "foo"), " "); -%!assert (sprintf ("%.1s", "foo"), "f"); -%!assert (sprintf ("%1.1s", "foo"), "f"); -%!assert (sprintf ("|%4s|", "foo"), "| foo|"); -%!assert (sprintf ("|%-4s|", "foo"), "|foo |"); -%!assert (sprintf ("|%4.1s|", "foo"), "| f|"); -%!assert (sprintf ("|%-4.1s|", "foo"), "|f |"); +%!assert (sprintf ("%1s", "foo"), "foo") +%!assert (sprintf ("%.s", "foo"), char (zeros (1, 0))) +%!assert (sprintf ("%1.s", "foo"), " ") +%!assert (sprintf ("%.1s", "foo"), "f") +%!assert (sprintf ("%1.1s", "foo"), "f") +%!assert (sprintf ("|%4s|", "foo"), "| foo|") +%!assert (sprintf ("|%-4s|", "foo"), "|foo |") +%!assert (sprintf ("|%4.1s|", "foo"), "| f|") +%!assert (sprintf ("|%-4.1s|", "foo"), "|f |") -%!assert (sprintf ("%c ", "foo"), "f o o "); -%!assert (sprintf ("%s ", "foo"), "foo "); +%!assert (sprintf ("%c ", "foo"), "f o o ") +%!assert (sprintf ("%s ", "foo"), "foo ") -%!assert (sprintf ("|%d|", "foo"), "|102||111||111|"); -%!assert (sprintf ("|%s|", [102, 111, 111]), "|foo|"); +%!assert (sprintf ("|%d|", "foo"), "|102||111||111|") +%!assert (sprintf ("|%s|", [102, 111, 111]), "|foo|") -%!assert (sprintf ("%s %d ", [102, 1e5, 111, 1e5, 111]), "f 100000 o 100000 o "); +%!assert (sprintf ("%s %d ", [102, 1e5, 111, 1e5, 111]), "f 100000 o 100000 o ") -%!assert (sprintf ("%c,%c,%c,%c", "abcd"), "a,b,c,d"); -%!assert (sprintf ("%s,%s,%s,%s", "abcd"), "abcd,"); +%!assert (sprintf ("%c,%c,%c,%c", "abcd"), "a,b,c,d") +%!assert (sprintf ("%s,%s,%s,%s", "abcd"), "abcd,") -%!assert (sprintf ("|%x|", "Octave"), "|4f||63||74||61||76||65|"); -%!assert (sprintf ("|%X|", "Octave"), "|4F||63||74||61||76||65|"); -%!assert (sprintf ("|%o|", "Octave"), "|117||143||164||141||166||145|"); +%!assert (sprintf ("|%x|", "Octave"), "|4f||63||74||61||76||65|") +%!assert (sprintf ("|%X|", "Octave"), "|4F||63||74||61||76||65|") +%!assert (sprintf ("|%o|", "Octave"), "|117||143||164||141||166||145|") ## bug #47192 %!assert (sprintf ("%s", repmat ("blah", 2, 1)), "bbllaahh")
--- a/test/logical-index.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/logical-index.tst Sun Feb 21 08:10:36 2016 -0800 @@ -22,7 +22,7 @@ %!shared a %! a = 2; -%!assert (a(1), 2); +%!assert (a(1), 2) %!error id=Octave:index-out-of-bounds a(logical ([1,1])) %!shared a
--- a/test/nest/nest.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/nest/nest.tst Sun Feb 21 08:10:36 2016 -0800 @@ -47,9 +47,9 @@ %!test %! scope3; -%!assert (nest_eval ("x = 5;", "x = 6;"), 6); -%!assert (nest_eval ("x = 5;", "y = 6;"), 5); -%!assert (nest_eval ("x = -5; x = abs (x);", "y = 6;"), 5); +%!assert (nest_eval ("x = 5;", "x = 6;"), 6) +%!assert (nest_eval ("x = 5;", "y = 6;"), 5) +%!assert (nest_eval ("x = -5; x = abs (x);", "y = 6;"), 5) %!error <D' undefined near line 7> scope2 %!error <handles to nested functions are not yet supported> no_closure (0)
--- a/test/parser.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/parser.tst Sun Feb 21 08:10:36 2016 -0800 @@ -280,7 +280,7 @@ %!assert (.123_456, .123456) %!assert (123_456.123_456, 123456.123456) %!assert (0xAB_CD, 43981) -%!assert (2e0_1, 20); +%!assert (2e0_1, 20) ## Test binary constants %!assert (0b101, 5)
--- a/test/prefer.tst Sun Feb 21 07:43:16 2016 -0800 +++ b/test/prefer.tst Sun Feb 21 08:10:36 2016 -0800 @@ -33,9 +33,9 @@ %! m = [3,2]; %! fail ("[m ']"); -%!assert (all ([3 2] == (3:-1:2))); +%!assert (all ([3 2] == (3:-1:2))) -%!assert (all ([3, 2] == (3:-1:2))); +%!assert (all ([3, 2] == (3:-1:2))) %!test %! m = [3,2]; @@ -107,9 +107,9 @@ %! assert (!isempty (findstr (b{1}, "[](0x0)"))); %! print_empty_dimensions (ped); -%!assert (all (size (inv ([])) == [0, 0])); +%!assert (all (size (inv ([])) == [0, 0])) -%!assert (all (svd ([]) == zeros (0, 1))); +%!assert (all (svd ([]) == zeros (0, 1))) %!test %! sp = save_precision ();