- t/t50basicoo.t no longer depends on the other tests to generate its

   input files.
   https://rt.cpan.org/Ticket/Display.html?id=9798
   Also, it wasn't testing pnm (pnm vs ppm mix-up)

diff --git a/Changes b/Changes
index 32f1569e203eebfa15b2d900aaad05b1a83895b9..1cad179499df24bd678170f5ac3cc73780e2dd68 100644 (file)
--- a/Changes
+++ b/Changes
@@ -9,6 +9,11 @@ Bugs:
    $data
    https://rt.cpan.org/Ticket/Display.html?id=58761
 
+ - t/t50basicoo.t no longer depends on the other tests to generate its 
+   input files.
+   https://rt.cpan.org/Ticket/Display.html?id=9798
+   Also, it wasn't testing pnm (pnm vs ppm mix-up)
+
 Imager 0.75 - 20 Jun 2010
 ===========
 

diff --git a/MANIFEST b/MANIFEST
index 51fb6c95bb21412ce7808c7e73d6ac82d39116b3..efbacd7b084cf11e91c6c6cee01eb899b6906419 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -377,6 +377,9 @@ testimg/srgba.tif   RGB with one alpha
 testimg/srgba16.tif
 testimg/srgba32.tif
 testimg/srgbaa.tif     RGB with 2 alpha
+testimg/test.png       Standard test image as PNG
+testimg/test.raw       Standard test image as RAW
+testimg/test.tga       Standard test image as TGA
 testimg/test_gimp_pal   A simple GIMP palette file
 testimg/tiffwarn.tif   Generates a warning while being read
 testimg/trimgdesc.gif

diff --git a/t/t50basicoo.t b/t/t50basicoo.t
index a53bb83e69f6c621c856156c9f6959f7497b12aa..39d907ac8a1d65ec985a3d53be92084c6bcd7403 100644 (file)
--- a/t/t50basicoo.t
+++ b/t/t50basicoo.t
@@ -14,7 +14,7 @@ my $buggy_giflib_file = "buggy_giflib.txt";
 Imager::init("log"=>"testout/t50basicoo.log");
 
 # single image/file types
-my @types = qw( jpeg png raw ppm gif tiff bmp tga );
+my @types = qw( jpeg png raw pnm gif tiff bmp tga );
 
 # multiple image/file formats
 my @mtypes = qw(tiff gif);
@@ -40,14 +40,14 @@ for(keys %hsh) { print "# $_\n"; }
 my $img = Imager->new();
 
 my %files;
-@files{@types} = ({ file => "testout/t101.jpg"  },
-                 { file => "testout/t102.png"  },
-                 { file => "testout/t103.raw", xsize=>150, ysize=>150, type=>'raw', interleave => 0},
-                 { file => "testout/t104.ppm"  },
-                 { file => "testout/t105.gif"  },
-                 { file => "testout/t106.tiff" },
-                  { file => "testout/t107_24bit.bmp" },
-                  { file => "testout/t108_24bit.tga" }, );
+@files{@types} = ({ file => "testimg/209_yonge.jpg"  },
+                 { file => "testimg/test.png"  },
+                 { file => "testimg/test.raw", xsize=>150, ysize=>150, type=>'raw', interleave => 0},
+                 { file => "testimg/penguin-base.ppm"  },
+                 { file => "testimg/expected.gif"  },
+                 { file => "testimg/comp8.tif" },
+                  { file => "testimg/winrgb24.bmp" },
+                  { file => "testimg/test.tga" }, );
 my %writeopts =
   (
    gif=> { make_colors=>'webmap', translate=>'closest', gifquant=>'gen',
@@ -176,7 +176,7 @@ for my $type (@types) {
   my $wimg = Imager->new;
   # if this doesn't work, we're so screwed up anyway
   
-  ok($wimg->read(file=>"testout/t104.ppm"),
+  ok($wimg->read(file=>"testimg/penguin-base.ppm"),
      "cannot read base file", $wimg);
 
   # first to a file

diff --git a/testimg/test.png b/testimg/test.png
new file mode 100644 (file)
index 0000000..76bfc9a
Binary files /dev/null and b/testimg/test.png differ

diff --git a/testimg/test.raw b/testimg/test.raw
new file mode 100644 (file)
index 0000000..f66e372
Binary files /dev/null and b/testimg/test.raw differ

diff --git a/testimg/test.tga b/testimg/test.tga
new file mode 100644 (file)
index 0000000..dec74a0
Binary files /dev/null and b/testimg/test.tga differ