Index: /branches/feature-narrow-tables/t/09-image.t
===================================================================
--- /branches/feature-narrow-tables/t/09-image.t (revision 1100)
+++ /branches/feature-narrow-tables/t/09-image.t (revision 1795)
@@ -25,5 +25,7 @@
     );
     @drivers = qw( ImageMagick NetPBM );
-    plan tests => scalar @Img + scalar @Img * scalar @drivers * 17;
+    plan tests => scalar @Img                           # file exists
+                + (scalar @Img * scalar @drivers * 18)  # 18 tests each for every image and driver
+                ;
 }
 
@@ -38,5 +40,6 @@
 
 for my $rec (@Img) {
-    my $img_file = File::Spec->catfile($BASE, 't', 'images', $rec->[0]);
+    my ($img_filename, $img_width, $img_height) = @$rec;
+    my $img_file = File::Spec->catfile($BASE, 't', 'images', $img_filename);
     ok(-B $img_file, "$img_file looks like a binary file");
 
@@ -46,29 +49,33 @@
 SKIP : {
         skip("no $driver image", 17) unless $img;
-        isa_ok($img, 'MT::Image::' . $driver);
+        isa_ok($img, 'MT::Image::' . $driver, "driver $driver with image $img_file is an MT::Image::$driver");
 #        diag( MT::Image->errstr ) if MT::Image->errstr;
 
-        is($img->{width}, $rec->[1], "width is $rec->[1]");
-        is($img->{height}, $rec->[2], "height is $rec->[2]");
-        my($w, $h) = $img->get_dimensions;
-        is($w, $rec->[1], "width is $rec->[1]");
-        is($h, $rec->[2], "height is $rec->[2]");
+        is($img->{width},  $img_width,  "$driver says $img_filename is $img_width px wide");
+        is($img->{height}, $img_height, "$driver says $img_filename is $img_height px high");
+        my($w, $h) = $img->get_dimensions();
+        is($w, $img_width,  "${driver}'s get_dimensions says $img_filename is $img_width px wide");
+        is($h, $img_height, "${driver}'s get_dimensions says $img_filename is $img_height px high");
 
         ($w, $h) = $img->get_dimensions(Scale => 50);
-        my($x, $y) = (int($img->{width} / 2), int($img->{height} / 2));
-        is($w, $x, "width is $x");
-        is($h, $y, "height is $y");
+        my($x, $y) = (int($img_width / 2), int($img_height / 2));
+        is($w, $x, "$driver says $img_filename at 50\% scale is $x px wide");
+        is($h, $y, "$driver says $img_filename at 50\% scale is $y px high");
+
+        ($w, $h) = $img->get_dimensions();
+        is($w, $img_width,  "${driver}'s get_dimensions says $img_filename is still $img_width px wide after theoretical scaling");
+        is($h, $img_height, "${driver}'s get_dimensions says $img_filename is still $img_height px high after theoretical scaling");
 
         ($w, $h) = $img->get_dimensions(Width => 50);
-        is($w, 50, 'width is 50');
+        is($w, 50, "$driver says $img_filename scaled to 50 px wide is 50 px wide");
 
         ($w, $h) = $img->get_dimensions(Width => 50, Height => 100);
-        is($w, 50, 'width is 50');
-        is($h, 100, 'height is 100');
+        is($w, 50,  "$driver says $img_filename scaled to 50x100 is 50 px wide");
+        is($h, 100, "$driver says $img_filename scaled to 50x100 is 100 px high");
 
         (my($blob), $w, $h) = $img->scale(Scale => 50);
-        ($x, $y) = (int($img->{width} / 2), int($img->{height} / 2));
-        is($w, $x, "width is $x");
-        is($h, $y, "height is $y");
+        ($x, $y) = (int($img_width / 2), int($img_height / 2));
+        is($w, $x, "result of scaling $img_filename to 50\% with $driver is $x px wide");
+        is($h, $y, "result of scaling $img_filename to 50\% with $driver is $y px high");
 
         open FH, $img_file or die $!;
@@ -80,9 +87,9 @@
         isa_ok($img, 'MT::Image::' . $driver);
 #            diag( MT::Image->errstr ) if MT::Image->errstr;
-        is($img->{width}, $rec->[1], "width is $rec->[1]");
-        is($img->{height}, $rec->[2], "height is $rec->[2]");
+        is($img->{width},  $img_width,  "$driver says $img_filename from blob is $img_width px wide");
+        is($img->{height}, $img_height, "$driver says $img_filename from blob is $img_height px high");
         ($w, $h) = $img->get_dimensions;
-        is($w, $rec->[1], "width is $rec->[1]");
-        is($h, $rec->[2], "height is $rec->[2]");
+        is($w, $img_width,  "${driver}'s get_dimensions says $img_filename from blob is $img_width px wide");
+        is($h, $img_height, "${driver}'s get_dimensions says $img_filename from blob is $img_height px high");
 } # END SKIP
     }