hoist all the copies of cmpimg into a common module

diff --git a/MANIFEST b/MANIFEST
index 0840018883b4d90cc3383f1a38a02f8170238e1d..4b70aca38cf74d167eef8f5d6e1b72a052ee09f1 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -15,6 +15,7 @@ MANIFEST
 MANIFEST.SKIP
 README
 t/lib/Imager/Font/Test.pm
 MANIFEST.SKIP
 README
 t/lib/Imager/Font/Test.pm

+t/lib/Imager/Graph/Test.pm

 t/t00load.t
 t/t10pie.t
 t/t11line.t
 t/t00load.t
 t/t10pie.t
 t/t11line.t

diff --git a/t/lib/Imager/Graph/Test.pm b/t/lib/Imager/Graph/Test.pm
new file mode 100644 (file)
index 0000000..93ad59b
--- /dev/null
+++ b/t/lib/Imager/Graph/Test.pm
@@ -0,0 +1,33 @@
+package Imager::Graph::Test;
+use strict;
+use Test::More;
+use Imager::Test qw(is_image_similar);
+
+require Exporter;
+our @ISA = qw(Exporter);
+
+our @EXPORT_OK = qw(cmpimg);
+
+sub cmpimg ($$;$$) {
+  my ($img, $filename, $error, $note) = @_;
+
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+  $note ||= $filename;
+  $error ||= 10_000;
+ SKIP: {
+    $Imager::formats{png}
+      or skip("png not available", 1);
+
+    my $cmpim = Imager->new;
+    if ($cmpim->read(file => $filename)) {
+      is_image_similar($img, $cmpim, $error, $note);
+    }
+    else {
+      fail("$note: load");
+      diag("loading $filename: " . $cmpim->errstr);
+    }
+  }
+}
+
+1;

diff --git a/t/t10pie.t b/t/t10pie.t
index 15f710835a824881dfdd3a259a13dae6a08e6415..d5277b7db9499ba49a3f88312a37a2bdff0e77ca 100644 (file)
--- a/t/t10pie.t
+++ b/t/t10pie.t
@@ -3,6 +3,7 @@ use strict;
 use Imager::Graph::Pie;
 use lib 't/lib';
 use Imager::Font::Test;
 use Imager::Graph::Pie;
 use lib 't/lib';
 use Imager::Font::Test;

+use Imager::Graph::Test qw(cmpimg);

 use Test::More;
 
 -d 'testout' 
 use Test::More;
 
 -d 'testout' 


@@ -269,21 +270,3 @@ cmpimg($img6, "testimg/t10_hlegend.png", 550_000);
   print "# ", $pie->error, "\n";
   cmp_ok($pie->error, '=~', qr/^Error creating image/, "check error message");
 }
   print "# ", $pie->error, "\n";
   cmp_ok($pie->error, '=~', qr/^Error creating image/, "check error message");
 }

-
-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
- SKIP:
-  {
-    $Imager::formats{png}
-      or skip("No PNG support", 1);
-
-    my $cmpimg = Imager->new;
-    $cmpimg->read(file=>$file)
-      or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-    my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-    cmp_ok($diff, '<', $limit, "Comparison to $file ($diff)");
-  }
-}

diff --git a/t/t14bar.t b/t/t14bar.t
index f426a0f9422db434633d3835eabcf0692cf76a72..cde16355b0746fd280a3dd59452a579e2e295aa8 100644 (file)
--- a/t/t14bar.t
+++ b/t/t14bar.t
@@ -4,6 +4,7 @@ use Imager::Graph::Bar;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -110,15 +111,3 @@ unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }
 
   diag($_) for @warned;
 }
 

-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
-  my $cmpimg = Imager->new;
-  $cmpimg->read(file=>$file)
-    or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-  my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-  cmp_ok($diff, '<', $limit, "Comparison to $file ($diff)");
-}
-

diff --git a/t/t30many_points.t b/t/t30many_points.t
index 0ee74766ce8d4bba63eea230bd06080cc8cbcaef..1ede862dfe120623b7b5bcb4a1de2be7a074d970 100644 (file)
--- a/t/t30many_points.t
+++ b/t/t30many_points.t
@@ -4,6 +4,7 @@ use Imager::Graph::Line;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -46,16 +47,3 @@ cmpimg($img1, 'testimg/t30_points.ppm', 40_000);
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }

-
-
-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
-  my $cmpimg = Imager->new;
-  $cmpimg->read(file=>$file)
-    or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-  my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-  cmp_ok($diff, '<', $limit, "Comparison to $file ($diff)");
-}

diff --git a/t/t31tic_color.t b/t/t31tic_color.t
index 09abf6c16a84b3d4affe4786bce003b6c8480e4e..c563ceb30bffa2fbfef69939cd0930902d6d017b 100644 (file)
--- a/t/t31tic_color.t
+++ b/t/t31tic_color.t
@@ -4,6 +4,7 @@ use Imager::Graph::Line;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -58,16 +59,3 @@ unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }
 
   diag($_) for @warned;
 }
 

-
-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
-  my $cmpimg = Imager->new;
-  $cmpimg->read(file=>$file)
-    or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-  my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-  cmp_ok($diff, '<', $limit, "Comparison to $file ($diff)");
-}
-

