changeset 18773:0461fe1d2a01

imshow.m: Don't popup blank figure during 'make check' * imshow.m: Create invisible figure in %!test block and use it for input validation testing. Close figure at end of test with unwind_protect_cleanup.
author Rik <rik@octave.org>
date Wed, 07 May 2014 09:34:45 -0700
parents 3bffa847d215
children bd334b6af257
files scripts/image/imshow.m
diffstat 1 files changed, 15 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/image/imshow.m	Wed May 07 09:09:43 2014 -0700
+++ b/scripts/image/imshow.m	Wed May 07 09:34:45 2014 -0700
@@ -261,12 +261,19 @@
 %!error <TrueColor image must be uint8> imshow (ones (3,3,3, "uint32"))
 %!error <TrueColor image must be uint8> imshow (ones (3,3,3, "int16"))
 %!error <expecting MxN or MxNx3 matrix> imshow (ones (4,4,4))
-%!error <invalid colormap MAP> imshow ([1,1], [2 0 0])
-%!error <argument number 2 is invalid> imshow ([1,1], [1 0 0 0])
-%!error <invalid colormap> imshow ([1,1], "colormap", [2 0 0])
-%!error <xdata must be a vector> imshow ([1,1], "xdata", ones (2,2))
-%!error <ydata must be a vector> imshow ([1,1], "ydata", ones (2,2))
-%!warning <unrecognized property foobar> imshow ([1,1], "foobar")
-%!error <argument number 2 is invalid> imshow ([1,1], {1})
-%!warning <only showing real part of complex image> imshow ([1+i,1-i])
 
+%!test
+%! hf = figure ("visible", "off");
+%! unwind_protect
+%!   fail ("imshow ([1,1], [2 0 0])", "invalid colormap MAP");
+%!   fail ("imshow ([1,1], [1 0 0 0])", "argument number 2 is invalid"); 
+%!   fail ('imshow ([1,1], "colormap", [2 0 0])', "invalid colormap"); 
+%!   fail ('imshow ([1,1], "xdata", ones (2,2))', "xdata must be a vector"); 
+%!   fail ('imshow ([1,1], "ydata", ones (2,2))', "ydata must be a vector"); 
+%!   fail ('imshow ([1,1], "foobar")', "warning", "unrecognized property foobar")
+%!   fail ("imshow ([1,1], {1})", "argument number 2 is invalid"); 
+%!   fail ("imshow ([1+i,1-i])", "warning", "only showing real part of complex image");
+%! unwind_protect_cleanup
+%!   close (hf);
+%! end_unwind_protect
+