X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6b322448ca57a3f23dbba975f84bcbb822a36413..1b9daeadf2f7d6e64ef9fbde7d82088c76c82424:/t/img.t diff --git a/t/img.t b/t/img.t index 1f2e7d044..d5479b96d 100755 --- a/t/img.t +++ b/t/img.t @@ -13,6 +13,7 @@ package IkiWiki; use warnings; use strict; +use Cwd qw(getcwd); use Test::More; plan(skip_all => "Image::Magick not available") unless eval q{use Image::Magick; 1}; @@ -27,60 +28,101 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } push @command, qw(--set usedirs=0 --plugin img t/tmp/in t/tmp/out --verbose); my $magick = new Image::Magick; -my $SVGS_WORK = defined $magick->QueryFormat("svg"); + +$magick->Read("t/img/twopages.pdf"); +my $PDFS_WORK = defined $magick->Get("width"); ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in")); +ok(! system("cp t/img/redsquare.bmp t/tmp/in/redsquare.bmp")); ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png")); +ok(! system("cp t/img/redsquare.jpg t/tmp/in/redsquare.jpg")); +ok(! system("cp t/img/redsquare.jpg t/tmp/in/redsquare.jpeg")); +ok(! system("cp t/img/redsquare.jpg t/tmp/in/SHOUTY.JPG")); # colons in filenames are a corner case for img ok(! system("cp t/img/redsquare.png t/tmp/in/hello:world.png")); ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c.png")); ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c:d.png")); ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c:d:e:f:g:h:i:j.png")); -if ($SVGS_WORK) { - writefile("emptysquare.svg", "t/tmp/in", - ''); -} +writefile("bluesquare.svg", "t/tmp/in", + ''); +ok(! system("cp t/tmp/in/bluesquare.svg t/tmp/in/really-svg.png")); +ok(! system("cp t/tmp/in/bluesquare.svg t/tmp/in/really-svg.bmp")); +ok(! system("cp t/tmp/in/bluesquare.svg t/tmp/in/really-svg.pdf")); # using different image sizes for different pages, so the pagenumber selection can be tested easily ok(! system("cp t/img/twopages.pdf t/tmp/in/twopages.pdf")); +ok(! system("cp t/img/twopages.pdf t/tmp/in/really-pdf.JPEG")); +ok(! system("cp t/img/twopages.pdf t/tmp/in/really-pdf.jpg")); +ok(! system("cp t/img/twopages.pdf t/tmp/in/really-pdf.png")); +ok(! system("cp t/img/twopages.pdf t/tmp/in/really-pdf.svg")); -my $maybe_svg_img = ""; -if ($SVGS_WORK) { - $maybe_svg_img = "[[!img emptysquare.svg size=10x]]"; +my $maybe_pdf_img = ""; +if ($PDFS_WORK) { + $maybe_pdf_img = <new(); - my $r = $im->Read(":$filename"); - return "no image" if $r; + my $r = $im->Read("$decoder:$filename"); + return "no image: $r" if $r; my $w = $im->Get("width"); my $h = $im->Get("height"); return "${w}x${h}"; @@ -92,19 +134,114 @@ my $outhtml = readfile("$outpath.html"); is(size("$outpath/10x-redsquare.png"), "10x10"); ok(! -e "$outpath/30x-redsquare.png"); ok($outhtml =~ /width="30" height="30".*expecting 30x30/); +ok($outhtml =~ /width="42".*expecting 42x/); +ok($outhtml =~ /height="43".*expecting x43/); +ok($outhtml =~ /width="42" height="43".*expecting 42x43/); + +SKIP: { + skip "PDF support not installed (try ghostscript)", 2 + unless $PDFS_WORK; + is(size("$outpath/12x-twopages.png"), "12x12"); + is(size("$outpath/16x-p1-twopages.png"), "16x2"); +} + +ok($outhtml =~ /width="8" height="8".*expecting 8x8/); +is(size("$outpath/x8-hello:world.png"), "8x8"); +is(size("$outpath/x4-a:b:c.png"), "4x4"); +is(size("$outpath/x6-a:b:c:d:e:f:g:h:i:j.png"), "6x6"); + +is(size("$outpath/11x-redsquare.jpg"), "11x11"); +is(size("$outpath/12x-redsquare.jpeg"), "12x12"); +is(size("$outpath/13x-SHOUTY.JPG"), "13x13"); +like($outhtml, qr{src="(\./)?imgconversions/11x-redsquare\.jpg" width="11" height="11"}); +like($outhtml, qr{src="(\./)?imgconversions/12x-redsquare\.jpeg" width="12" height="12"}); +like($outhtml, qr{src="(\./)?imgconversions/13x-SHOUTY\.JPG" width="13" height="13"}); + +# We do not misinterpret images +my $quot = qr/(?:"|")/; +like($outhtml, qr/${quot}really-svg\.png${quot} does not seem to be a valid png file/); +ok(! -e "$outpath/666x-really-svg.png"); +ok(! -e "$outpath/666x-really-svg.bmp"); +like($outhtml, qr/${quot}really-pdf\.JPEG${quot} does not seem to be a valid jpeg file/); +ok(! -e "$outpath/666x-really-pdf.jpeg"); +ok(! -e "$outpath/666x-really-pdf.JPEG"); +like($outhtml, qr/${quot}really-pdf\.jpg${quot} does not seem to be a valid jpeg file/); +ok(! -e "$outpath/666x-really-pdf.jpg"); +like($outhtml, qr/${quot}really-pdf\.png${quot} does not seem to be a valid png file/); +ok(! -e "$outpath/666x-really-pdf.png"); + +# We do not auto-detect file content unless specifically asked to do so +ok(! -e "$outpath/16x-redsquare.bmp"); +like($outhtml, qr{${quot}?bmp${quot}? image processing disabled in img_allowed_formats configuration}); + +# resize is deterministic when deterministic=1 +ok(utime(333333333, 333333333, "t/tmp/in/redsquare.png")); +ok(! system("rm $outpath/10x-redsquare.png")); +ok(! system(@command, '--set-yaml', 'img_allowed_formats=[JPEG, PNG, svg, pdf]', '--set', 'deterministic=1', "--rebuild")); +ok(! system("cp $outpath/10x-redsquare.png $outpath/10x-redsquare.png.orig")); +ok(utime(444444444, 444444444, "t/tmp/in/redsquare.png")); +ok(! system("rm $outpath/10x-redsquare.png")); +ok(! system(@command, '--set-yaml', 'img_allowed_formats=[JPEG, PNG, svg, pdf]', '--set', 'deterministic=1', "--rebuild")); +ok( + ! system("cmp $outpath/10x-redsquare.png $outpath/10x-redsquare.png.orig"), + "resize is deterministic when configured with deterministic=1" +); + +# disable support for uncommon formats and try again +ok(! system(@command, "--rebuild")); +ok(! -e "$outpath/10x-bluesquare.png"); +ok(! -e "$outpath/12x-twopages.png"); +ok(! -e "$outpath/16x-p1-twopages.png"); +ok(! -e "$outpath/16x-redsquare.bmp"); +like($outhtml, qr{${quot}?bmp${quot}? image processing disabled in img_allowed_formats configuration}); + +# enable support for everything (this is a terrible idea if you have +# untrusted users) +ok(! system(@command, '--set-yaml', 'img_allowed_formats=[everything]', '--rebuild')); + +$outhtml = readfile("$outpath.html"); +is(size("$outpath/16x-redsquare.bmp"), "16x16"); +like($outhtml, qr{src="(\./)?imgconversions/16x-redsquare\.bmp" width="16" height="16"}); +unlike($outhtml, qr{${quot}bmp${quot} image processing disabled in img_allowed_formats configuration}); + +is(size("$outpath/10x-redsquare.png"), "10x10"); +ok(! -e "$outpath/30x-redsquare.png"); +ok($outhtml =~ /width="30" height="30".*expecting 30x30/); +ok($outhtml =~ /width="42".*expecting 42x/); +ok($outhtml =~ /height="43".*expecting x43/); +ok($outhtml =~ /width="42" height="43".*expecting 42x43/); -if ($SVGS_WORK) { - # if this fails, you need libmagickcore-6.q16-2-extra installed - is(size("$outpath/10x-emptysquare.png"), "10x10"); +SKIP: { + skip "PDF support not installed (try ghostscript)", 2 + unless $PDFS_WORK; + is(size("$outpath/12x-twopages.png"), "12x12"); + is(size("$outpath/16x-p1-twopages.png"), "16x2"); } -is(size("$outpath/12x-twopages.png"), "12x12"); -is(size("$outpath/16x-p1-twopages.png"), "16x2"); ok($outhtml =~ /width="8" height="8".*expecting 8x8/); is(size("$outpath/x8-hello:world.png"), "8x8"); is(size("$outpath/x4-a:b:c.png"), "4x4"); is(size("$outpath/x6-a:b:c:d:e:f:g:h:i:j.png"), "6x6"); +is(size("$outpath/11x-redsquare.jpg"), "11x11"); +is(size("$outpath/12x-redsquare.jpeg"), "12x12"); +is(size("$outpath/13x-SHOUTY.JPG"), "13x13"); +like($outhtml, qr{src="(\./)?imgconversions/11x-redsquare\.jpg" width="11" height="11"}); +like($outhtml, qr{src="(\./)?imgconversions/12x-redsquare\.jpeg" width="12" height="12"}); +like($outhtml, qr{src="(\./)?imgconversions/13x-SHOUTY\.JPG" width="13" height="13"}); + +# We still do not misinterpret images +like($outhtml, qr/${quot}really-svg\.png${quot} does not seem to be a valid png file/); +ok(! -e "$outpath/666x-really-svg.png"); +ok(! -e "$outpath/666x-really-svg.bmp"); +like($outhtml, qr/${quot}really-pdf\.JPEG${quot} does not seem to be a valid jpeg file/); +ok(! -e "$outpath/666x-really-pdf.jpeg"); +ok(! -e "$outpath/666x-really-pdf.JPEG"); +like($outhtml, qr/${quot}really-pdf\.jpg${quot} does not seem to be a valid jpeg file/); +ok(! -e "$outpath/666x-really-pdf.jpg"); +like($outhtml, qr/${quot}really-pdf\.png${quot} does not seem to be a valid png file/); +ok(! -e "$outpath/666x-really-pdf.png"); + # now let's remove them again if (1) { # for easier testing @@ -112,16 +249,14 @@ if (1) { # for easier testing 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-redsquare.png"); + ok(! -e "$outpath/10x-bluesquare.png"); + ok(! -e "$outpath/12x-twopages.png"); + ok(! -e "$outpath/13x-SHOUTY.JPG"); + ok(! -e "$outpath/16x-p1-twopages.png"); ok(! -e "$outpath/x8-hello:world.png"); ok(! -e "$outpath/x4-a:b:c.png"); ok(! -e "$outpath/x6-a:b:c:d:e:f:g:h:i:j.png"); - - # cleanup - ok(! system("rm -rf t/tmp")); } done_testing;