Un-copy-paste the fancy-podcast tests.

1 files changed, 24 insertions, 94 deletions

diff --git a/t/podcast.t b/t/podcast.t
index 6a2c25ee1..a00545b98 100755
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -14,11 +14,14 @@ BEGIN {
 }
 
 use Cwd;
+use File::Basename;
 
 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);
@@ -38,11 +41,11 @@ sub simple_podcast {
 	);
 
 	for my $format (qw(atom rss)) {
-		my $feed = XML::Feed->parse("$tmp/out/simple/index.$format");
+		my $feed = XML::Feed->parse("$tmp/out/$podcast_style/index.$format");
 
-		is($feed->title, 'simple',
+		is($feed->title, $podcast_style,
 			qq{$format feed title});
-		is($feed->link, "$baseurl/simple/",
+		is($feed->link, "$baseurl/$podcast_style/",
 			qq{$format feed link});
 		is($feed->description, 'wiki',
 			qq{$format feed description});
@@ -72,86 +75,6 @@ sub simple_podcast {
 					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',
-	);
-
-	for my $format (qw(atom rss)) {
-		my $feed = XML::Feed->parse("$tmp/out/fancy/index.$format");
-
-		is($feed->title, 'fancy',
-			qq{$format feed title});
-		is($feed->link, "$baseurl/fancy/",
-			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});
-		}
-
-		# 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;
-			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});
 				is($enclosure->url, $url,
 					qq{$format $title enclosure url});
 				is($enclosure->type, $media_types{$title},
@@ -160,6 +83,7 @@ sub fancy_podcast {
 					qq{$format $title enclosure length});
 			}
 			else {
+				# XXX hack hack hack
 				my $expected_id = "$baseurl/$title/";
 				$expected_id =~ s/\ /_/g;
 
@@ -167,14 +91,20 @@ 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});
+				}
 			}
 		}
 	}
@@ -297,7 +227,7 @@ sub _extract_html_links {
 	return @hrefs;
 }
 
-simple_podcast();
+podcast('simple');
 single_page_html();
 inlined_pages_html();
-fancy_podcast();
+podcast('fancy');