pagestats: consistent indentation

[git.ikiwiki.info.git] / t / img.t

diff --git a/t/img.t b/t/img.t
index 0183f8779d3034b36c8a436e558c428f8b88b636..9a48cb1c55ac94dfb8023f9730801c71d217e367 100755 (executable)
--- a/t/img.t
+++ b/t/img.t
@@ -28,6 +28,7 @@ ok(! system("cp t/img/twopages.pdf t/tmp/in/twopages.pdf"));
 writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
 [[!img redsquare.png]]
 [[!img redsquare.png size=10x]]
 writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
 [[!img redsquare.png]]
 [[!img redsquare.png size=10x]]

+[[!img redsquare.png size=30x50]] expecting 30x30

 [[!img emptysquare.svg size=10x]]
 [[!img twopages.pdf size=12x]]
 [[!img twopages.pdf size=16x pagenumber=1]]
 [[!img emptysquare.svg size=10x]]
 [[!img twopages.pdf size=12x]]
 [[!img twopages.pdf size=16x pagenumber=1]]


@@ -43,14 +44,19 @@ ok(! system($command));
 sub size($) {
        my $filename = shift;
        my $im = Image::Magick->new();
 sub size($) {
        my $filename = shift;
        my $im = Image::Magick->new();

-       $im->Read($filename);
+       my $r = $im->Read($filename);
+       return "no image" if $r;

        my $w = $im->Get("width");
        my $h = $im->Get("height");
        return "${w}x${h}";
 }
 
 my $outpath = "t/tmp/out/imgconversions";
        my $w = $im->Get("width");
        my $h = $im->Get("height");
        return "${w}x${h}";
 }
 
 my $outpath = "t/tmp/out/imgconversions";

+my $outhtml = readfile("$outpath.html");
+

 is(size("$outpath/10x-redsquare.png"), "10x10");
 is(size("$outpath/10x-redsquare.png"), "10x10");

+ok(! -e "$outpath/30x-redsquare.png");
+ok($outhtml =~ /width="30" height="30".*expecting 30x30/);

 # if this fails, you need libmagickcore-6.q16-2-extra installed
 is(size("$outpath/10x-emptysquare.png"), "10x10");
 is(size("$outpath/12x-twopages.png"), "12x12");
 # if this fails, you need libmagickcore-6.q16-2-extra installed
 is(size("$outpath/10x-emptysquare.png"), "10x10");
 is(size("$outpath/12x-twopages.png"), "12x12");


@@ -58,17 +64,19 @@ is(size("$outpath/16x-p1-twopages.png"), "16x2");
 
 # now let's remove them again
 
 
 # now let's remove them again
 

-writefile("imgconversions.mdwn", "t/tmp/in", "nothing to see here");
+if (1) { # for easier testing
+       writefile("imgconversions.mdwn", "t/tmp/in", "nothing to see here");

 
 

-ok(! system("$command --refresh"));
+       ok(! system("$command --refresh"));

 
 

-ok(! -e "$outpath/10x-simple.png");
-ok(! -e "$outpath/10x-simple-svg.png");
-ok(! -e "$outpath/10x-simple-pdf.png");
-ok(! -e "$outpath/10x-p1-simple-pdf.png");
+       ok(! -e "$outpath/10x-simple.png");
+       ok(! -e "$outpath/10x-simple-svg.png");
+       ok(! -e "$outpath/10x-simple-pdf.png");
+       ok(! -e "$outpath/10x-p1-simple-pdf.png");

 
 

-# cleanup
-ok(! system("rm -rf t/tmp"));
+       # cleanup
+       ok(! system("rm -rf t/tmp"));
+}

 done_testing;
 
 1;
 done_testing;
 
 1;