Merge branch 'psamp'

[imager.git] / t / t106notiff.t

diff --git a/t/t106notiff.t b/t/t106notiff.t
index 700199cc102bd04bcc96ccce0d91b060d61acc9b..0854640dad6fc7dbac31e5090d63f60c3c970e4a 100644 (file)
--- a/t/t106notiff.t
+++ b/t/t106notiff.t
@@ -3,16 +3,34 @@ use strict;
 use Test::More;
 use Imager qw(:all);
 
 use Test::More;
 use Imager qw(:all);
 

-i_has_format("tiff")
+$Imager::formats{"tiff"}

   and plan skip_all => "tiff support available - this tests the lack of it";
 
   and plan skip_all => "tiff support available - this tests the lack of it";
 

-plan tests => 6;
+plan tests => 12;

 
 my $im = Imager->new;
 
 my $im = Imager->new;

-ok(!$im->read(file=>"testimg/comp4.tif"), "should fail to read tif");
-cmp_ok($im->errstr, '=~', "format 'tiff' not supported", "check no tiff message");
+
+ok(!$im->read(file=>"TIFF/testimg/comp4.tif"), "should fail to read tif");
+cmp_ok($im->errstr, '=~', "format 'tiff' not supported",
+       "check no tiff message");
+
+ok(!$im->read_multi(file => "TIFF/testimg/comp4.tif"),
+   "should fail to read multi tiff");
+cmp_ok($im->errstr, '=~', "format 'tiff' not supported",
+       "check no tiff message");
+

 $im = Imager->new(xsize=>2, ysize=>2);
 $im = Imager->new(xsize=>2, ysize=>2);

+

 ok(!$im->write(file=>"testout/notiff.tif"), "should fail to write tiff");
 ok(!$im->write(file=>"testout/notiff.tif"), "should fail to write tiff");

-cmp_ok($im->errstr, '=~', "format 'tiff' not supported", "check no tiff message");
+cmp_ok($im->errstr, '=~', "format 'tiff' not supported",
+       "check no tiff message");
+ok(!-e "testout/notiff.tif", "file shouldn't be created");
+
+ok(!Imager->write_multi({file=>"testout/notiff.tif"}, $im, $im),
+   "should fail to write multi tiff");
+cmp_ok($im->errstr, '=~', "format 'tiff' not supported",
+       "check no tiff message");
+ok(!-e "testout/notiff.tif", "file shouldn't be created");
+

 ok(!grep($_ eq 'tiff', Imager->read_types), "check tiff not in read types");
 ok(!grep($_ eq 'tiff', Imager->write_types), "check tiff not in write types");
 ok(!grep($_ eq 'tiff', Imager->read_types), "check tiff not in read types");
 ok(!grep($_ eq 'tiff', Imager->write_types), "check tiff not in write types");