X-Git-Url: http://git.shiar.net/perl/file-rewrite.git/blobdiff_plain/6ad6da685e4d484f4937dfd8784195cbf6d3470f..46841d08dc662113df30cf49e072b0ba04d4d9aa:/t/10-fileset.t

diff --git a/t/10-fileset.t b/t/10-fileset.t
index c5a5709..db1575e 100644
--- a/t/10-fileset.t
+++ b/t/10-fileset.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 13;
+use Test::More tests => 16;
 use Test::NoWarnings;
 
 use autodie;
@@ -15,22 +15,39 @@ BEGIN { use_ok('File::Rewrite', 'fileset'); }
 my $target = tempdir();
 
 sub testfileset {
-	my ($name, $input, $params, $result) = @_;
+	my ($name, $input, $params, $expect, $compare) = @_;
 
 	my $filename = "$target/$name";
 	open my $file, '>', $filename;
 	print {$file} $input;
 	close $file;
 
-	is(fileset($filename, @$params), $result, $name)
-		or diag(explain $input);
+	my $result = eval { fileset($filename, @$params) };
+	if (defined $result and defined $compare) {
+		my $output = eval {
+			local $/;
+			open my $confirm, '<', $filename;
+			readline $confirm;
+		};
+		if ($compare ne $output) {
+			fail($name);
+			diag(sprintf(
+				'output mismatch (got %d of %d lines with return value %s)',
+				$output =~ tr/\n//,
+				$compare =~ tr/\n//,
+				explain($result),
+			));
+			return;
+		}
+	}
+	is($result, $expect, $name);
 }
 
 my $BASICBODY = "replace$/noremove$/remove$/.$/";
 
-testfileset('no match',      $BASICBODY,    [undef, 'nomatch'], 0);
-testfileset('remove string', $BASICBODY,    [undef, 'remove'],  1);
-testfileset('remove empty',  "$/.$/ $/$/",  [undef, ''],        2);
+testfileset('no match',      $BASICBODY,    [undef, 'nomatch'], 0, $BASICBODY);
+testfileset('remove string', $BASICBODY,    [undef, 'remove'],  1, "replace$/noremove$/.$/");
+testfileset('remove empty',  "$/.$/ $/$/",  [undef, ''],        2, ".$/ $/");
 testfileset('remove regex',  $BASICBODY,    [undef, qr/^re/],   2);
 testfileset('remove all',    $BASICBODY,    [undef, qr/./],     4, '');
 
@@ -40,5 +57,9 @@ testfileset('replace string', "1$/2$/3$/",  [4, 1],             2, "2$/3$/4$/");
 testfileset('replace all',    $BASICBODY,   ['', qr/^re/],      3, "noremove$/.$/$/");
 testfileset('keep first',     "foo$/bar$/foo$/", ['foo'],       1, "foo$/bar$/");
 
-is(remove_tree($target), 11, 'no unexpected files');
+testfileset('add new array',  ".$/",        [['foo','.'], ''],  2, ".$/foo$/.$/");
+testfileset('replace by array', "$/foo$/.$/", [['foo',''], ''], 3, "foo$/.$/foo$/$/");
+testfileset('partial add',    "foo$/$/",   [['foo','.'], 'foo'], 1, "foo$/$/.$/");
+
+is(remove_tree($target), 14, 'no unexpected files');