Rewrite get_image test using better data

Previously, we used a file that was deleted without anybody
noticing. Now, we use the same image as is used in the API docs,
which is very unlikely to disappear from beneath our feet.

Author: Mike.lifeguard

lib/MediaWiki/Bot.pm

@@ -977,14 +977,14 @@ sub get_pages {
     $buffer = $bot->get_image('File::Foo.jpg', {width=>256, height=>256});
 
 Download an image from a wiki. This is derived from a similar function in
-MediaWiki::API. This one allows the image to be scaled down by passing a hashref
+L<MediaWiki::API>. This one allows the image to be scaled down by passing a hashref
 with height & width parameters.
 
 It returns raw data in the original format. You may simply spew it to a file, or
 process it directly with a library such as L<Imager>.
 
+    use File::Slurp qw(write_file);
     my $img_data = $bot->get_image('File::Foo.jpg');
-    use File::Slurp;
     write_file( 'Foo.jpg', {binmode => ':raw'}, \$img_data );
 
 Images are scaled proportionally. (height/width) will remain
@@ -1011,8 +1011,8 @@ sub get_image{
           prop   => 'imageinfo',
           iiprop => 'url|size',
           %sizeparams
-       } ) or return $self->_handle_api_error();
-
+    });
+    return $self->_handle_api_error() unless $ref;
     my ($pageref) = values %{ $ref->{query}->{pages} };
     return unless defined $pageref->{imageinfo}; # if the image is missing
 

t/48-get_image.t

@@ -1,63 +1,71 @@
 use strict;
 use warnings;
-use Test::More 0.88;
+use Test::More 0.96;
 
 use MediaWiki::Bot;
 my $t = __FILE__;
 
-unless (eval q{use Imager; 1 }) {
-    plan skip_all => q{Imager required};
-    exit;
+plan eval q{use Imager; 1 }
+    ? (tests => 3)
+    : (skip_all => q{Imager required});
+
+my $username = $ENV{'PWPUsername'};
+my $password = $ENV{'PWPPassword'};
+my $login_data;
+if (defined($username) and defined($password)) {
+    $login_data = { username => $username, password => $password };
 }
 
-#my $username = $ENV{'PWPUsername'};
-#my $password = $ENV{'PWPPassword'};
 my $bot = MediaWiki::Bot->new({
     agent   => "MediaWiki::Bot tests ($t)",
     host    => 'test.wikipedia.org',
-    #  login_data => { username => $username, password => $password },
+    login_data => $login_data,
 });
 if(defined($ENV{'PWPMakeTestSetWikiHost'})) {
     $bot->set_wiki($ENV{'PWPMakeTestSetWikiHost'}, $ENV{'PWPMakeTestSetWikiDir'});
 }
 
-{ #no width, no height
-   my $data = $bot->get_image('File:Test-favicon.png');
-   ok($data, 'nonscaled image retrieved');
+my $image_name = 'File:Albert_Einstein_Head.jpg';
+subtest 'no width, no height' => sub {
+    plan tests => 4;
+    my $data = $bot->get_image($image_name);
+    ok $data, 'nonscaled image retrieved';
 
-   my $img = Imager->new;
-   my $did_read = $img->read(data=>$data);
-   diag $img->errstr unless $did_read;
-   ok($did_read, 'retrieved nonscaled data is an image.');
+    my $img = Imager->new;
+    my $did_read = $img->read(data => $data);
+    ok $did_read, 'retrieved nonscaled data is an image'
+        or diag $img->errstr;
 
-   is($img->getwidth(),16, 'nonscaled img has w 16');
-   is($img->getheight(),16, 'nonscaled img has h 16');
-}
-{ #supply a width
-   my $data = $bot->get_image('File:Test-favicon.png',{width=>12});
-   ok($data, 'wscaled image retrieved');
+    is $img->getwidth(),   924, 'nonscaled img has w 924';
+    is $img->getheight(), 1203, 'nonscaled img has h 1203';
+};
 
-   my $img = Imager->new;
-   my $did_read = $img->read(data=>$data);
-   diag $img->errstr unless $did_read;
-   ok($did_read, 'retrieved wscaled data is an image.');
+subtest 'supply a width' => sub {
+    plan tests => 3;
+    my $data = $bot->get_image($image_name, {width => 12});
+    ok $data, 'wscaled image retrieved';
 
-   is($img->getwidth(),12, 'wscaled img has w 12');
-   is($img->getheight(),12, 'wscaled img has h 12');
-}
-{  #supply a width & a not-to-scale height. These
-   # should both be considered maximum dimensions,
-   # and scale should be proportional.
-   my $data = $bot->get_image('File:Test-favicon.png',{width=>4,height=>8});
-   ok($data, 'whscaled image retrieved');
-
-   my $img = Imager->new;
-   my $did_read = $img->read(data=>$data);
-   diag $img->errstr unless $did_read;
-   ok($did_read, 'retrieved whscaled data is an image.');
-
-   is($img->getwidth(),4, 'whscaled img has w 4');
-   is($img->getheight(),4, 'whscaled img has h 4');
-}
+    my $img = Imager->new;
+    my $did_read = $img->read(data => $data);
+    ok $did_read, 'retrieved wscaled data is an image.'
+        or diag $img->errstr;
+
+    is $img->getwidth(),  12, 'wscaled img has w 12';
+};
+
+#supply a width & a not-to-scale height. These
+# should both be considered maximum dimensions,
+# and scale should be proportional.
+subtest 'supply a width and a not-to-scale height' => sub {
+    plan tests => 4;
+    my $data = $bot->get_image($image_name, {width => 200, height => 200});
+    ok $data, 'whscaled image retrieved';
+
+    my $img = Imager->new;
+    my $did_read = $img->read(data => $data);
+    ok $did_read, 'retrieved whscaled data is an image.'
+        or diag $img->errstr;
 
-done_testing;
+    cmp_ok $img->getwidth(),  '<=', 200, '200 height is max';
+    cmp_ok $img->getheight(), '<=', 200, '200 width is max';
+};