X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d77ee60b1506302ca6e2a5bd2023c380334167c0..15ddbb1c70fecb052ef45ae96574a4d888578d11:/t/podcast.t

diff --git a/t/podcast.t b/t/podcast.t
index 6a2c25ee1..7b0987e21 100755
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -3,27 +3,45 @@ use warnings;
 use strict;
 
 BEGIN {
-	eval q{use XML::Feed; use HTML::Parser; use HTML::LinkExtor};
+	eval q{use XML::Feed; use HTML::Parser; use HTML::LinkExtor; use File::MimeInfo};
 	if ($@) {
 		eval q{use Test::More skip_all =>
-			"XML::Feed and/or HTML::Parser not available"};
+			"XML::Feed and/or HTML::Parser or File::MimeInfo not available"};
 	}
 	else {
-		eval q{use Test::More tests => 136};
+		eval q{use Test::More};
 	}
 }
 
 use Cwd;
+use File::Basename;
+
+my $installed = $ENV{INSTALLED_TESTS};
+
+my @base_command;
+if ($installed) {
+	ok(1, "running installed");
+	@base_command = qw(ikiwiki);
+}
+else {
+	ok(! system("make -s ikiwiki.out"));
+	@base_command = ("perl", "-I".getcwd, qw(./ikiwiki.out
+		--underlaydir=underlays/basewiki
+		--set underlaydirbase=underlays
+		--templatedir=templates));
+}
 
 my $tmp = 't/tmp';
 my $statedir = 't/tinypodcast/.ikiwiki';
 
