From f9963b97c206ce4f5b30f57ec6b7ac7fbdeaf05b Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 4 Jul 2014 21:55:53 +0200 Subject: [PATCH] make unittest work with all all three packages that provide perlmagick --- t/img.t | 45 +++++++++++++++++++++++++++++++------------- t/img/redsquare.png | Bin 0 -> 84 bytes t/img/twopages.pdf | Bin 0 -> 2295 bytes 3 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 t/img/redsquare.png create mode 100644 t/img/twopages.pdf diff --git a/t/img.t b/t/img.t index b42db26cf..de10c142d 100755 --- a/t/img.t +++ b/t/img.t @@ -5,6 +5,10 @@ # sizes, and checks if they vanish when not required in the build process any # more # +# if you have trouble here, be aware that there are three debian packages that +# can provide Image::Magick: perlmagick, libimage-magick-perl and +# graphicsmagick-libmagick-dev-compat +# package IkiWiki; use warnings; @@ -12,21 +16,23 @@ use strict; use Test::More; BEGIN { use_ok("IkiWiki"); } +BEGIN { use_ok("Image::Magick"); } ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in")); -ok(! system("convert canvas:red -scale 20x20 t/tmp/in/simple.png")); -ok(! system("convert t/tmp/in/simple.png -extent 20x10 t/tmp/in/long.png")); -ok(! system("convert t/tmp/in/simple.png t/tmp/in/simple-svg.svg")); +ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png")); +writefile("emptysquare.svg", "t/tmp/in", ''); # using different image sizes for different pages, so the pagenumber selection can be tested easily -ok(! system("convert t/tmp/in/simple.png t/tmp/in/long.png t/tmp/in/simple-pdf.pdf")); +ok(! system("cp t/img/twopages.pdf t/tmp/in/twopages.pdf")); writefile("imgconversions.mdwn", "t/tmp/in", < +[[!img twopages.pdf size=10x]] +[[!img twopages.pdf size=12x]] +[[!img twopages.pdf size=16x pagenumber=1]] EOF ); @@ -36,11 +42,24 @@ my $command = "perl -I. ./ikiwiki.out -set usedirs=0 -plugin img t/tmp/in t/tmp/ ok(! system($command)); +sub size($) { + my $filename = shift; + my $im = Image::Magick->new(); + $im->Read($filename); + my $w = $im->Get("width"); + my $h = $im->Get("height"); + return "${w}x${h}"; +} + my $outpath = "t/tmp/out/imgconversions"; -ok(`identify $outpath/10x-simple.png` =~ "PNG 10x10 "); -ok(`identify $outpath/10x-simple-svg.png` =~ "PNG 10x10 "); -ok(`identify $outpath/10x-simple-pdf.png` =~ "PNG 10x10 "); -ok(`identify $outpath/10x-p1-simple-pdf.png` =~ "PNG 10x5 "); +is(size("$outpath/10x-redsquare.png"), "10x10"); +SKIP: { + # FIXME this is a workaround for libimage-magick-perl which has issues with svg + skip "skip svg test due to imagemagick 8:6.8.8.9 bug (6.7 works, so does graphicsmagick)", 1 if $INC{"Image/Magick/Q16.pm"}; + is(size("$outpath/10x-emptysquare.png"), "10x10"); +} +is(size("$outpath/12x-twopages.png"), "12x12"); +is(size("$outpath/16x-p1-twopages.png"), "16x2"); # now let's remove them again diff --git a/t/img/redsquare.png b/t/img/redsquare.png new file mode 100644 index 0000000000000000000000000000000000000000..0033932aa1a239b3e3923eaa97bc8370ee8a036e GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1SFYWcSQjyX-^l&5R22vf6hDDB`k7yzv5Zo h*~PQmO@kec8I@7Qp}j literal 0 HcmV?d00001 diff --git a/t/img/twopages.pdf b/t/img/twopages.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8be9b65394d717d78aad89a728c7846b6c7c25bf GIT binary patch literal 2295 zcmd6oy>1gh5XTMW))Z7|n}|fnzTNvi6s3qwz~aj|kw7v?oNxD>1N+vwTN6VA6$KJJ z1W&*tP|{J*QNjz*Q-s;Qb2wj&0yN;py4l&?nfd=_cCFXhY0{R3*1mlG_zBsVU@?4z z2L{-&vB&2U8{J7b;_U~Br%bIOw{$W({7Dk={?+Z{C8u0Mo14hkoekyFDK8H|#;tIo zKL|4RwEf=g;UgYNWZX@d+{Y#?>?C8!Gq`_e97^8dkzo7*GOqDtv@f;C4W5paGeyRB zBJ&>4+F~*lDNiN#k1XUuqBhVeR>O{YK;(wN{RgJCBb1};z zo?|UxFB8!&msoMpM@A`Fv8EDMdg~HHl}k~301GmDVWtG3#lE&kC4A;sRTj?K+n-H_ zSQQ06ZgQ4{+hUFfWkpQ_inlW{tsCKz1%p(byqeVRPg3cEXPr!`q+1d4sL?n&I$EU| zU6f^DbW_IXoZ+9mLtgsme&s5&4Ct@Ww@*diK}H!rHBTj92fvJd^zi(JMx*heab{(< zOO3lg-mg^Z0NDlW%9G$ziKmMxq3cl~|If2jk?Rqr#?voQ*JQ0?ohpU@1a?||?4D0thRum#YytgVr;Zc*pIsG}4Oc+YV(o79-WG zBk1>{RjYfJhSp8NIxvy(dgro9s7*X#Q_pfOdWo193AwnTT9$`05$SLFi43n#Su7u8 zvqenY#D|B6Ep2E;VgjeZ=wY)6-h%Z+!ZXyIhO@C~Qpdsf3kx{6^0<|9*&K_*aFlSh z^Zv$0CGmO2V?;0w5IO!~*KsTd$GEgn+XkW352p*8{;K&AM+sW@TV?ZtlYS1+Q`>8L zpi0eVIV<);WVKkR>4ILhy>0+KSF`!{Nk1h3!ADG?b8CR+U&bbUTsX3sY6QH%VE4O#h4;Y+o A`v3p{ literal 0 HcmV?d00001 -- 2.39.5