diff --git a/t/t32series_labels.t b/t/t32series_labels.t
index e22e2a240a09adfa9da4ce437cb9c21bae22a103..66a39e375e87ced1bdb73328d098ec08dc410b08 100644 (file)
--- a/t/t32series_labels.t
+++ b/t/t32series_labels.t
@@ -4,6 +4,7 @@ use Imager::Graph::Line;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -48,18 +49,3 @@ cmpimg($img1, 'testimg/t32_series.ppm', 80_000);
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }

-
-
-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
-  my $cmpimg = Imager->new;
-  $cmpimg->read(file=>$file)
-    or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-  my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-  cmp_ok($diff, '<', $limit, "Comparison to $file ($diff)");
-
-}
-

diff --git a/t/t33_long_labels.t b/t/t33_long_labels.t
index 712bec5f962411b1019e435653175f230195be9c..77156c3868cf7cdd2cbdca3c89d3335f6be82a43 100644 (file)
--- a/t/t33_long_labels.t
+++ b/t/t33_long_labels.t
@@ -1,9 +1,11 @@
+#!perl

 use strict;
 
 use Imager::Graph::Line;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use strict;
 
 use Imager::Graph::Line;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -42,18 +44,3 @@ $img->write(file=>'testout/t33_long_labels.ppm') or die "Can't save img1: ".$img
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }

-
-
-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
-  my $cmpimg = Imager->new;
-  $cmpimg->read(file=>$file)
-    or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-  my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-  cmp_ok($diff, '<', $limit, "Comparison to $file ($diff)");
-
-}
-

diff --git a/t/t34horizontal_many_points.t b/t/t34horizontal_many_points.t
index 149aeec7271913ced5501452ffc5fc0d92cf6b45..def8dedf4e86d98af8dcdffc27565a40db021217 100644 (file)
--- a/t/t34horizontal_many_points.t
+++ b/t/t34horizontal_many_points.t
@@ -4,6 +4,7 @@ use Imager::Graph::Bar;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -44,17 +45,3 @@ cmpimg($img1, 'testimg/t34_points.ppm', 80_000);
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }
 unless (is(@warned, 0, "should be no warnings")) {
   diag($_) for @warned;
 }

-
-
-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
-  my $cmpimg = Imager->new;
-  $cmpimg->read(file=>$file)
-    or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-  my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-  cmp_ok($diff, '<', $limit, "Comparison to $file ($diff)");
-}
-

diff --git a/t/t40area.t b/t/t40area.t
index 0dcc0bf3d3eaa06323003c41e3ab966ebe0e50d0..62b7e2bb207f5baf41e338f0ec8d1afec2d38ed6 100644 (file)
--- a/t/t40area.t
+++ b/t/t40area.t
@@ -5,6 +5,7 @@ use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use Imager::Test qw(is_image_similar);
 use Imager::Font::Test;
 use Test::More;
 use Imager::Test qw(is_image_similar);

+use Imager::Graph::Test qw(cmpimg);

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -102,20 +103,3 @@ END {
   }
 }
 
   }
 }
 

-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
- SKIP:
-  {
-    $Imager::formats{png}
-      or skip("No PNG support", 1);
-
-    my $cmpimg = Imager->new;
-    $cmpimg->read(file=>$file)
-      or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-    my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-    is_image_similar($img, $cmpimg, $limit, "Comparison to $file ($diff)");
-  }
-}

diff --git a/t/x50vstyle.t b/t/x50vstyle.t
index fb46a217be7ef62eb9e60e0f807d9e6e6ea27b32..1de4861885b77aab5f51c893409f802c9504ed4c 100644 (file)
--- a/t/x50vstyle.t
+++ b/t/x50vstyle.t
@@ -4,7 +4,8 @@ use Imager::Graph::Line;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

-use Imager::Test qw(is_image_similar is_image);
+use Imager::Test qw(is_image);
+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -220,20 +221,3 @@ END {
   }
 }
 
   }
 }
 

-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
- SKIP:
-  {
-    $Imager::formats{png}
-      or skip("No PNG support", 1);
-
-    my $cmpimg = Imager->new;
-    $cmpimg->read(file=>$file)
-      or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-    my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-    is_image_similar($img, $cmpimg, $limit, "Comparison to $file ($diff)");
-  }
-}

diff --git a/t/x51hstyle.t b/t/x51hstyle.t
index cee81ce2d36d6232642ec3b65280acdedc8cb7e3..5eacb9ac488330293820c5f469c87e6d210a92a8 100644 (file)
--- a/t/x51hstyle.t
+++ b/t/x51hstyle.t
@@ -4,7 +4,8 @@ use Imager::Graph::Bar;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;
 use lib 't/lib';
 use Imager::Font::Test;
 use Test::More;

-use Imager::Test qw(is_image_similar is_image);
+use Imager::Test qw(is_image);
+use Imager::Graph::Test 'cmpimg';

 
 -d 'testout' 
   or mkdir "testout", 0700 
 
 -d 'testout' 
   or mkdir "testout", 0700 


@@ -182,20 +183,3 @@ END {
   }
 }
 
   }
 }
 

-sub cmpimg {
-  my ($img, $file, $limit) = @_;
-
-  $limit ||= 10000;
-
- SKIP:
-  {
-    $Imager::formats{png}
-      or skip("No PNG support", 1);
-
-    my $cmpimg = Imager->new;
-    $cmpimg->read(file=>$file)
-      or return ok(0, "Cannot read $file: ".$cmpimg->errstr);
-    my $diff = Imager::i_img_diff($img->{IMG}, $cmpimg->{IMG});
-    is_image_similar($img, $cmpimg, $limit, "Comparison to $file ($diff)");
-  }
-}