convert t/t020masked.t to Test::More

diff --git a/t/t020masked.t b/t/t020masked.t
index bddacd384a0e78045789f9249de60e9f86d6cbeb..b3e4beb52234d7987b93c6fde74d8533040684ee 100644 (file)
--- a/t/t020masked.t
+++ b/t/t020masked.t
@@ -1,11 +1,8 @@
 #!perl -w
-
-BEGIN { $| = 1; print "1..35\n"; }
-END {print "not ok 1\n" unless $loaded;}
+use strict;
+use Test::More tests => 34;
 use Imager qw(:all :handy);
-#use Data::Dumper;
-$loaded = 1;
-print "ok 1\n";
+use Imager::Test qw(is_color3);
 init_log("testout/t020masked.log", 1);
 
 my $base_rgb = Imager::ImgRaw::new(100, 100, 3);
@@ -22,44 +19,38 @@ for my $y (0..99) {
 # first a simple subset image
 my $s_rgb = Imager::i_img_masked_new($base_rgb, undef, 25, 25, 50, 50);
 
-print Imager::i_img_getchannels($s_rgb) == 3
-  ? "ok 2\n" : "not ok 2 # 1 channel image channel count mismatch\n";
-print Imager::i_img_getmask($s_rgb) & 1 
-  ? "ok 3\n" : "not ok 3 # 1 channel image bad mask\n";
-print Imager::i_img_virtual($s_rgb) == 0
-  ? "not ok 4 # 1 channel image thinks it isn't virtual\n" : "ok 4\n";
-print Imager::i_img_bits($s_rgb) == 8
-  ? "ok 5\n" : "not ok 5 # 1 channel image has bits != 8\n";
-print Imager::i_img_type($s_rgb) == 0 # direct
-  ? "ok 6\n" : "not ok 6 # 1 channel image isn't direct\n";
+is(Imager::i_img_getchannels($s_rgb), 3,
+   "1 channel image channel count match");
+ok(Imager::i_img_getmask($s_rgb) & 1,
+   "1 channel image mask");
+ok(Imager::i_img_virtual($s_rgb),
+   "1 channel image thinks it isn't virtual");
+is(Imager::i_img_bits($s_rgb), 8,
+   "1 channel image has bits == 8");
+is(Imager::i_img_type($s_rgb), 0, # direct
+   "1 channel image is direct");
 
 my @ginfo = i_img_info($s_rgb);
-print $ginfo[0] == 50 
-  ? "ok 7\n" : "not ok 7 # image width incorrect\n";
-print $ginfo[1] == 50
-  ? "ok 8\n" : "not ok 8 # image height incorrect\n";
+is($ginfo[0], 50, "check width");
+is($ginfo[1], 50, "check height");
 
 # sample some pixels through the subset
 my $c = Imager::i_get_pixel($s_rgb, 0, 0);
-color_cmp($c, $green) == 0 or print "not ";
-print "ok 9\n";
+is_color3($c, 0, 255, 0, "check (0,0)");
 $c = Imager::i_get_pixel($s_rgb, 49, 49);
 # (25+49)%3 = 2
-color_cmp($c, $blue) == 0 or print "not ";
-print "ok 10\n";
+is_color3($c, 0, 0, 255, "check (49,49)");
 
 # try writing to it
 for my $y (0..49) {
   Imager::i_plin($s_rgb, 0, $y, ($cols[$y % 3]) x 50);
 }
-print "ok 11\n";
+pass("managed to write to it");
 # and checking the target image
 $c = Imager::i_get_pixel($base_rgb, 25, 25);
-color_cmp($c, $red) == 0 or print "not ";
-print "ok 12\n";
+is_color3($c, 255, 0, 0, "check (25,25)");
 $c = Imager::i_get_pixel($base_rgb, 29, 29);
-color_cmp($c, $green) == 0 or print "not ";
-print "ok 13\n";
+is_color3($c, 0, 255, 0, "check (29,29)");
 
 undef $s_rgb;
 
@@ -77,8 +68,7 @@ for my $y (0..49) {
   Imager::i_plin($mask, 20, $y, ($white) x 8);
 }
 my $m_rgb = Imager::i_img_masked_new($base_rgb, $mask, 25, 25, 50, 50);
-$m_rgb or print "not ";
-print "ok 14\n";
+ok($m_rgb, "make masked with mask");
 for my $y (0..49) {
   Imager::i_plin($m_rgb, 0, $y, ($green) x 50);
 }
@@ -102,31 +92,29 @@ my @color_tests =
   );
 my $test_num = 15;
 for my $test (@color_tests) {
-  color_test($test_num++, $base_rgb, @$test);
+  my ($x, $y, $testc) = @$test;
+  my ($r, $g, $b) = $testc->rgba;
+  my $c = Imager::i_get_pixel($base_rgb, $x, $y);
+  is_color3($c, $r, $g, $b, "at ($x, $y)");
 }
 
 {
   # tests for the OO versions, fairly simple, since the basic functionality
   # is covered by the low-level interface tests
    
-  my $base = Imager->new(xsize=>100, ysize=>100)
-    or print "not ";
-  print "ok 30\n";
+  my $base = Imager->new(xsize=>100, ysize=>100);
+  ok($base, "make base OO image");
   $base->box(color=>$blue, filled=>1); # fill it all
   my $mask = Imager->new(xsize=>80, ysize=>80, channels=>1);
   $mask->box(color=>$white, filled=>1, xmin=>5, xmax=>75, ymin=>5, ymax=>75);
-  my $m_img = $base->masked(mask=>$mask, left=>5, top=>5)
-    or print "not ";
-  print "ok 31\n";
-  $m_img->getwidth == 80 or print "not ";
-  print "ok 32\n";
+  my $m_img = $base->masked(mask=>$mask, left=>5, top=>5);
+  ok($m_img, "make masked OO image");
+  is($m_img->getwidth, 80, "check width");
   $m_img->box(color=>$green, filled=>1);
-  color_cmp(Imager::i_get_pixel($m_img->{IMG}, 0, 0), $blue) == 0 
-    or print "not ";
-  print "ok 33\n";
-  color_cmp(Imager::i_get_pixel($m_img->{IMG}, 5, 5), $green) == 0 
-    or print "not ";
-  print "ok 34\n";
+  my $c = $m_img->getpixel(x=>0, y=>0);
+  is_color3($c, 0, 0, 255, "check (0,0)");
+  $c = $m_img->getpixel(x => 5, y => 5);
+  is_color3($c, 0, 255, 0, "check (5,5)");
 
   # older versions destroyed the Imager::ImgRaw object manually in 
   # Imager::DESTROY rather than letting Imager::ImgRaw::DESTROY 
@@ -137,23 +125,5 @@ for my $test (@color_tests) {
   undef $mask;
   undef $base;
   $m_img->box(color=>$blue, filled=>1);
-  print "ok 35\n";
-}
-
-sub color_test {
-  my ($num, $im, $x, $y, $expected) = @_;
-  my $c = Imager::i_get_pixel($im, $x, $y);
-  color_cmp($c, $expected) == 0 or print "not ";
-  print "ok $num # $x, $y\n";
+  pass("didn't crash unreffing base or mask for masked image");
 }
-
-sub color_cmp {
-  my ($l, $r) = @_;
-  my @l = $l->rgba;
-  my @r = $r->rgba;
-  # print "# (",join(",", @l[0..2]),") <=> (",join(",", @r[0..2]),")\n";
-  return $l[0] <=> $r[0]
-    || $l[1] <=> $r[1]
-      || $l[2] <=> $r[2];
-}
-