X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a308b212ad697fb204fa8543d00c39a24f58de5f..22961f81ddf642b24e45fdf9707dff06e17742a7:/t/img.t

diff --git a/t/img.t b/t/img.t
index 0183f8779..8c10d9b74 100755
--- a/t/img.t
+++ b/t/img.t
@@ -18,17 +18,30 @@ use Test::More;
 BEGIN { use_ok("IkiWiki"); }
 BEGIN { use_ok("Image::Magick"); }
 
+my $magick = new Image::Magick;
+my $SVGS_WORK = defined $magick->QueryFormat("svg");
+
 ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in"));
 
 ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png"));
-writefile("emptysquare.svg", "t/tmp/in", '<svg width="30" height="30"/>');
+
+if ($SVGS_WORK) {
+	writefile("emptysquare.svg", "t/tmp/in", '<svg width="30" height="30"/>');
+}
+
 # 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"));
 
+my $maybe_svg_img = "";
+if ($SVGS_WORK) {
+	$maybe_svg_img = "[[!img emptysquare.svg size=10x]]";
+}
+
 writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
 [[!img redsquare.png]]
 [[!img redsquare.png size=10x]]
-[[!img emptysquare.svg size=10x]]
+[[!img redsquare.png size=30x50]] expecting 30x30
+$maybe_svg_img
 [[!img twopages.pdf size=12x]]
 [[!img twopages.pdf size=16x pagenumber=1]]
 EOF
@@ -36,39 +49,50 @@ EOF
 
 ok(! system("make -s ikiwiki.out"));
 
-my $command = "perl -I. ./ikiwiki.out -set usedirs=0 -plugin img t/tmp/in t/tmp/out -verbose";
+my $command = "perl -I. ./ikiwiki.out -set usedirs=0 -templatedir=templates -plugin img t/tmp/in t/tmp/out -verbose";
 
 ok(! system($command));
 
 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 $outhtml = readfile("$outpath.html");
+
 is(size("$outpath/10x-redsquare.png"), "10x10");
-# if this fails, you need libmagickcore-6.q16-2-extra installed
-is(size("$outpath/10x-emptysquare.png"), "10x10");
+ok(! -e "$outpath/30x-redsquare.png");
+ok($outhtml =~ /width="30" height="30".*expecting 30x30/);
+
+if ($SVGS_WORK) {
+	# 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");
 is(size("$outpath/16x-p1-twopages.png"), "16x2");
 
 # 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;