X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-each.t;h=a5d47c2afc0e0097aa3b2e61bd85a286dfd3731a;hb=a5ba1389e8ec450b16fd6e283f3edc80df1878c9;hp=ca87e8a0aa373134f1e3af9a54480adfaaf96ae1;hpb=b70184fed49dd0135e68ab3491475f50521992f3;p=perl%2Fmodules%2Frgit.git

diff --git a/t/20-each.t b/t/20-each.t
index ca87e8a..a5d47c2 100644
--- a/t/20-each.t
+++ b/t/20-each.t
@@ -7,8 +7,9 @@ use Cwd qw/cwd abs_path/;
 use File::Spec::Functions qw/catdir catfile/;
 use File::Temp qw/tempfile tempdir/;
 
-use Test::More tests => 2 + 2 * 2 + 11 * (3 + 1);
+use Test::More tests => 2 + 2 * 4 + 12 * (3 + 1 + 3 + 6);
 
+use App::Rgit::Utils qw/:codes/;
 use App::Rgit;
 
 sub build {
@@ -88,24 +89,31 @@ is(grep({ ref eq 'ARRAY' } @expected), 3, 'all of them are array references');
              @$_,
              map({ catdir($tmpdir, $_) } @{$_}[1 .. 3]),
              $tmpdir,
-             '^n'
+             '@n', '@x'
             ], @expected;
 
-for my $cmd (qw/commit FAIL/) {
+sub try {
+ my ($cmd, $exp, $policy) = @_;
  my ($fh, $filename) = tempfile(UNLINK => 1);
  my $ar = App::Rgit->new(
-  git  => abs_path('t/bin/git'),
-  root => $tmpdir,
-  cmd  => $cmd,
-  args => [ abs_path($filename), $cmd, qw/^n ^g ^w ^b ^G ^W ^B ^R ^^n/ ]
+  git    => abs_path('t/bin/git'),
+  root   => $tmpdir,
+  cmd    => $cmd,
+  args   => [ abs_path($filename), $cmd, qw/@n @g @w @b @G @W @B @R @@n @x/ ],
+  policy => $policy,
  );
  isnt($ar, undef, "each $cmd has a defined object");
- my $exit = $ar->run;
+ my $exit;
  my $fail = $cmd eq 'FAIL' ? 1 : 0;
+ if ($fail) {
+  ($exit, undef) = $ar->run;
+ } else {
+  $exit = $ar->run;
+ }
  is($exit, $fail, "each $cmd returned $fail");
  my @lines = split /\n/, do { local $/; <$fh> };
  my $res = [ map [ split /\|/, $_ ], @lines ];
- my $exp = [ map [ $cmd, @$_ ], $fail ? $expected[0] : @expected ];
+ $exp = [ map [ $cmd, @$_ ], @$exp ];
  for my $i (0 .. $#$exp) {
   my $e = $exp->[$i];
   my $r = shift @$res;
@@ -113,8 +121,17 @@ for my $cmd (qw/commit FAIL/) {
 SKIP:
   {
    skip 'didn\'t visited that repo' => 10 unless defined $r;
+   s/[\r\n]*$// for @$r;
    is($r->[$_], $e->[$_], "each $cmd argument $_ for repository $i is ok")
-    for 0 .. 9;
+    for 0 .. 10;
   }
  }
 }
+
+try 'commit', [ @expected ];
+try 'FAIL',   [ $expected[0] ];
+try 'FAIL',   [ @expected ],
+              sub { NEXT | SAVE };
+my $c = 0;
+try 'FAIL',   [ map { ($expected[$_]) x 2 } 0 .. $#expected ],
+              sub { my $ret = $c ? undef : REDO; $c = 1 - $c; $ret };