X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/460b1a0debf85f7c54c1dd7d8b8e483587041d44..d760df3821d67b97561e7868b3ce52b1a66e9b13:/t/cvs.t

diff --git a/t/cvs.t b/t/cvs.t
index 9df62334d..af1786c65 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -1,71 +1,136 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
+use Test::More;
+use IkiWiki;
+
+my %ideal_test_plan = (tests => 8);
 my $dir;
-BEGIN {
-	$dir="/tmp/ikiwiki-test-cvs.$$";
-	my $cvs=`which cvs`;
-	chomp $cvs;
-	if (! -x $cvs || ! mkdir($dir)) {
-		eval q{
-			use Test::More skip_all => "cvs not available or could not make test dir"
+
+sub _determine_test_plan {
+	my $cvs=`which cvs`; chomp $cvs;
+	my $cvsps=`which cvsps`; chomp $cvsps;
+	return (skip_all => 'cvs or cvsps not available')
+		unless -x $cvs && -x $cvsps;
+
+	foreach my $module ('File::ReadBackwards', 'File::MimeInfo') {
+		eval qq{use $module};
+		if ($@) {
+			return (skip_all => "$module not available");
 		}
 	}
+
+	return %ideal_test_plan;
+}
+
+sub _startup {
+	_mktempdir();
+	_generate_minimal_config();
+	_create_test_repo();
+}
+
+sub _shutdown {
+	system "rm -rf $dir";
+}
+
+sub _mktempdir {
+	$dir="/tmp/ikiwiki-test-cvs.$$";
+	if (! mkdir($dir)) {
+		die $@;
+	}
 }
-use Test::More tests => 12;
-
-BEGIN { use_ok("IkiWiki"); }
-
-%config=IkiWiki::defaultconfig();
-$config{rcs} = "cvs";
-$config{srcdir} = "$dir/src";
-$config{cvsrepo} = "$dir/repo";
-$config{cvspath} = "ikiwiki";
-IkiWiki::loadplugins();
-IkiWiki::checkconfig();
-
-my $cvsrepo = "$dir/repo";
-
-system "cvs -d $cvsrepo init >/dev/null";
-system "mkdir $dir/ikiwiki >/dev/null";
-system "cd $dir/ikiwiki && cvs -d $cvsrepo import -m import ikiwiki VENDOR RELEASE >/dev/null";
-system "rm -rf $dir/ikiwiki >/dev/null";
-system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
-
-# Web commit
-my $test1 = readfile("t/test1.mdwn");
-writefile('test1.mdwn', $config{srcdir}, $test1);
-IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
-
-my @changes;
-@changes = IkiWiki::rcs_recentchanges(3);
-
-is($#changes, 0);
-is($changes[0]{message}[0]{"line"}, "Added the first page");
-is($changes[0]{pages}[0]{"page"}, "test1");
-
-# Manual commit
-my $message = "Added the second page";
-
-my $test2 = readfile("t/test2.mdwn");
-writefile('test2.mdwn', $config{srcdir}, $test2);
-system "cd $config{srcdir} && cvs add test2.mdwn >/dev/null 2>&1";
-system "cd $config{srcdir} && cvs commit -m \"$message\" test2.mdwn >/dev/null";
-
-@changes = IkiWiki::rcs_recentchanges(3);
-is($#changes, 1);
-is($changes[0]{message}[0]{"line"}, $message);
-is($changes[0]{pages}[0]{"page"}, "test2");
-is($changes[1]{pages}[0]{"page"}, "test1");
-
-# extra slashes in the path shouldn't break things
-$config{cvspath} = "/ikiwiki//";
-IkiWiki::checkconfig();
-@changes = IkiWiki::rcs_recentchanges(3);
-is($#changes, 1);
-is($changes[0]{message}[0]{"line"}, $message);
-is($changes[0]{pages}[0]{"page"}, "test2");
-is($changes[1]{pages}[0]{"page"}, "test1");
-
-system "rm -rf $dir";
+
+sub _generate_minimal_config {
+	%config=IkiWiki::defaultconfig();
+	$config{rcs} = "cvs";
+	$config{srcdir} = "$dir/src";
+	$config{cvsrepo} = "$dir/repo";
+	$config{cvspath} = "ikiwiki";
+	IkiWiki::loadplugins();
+	IkiWiki::checkconfig();
+}
+
+sub _create_test_repo {
+	my $cvsrepo = "$dir/repo";
+
+	system "cvs -d $cvsrepo init >/dev/null";
+	system "mkdir $dir/ikiwiki >/dev/null";
+	system "cd $dir/ikiwiki && cvs -d $cvsrepo import -m import ikiwiki VENDOR RELEASE >/dev/null";
+	system "rm -rf $dir/ikiwiki >/dev/null";
+	system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
+}
+
+sub test_web_add_and_commit {
+	writefile('test1.mdwn', $config{srcdir}, readfile("t/test1.mdwn"));
+	IkiWiki::rcs_add("test1.mdwn");
+	my $message = "Added the first page";
+	IkiWiki::rcs_commit(
+		file => "test1.mdwn",
+		message => $message,
+		token => "moo",
+	);
+
+	my @changes = IkiWiki::rcs_recentchanges(3);
+	is(
+		$#changes,
+		0,
+		q{1 total commit},
+	);
+	is(
+		$changes[0]{message}[0]{"line"},
+		$message,
+		q{first line of most recent commit message matches},
+	);
+	is(
+		$changes[0]{pages}[0]{"page"},
+		"test1",
+		q{first pagename from most recent commit matches},
+	);
+}
+
+sub test_manual_add_and_commit {
+	writefile('test2.mdwn', $config{srcdir}, readfile("t/test2.mdwn"));
+	system "cd $config{srcdir} && cvs add test2.mdwn >/dev/null 2>&1";
+	my $message = "Added the second page";
+	system "cd $config{srcdir} && cvs commit -m \"$message\" test2.mdwn >/dev/null";
+
+	my @changes = IkiWiki::rcs_recentchanges(3);
+	is(
+		$#changes,
+		1,
+		q{2 total commits},
+	);
+	is(
+		$changes[0]{message}[0]{"line"},
+		$message,
+		q{first line of most recent commit message matches},
+	);
+	is(
+		$changes[0]{pages}[0]{"page"},
+		"test2",
+		q{first pagename from most recent commit matches},
+	);
+	is(
+		$changes[1]{pages}[0]{"page"},
+		"test1",
+		q{first pagename from second-most-recent commit matches},
+	);
+}
+
+sub test_extra_path_slashes {
+	my $initial_cvspath = $config{cvspath};
+	$config{cvspath} = "/ikiwiki//";
+	IkiWiki::checkconfig();
+	is(
+		$config{cvspath},
+		$initial_cvspath,
+		q{rcs_recentchanges assumes checkconfig sanitizes cvspath},
+	);
+}
+
+plan(_determine_test_plan());
+_startup();
+test_web_add_and_commit();
+test_manual_add_and_commit();
+test_extra_path_slashes();
+_shutdown();