-sub simple_podcast {
+sub podcast {
+	my $podcast_style = shift;
+
 	my $baseurl = 'http://example.com';
-	my @command = (qw(./ikiwiki.out -plugin inline -rss -atom));
-	push @command, qw(-underlaydir=underlays/basewiki);
-	push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
-	push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
+	my @command = (@base_command, qw(--plugin inline --rss --atom));
+	push @command, "--url=$baseurl", qw(t/tinypodcast), "$tmp/out";
+
+	ok(! system("rm -rf $tmp $statedir"), q{setup});
 
 	ok(! system("mkdir $tmp"),
 		q{setup});
@@ -34,93 +52,15 @@ sub simple_podcast {
 		'simplepost'	=> undef,
 		'piano.mp3'	=> 'audio/mpeg',
 		'scroll.3gp'	=> 'video/3gpp',
-		'walter.ogg'	=> 'video/x-theora+ogg',
-	);
-
-	for my $format (qw(atom rss)) {
-		my $feed = XML::Feed->parse("$tmp/out/simple/index.$format");
-
-		is($feed->title, 'simple',
-			qq{$format feed title});
-		is($feed->link, "$baseurl/simple/",
-			qq{$format feed link});
-		is($feed->description, 'wiki',
-			qq{$format feed description});
-		if ('atom' eq $format) {
-			is($feed->author, $feed->description,
-				qq{$format feed author});
-			is($feed->id, $feed->link,
-				qq{$format feed id});
-			is($feed->generator, "ikiwiki",
-				qq{$format feed generator});
-		}
-
-		for my $entry ($feed->entries) {
-			my $title = $entry->title;
-			my $url = $entry->id;
-			my $body = $entry->content->body;
-			my $enclosure = $entry->enclosure;
-
-			is($entry->link, $url, qq{$format $title link});
-			isnt($entry->issued, undef,
-				qq{$format $title issued date});
-			isnt($entry->modified, undef,
-				qq{$format $title modified date});
-
-			if (defined $media_types{$title}) {
-				is($url, "$baseurl/$title",
-					qq{$format $title id});
-				is($body, undef,
-					qq{$format $title no body text});
-
-				# prevent undef method killing test harness
-				$enclosure = XML::Feed::Enclosure->new({})
-					unless defined $enclosure;
-
-				is($enclosure->url, $url,
-					qq{$format $title enclosure url});
-				is($enclosure->type, $media_types{$title},
-					qq{$format $title enclosure type});
-				cmp_ok($enclosure->length, '>', 0,
-					qq{$format $title enclosure length});
-			}
-			else {
-				is($url, "$baseurl/$title/",
-					qq{$format $title id});
-				isnt($body, undef,
-					qq{$format $title body text});
-				is($enclosure, undef,
-					qq{$format $title no enclosure});
-			}
-		}
-	}
-
-	ok(! system("rm -rf $tmp $statedir"), q{teardown});
-}
-
-sub fancy_podcast {
-	my $baseurl = 'http://example.com';
-	my @command = (qw(./ikiwiki.out -plugin inline -rss -atom));
-	push @command, qw(-underlaydir=underlays/basewiki);
-	push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
-	push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
-
-	ok(! system("mkdir $tmp"),
-		q{setup});
-	ok(! system(@command),
-		q{build});
-
-	my %media_types = (
-		'piano.mp3'	=> 'audio/mpeg',
-		'walter.ogg'	=> 'video/x-theora+ogg',
+		'walter.ogg'	=> 'audio/ogg',
 	);
 
 	for my $format (qw(atom rss)) {
-		my $feed = XML::Feed->parse("$tmp/out/fancy/index.$format");
+		my $feed = XML::Feed->parse("$tmp/out/$podcast_style/index.$format");
 
-		is($feed->title, 'fancy',
+		is($feed->title, $podcast_style,
 			qq{$format feed title});
-		is($feed->link, "$baseurl/fancy/",
+		is($feed->link, "$baseurl/$podcast_style/",
 			qq{$format feed link});
 		is($feed->description, 'wiki',
 			qq{$format feed description});
@@ -133,8 +73,6 @@ sub fancy_podcast {
 				qq{$format feed generator});
 		}
 
-		# XXX compare against simple_podcast
-		# XXX make them table-driven shared code
 		for my $entry ($feed->entries) {
 			my $title = $entry->title;
 			my $url = $entry->id;
@@ -160,6 +98,7 @@ sub fancy_podcast {
 					qq{$format $title enclosure length});
 			}
 			else {
+				# XXX hack hack hack
 				my $expected_id = "$baseurl/$title/";
 				$expected_id =~ s/\ /_/g;
 
@@ -167,27 +106,31 @@ sub fancy_podcast {
 					qq{$format $title id});
 				isnt($body, undef,
 					qq{$format $title body text});
-				isnt($enclosure, undef,
-					qq{$format $title enclosure});
-				use File::Basename;
-				my $filename = basename($enclosure->url);
-				is($enclosure->type, $media_types{$filename},
-					qq{$format $title enclosure type});
-				cmp_ok($enclosure->length, '>', 0,
-					qq{$format $title enclosure length});
+
+				if ('fancy' eq $podcast_style) {
+					isnt($enclosure, undef,
+						qq{$format $title enclosure});
+					my $filename = basename($enclosure->url);
+					is($enclosure->type, $media_types{$filename},
+						qq{$format $title enclosure type});
+					cmp_ok($enclosure->length, '>', 0,
+						qq{$format $title enclosure length});
+				}
+				else {
+					is($enclosure, undef,
+						qq{$format $title no enclosure});
+				}
 			}
 		}
 	}
-
-	ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
 sub single_page_html {
-	my @command = (qw(./ikiwiki.out));
-	push @command, qw(-underlaydir=underlays/basewiki);
-	push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
+	my @command = @base_command;
 	push @command, qw(t/tinypodcast), "$tmp/out";
 
+	ok(! system("rm -rf $tmp $statedir"), q{setup});
+
 	ok(! system("mkdir $tmp"),
 		q{setup});
 	ok(! system(@command),
@@ -196,43 +139,43 @@ sub single_page_html {
 	my $html = "$tmp/out/pianopost/index.html";
 	like(_extract_html_content($html, 'content'), qr/has content and/m,
 		q{html body text});
-	like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
+	like(_extract_html_content($html, 'enclosure'), qr/Download/m,
 		q{html enclosure});
 	my ($href) = _extract_html_links($html, 'piano');
 	is($href, '/piano.mp3',
-		q{html enclosure sans -url is site-absolute});
+		q{html enclosure sans --url is site-absolute});
 
 	$html = "$tmp/out/attempted_multiple_enclosures/index.html";
 	like(_extract_html_content($html, 'content'), qr/has content and/m,
 		q{html body text});
-	like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
+	like(_extract_html_content($html, 'enclosure'), qr/Download/m,
 		q{html enclosure});
 	($href) = _extract_html_links($html, 'walter');
 	is($href, '/walter.ogg',
-		q{html enclosure sans -url is site-absolute});
+		q{html enclosure sans --url is site-absolute});
 
 	my $baseurl = 'http://example.com';
-	ok(! system(@command, "-url=$baseurl", q{--rebuild}));
+	ok(! system(@command, "--url=$baseurl", q{--rebuild}));
 
 	$html = "$tmp/out/pianopost/index.html";
 	($href) = _extract_html_links($html, 'piano');
 	is($href, "$baseurl/piano.mp3",
-		q{html enclosure with -url is fully absolute});
+		q{html enclosure with --url is fully absolute});
 
 	$html = "$tmp/out/attempted_multiple_enclosures/index.html";
 	($href) = _extract_html_links($html, 'walter');
 	is($href, "$baseurl/walter.ogg",
-		q{html enclosure with -url is fully absolute});
+		q{html enclosure with --url is fully absolute});
 
 	ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
 sub inlined_pages_html {
-	my @command = (qw(./ikiwiki.out -plugin inline));
-	push @command, qw(-underlaydir=underlays/basewiki);
-	push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
+	my @command = (@base_command, qw(--plugin inline));
 	push @command, qw(t/tinypodcast), "$tmp/out";
 
+	ok(! system("rm -rf $tmp $statedir"), q{setup});
+
 	ok(! system("mkdir $tmp"),
 		q{setup});
 	ok(! system(@command),
@@ -245,14 +188,14 @@ sub inlined_pages_html {
 	like($contents, qr/has content and only one/m,
 		q{html body text from attempted_multiple_enclosures});
 	my $enclosures = _extract_html_content($html, 'inlineenclosure');
-	like($enclosures, qr/this episode/m,
+	like($enclosures, qr/Download/m,
 		q{html enclosure});
 	my ($href) = _extract_html_links($html, 'piano.mp3');
 	is($href, '/piano.mp3',
-		q{html enclosure from pianopost sans -url});
+		q{html enclosure from pianopost sans --url});
 	($href) = _extract_html_links($html, 'walter.ogg');
 	is($href, '/walter.ogg',
-		q{html enclosure from attempted_multiple_enclosures sans -url});
+		q{html enclosure from attempted_multiple_enclosures sans --url});
 
 	ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
@@ -297,7 +240,9 @@ sub _extract_html_links {
 	return @hrefs;
 }
 
-simple_podcast();
+podcast('simple');
 single_page_html();
 inlined_pages_html();
-fancy_podcast();
+podcast('fancy');
+
+done_testing;